[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog Makefile.am configure.ac gui/Ma...
|
From: |
Tomas Groth |
|
Subject: |
[Gnash-commit] gnash ChangeLog Makefile.am configure.ac gui/Ma... |
|
Date: |
Mon, 02 Apr 2007 16:46:32 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Tomas Groth <tgc> 07/04/02 16:46:32
Modified files:
. : ChangeLog Makefile.am configure.ac
gui : Makefile.am gnash.cpp gtk.cpp
server/asobj : NetStreamFfmpeg.cpp NetStreamGst.cpp
Log message:
* Makefile.am, configure.ac, gui/Makefile.am, gui/gnash.cpp,
gui/gtk.cpp:
Changed the "--enable-sound" option to "--enable-media", and removed
the "--with-mp3-decoder" option.
* server/asobj/NetStreamFfmpeg.cpp: Replaced a few assert(0) with
warnings.
* server/asobj/NetStreamGst.cpp: Only create sound objects if a
soundhandler is present.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2752&r2=1.2753
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.283&r2=1.284
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.19&r2=1.20
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2752
retrieving revision 1.2753
diff -u -b -r1.2752 -r1.2753
--- ChangeLog 2 Apr 2007 16:25:24 -0000 1.2752
+++ ChangeLog 2 Apr 2007 16:46:31 -0000 1.2753
@@ -1,3 +1,13 @@
+2007-04-02 Tomas Groth Christensen <address@hidden>
+
+ * Makefile.am, configure.ac, gui/Makefile.am, gui/gnash.cpp,
gui/gtk.cpp:
+ Changed the "--enable-sound" option to "--enable-media", and removed
+ the "--with-mp3-decoder" option.
+ * server/asobj/NetStreamFfmpeg.cpp: Replaced a few assert(0) with
+ warnings.
+ * server/asobj/NetStreamGst.cpp: Only create sound objects if a
+ soundhandler is present.
+
2007-04-02 Sandro Santilli <address@hidden>
* server/dlist.{cpp,h} (place_character): call unload()
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- Makefile.am 7 Mar 2007 15:11:24 -0000 1.65
+++ Makefile.am 2 Apr 2007 16:46:31 -0000 1.66
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.65 2007/03/07 15:11:24 strk Exp $
+# $Id: Makefile.am,v 1.66 2007/04/02 16:46:31 tgc Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -108,18 +108,15 @@
# Set a few variables to what features we selected so we can dump it with the
# test of the config
-if USE_SOUND_SDL
- SOUND_OPT=sdl
-endif
if USE_SOUND_GST
- SOUND_OPT=gst
+ MEDIA_OPT=gst
endif
if USE_MAD_ENGINE
- ENGINE_OPT=mad
+ MEDIA_OPT=mad
endif
if USE_FFMPEG_ENGINE
- ENGINE_OPT=ffmpeg
+ MEDIA_OPT=ffmpeg
endif
if USE_GUI_GTK
@@ -252,7 +249,6 @@
@echo "legit value"
@echo ""
@echo "Configurable options are:"
- @echo "Sound handler: $(SOUND_OPT)"
- @echo "MP3 decoder: $(ENGINE_OPT)"
+ @echo "Media handler: $(MEDIA_OPT)"
@echo "Renderer engine: $(RENDER_OPT)"
@echo "GUI: $(GUI_OPT)"
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -b -r1.283 -r1.284
--- configure.ac 31 Mar 2007 11:02:51 -0000 1.283
+++ configure.ac 2 Apr 2007 16:46:31 -0000 1.284
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.283 2007/03/31 11:02:51 bjacques Exp $
+dnl $Id: configure.ac,v 1.284 2007/04/02 16:46:31 tgc Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -260,41 +260,22 @@
fi
dnl --------------------------------------------------------
-dnl Select sound streamer
+dnl Select media handler
dnl --------------------------------------------------------
AC_ARG_ENABLE(sound,
- AC_HELP_STRING([--enable-sound=handler], [Enable sound support using the
specified handler: SDL, GST (Gstreamer) or none (no sound) [[SDL]] ]),
+ AC_HELP_STRING([--enable-media=handler], [Enable media handling support using
the specified handler: ffmpeg, mad, GST (Gstreamer) or none (no sound)
[[ffmpeg]] ]),
[case "${enableval}" in
- GST|gst) sound_handler=gst ;;
- sdl|SDL) sound_handler=sdl ;;
- no|NO|none) sound_handler=none ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-sound option]) ;;
+ GST|gst) media_handler=gst ;;
+ ffmpeg|FFMPEG) media_handler=ffmpeg ;;
+ mad|MAD) media_handler=mad ;;
+ no|NO|none) media_handler=none ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-media option]) ;;
esac],
- [sound_handler=sdl]
+ [media_handler=ffmpeg]
)
dnl --------------------------------------------------------
-dnl Select mp3 decoder (only for 'sdl' sound)
-dnl --------------------------------------------------------
-
-AC_ARG_WITH(mp3-decoder,
- AC_HELP_STRING([--with-mp3-decoder=DECODER], [Use the specified mp3 decoder:
ffmpeg, mad (libmad) or none [[none]]]),
- [case "${withval}" in
- ffmpeg|FFMPEG) mp3_decoder=ffmpeg ;;
- mad|MAD) mp3_decoder=mad ;;
- no|none) mp3_decoder=none ;;
- *) AC_MSG_ERROR([invalid mp3_decoder ${withval} given (accept:
ffmpeg|mad)]) ;;
- esac],
- [mp3_decoder=ffmpeg]
-)
-
-if test x"$sound_handler" != xsdl -a x"$mp3_decoder" != xnone; then
-mp3_decoder=none;
- dnl AC_MSG_ERROR([--with-mp3-decoder is only valid with
--enable-sound=sdl])
-fi
-
-dnl --------------------------------------------------------
dnl ...
dnl --------------------------------------------------------
@@ -526,7 +507,7 @@
dnl currently unused
dnl GNASH_PKG_FIND(ogg, [ogg.h], [decode ogg streams], ogg_stream_init)
-if test x$gui = xsdl -o x$sound_handler = xsdl; then
+if test x$gui = xsdl -o x$media_handler = xffmpeg -o x$media_handler =
xffmpeg; then
GNASH_PATH_SDL
fi
@@ -580,7 +561,7 @@
AM_CONDITIONAL(opengl, [test x$opengl = xyes])
dnl Need GLIB for both GTK and GST
-if test x${gui} = "xgtk" -o x${sound_handler} = "xgst"; then
+if test x${gui} = "xgtk" -o x${media_handler} = "xgst"; then
GNASH_PATH_GLIB
fi
@@ -664,53 +645,52 @@
*)
esac
-if test x"$mp3_decoder" = x"ffmpeg"; then
+if test x"$media_handler" = x"ffmpeg"; then
GNASH_PATH_FFMPEG
if test x"${ac_cv_path_ffmpeg_lib}" = x ; then
- AC_MSG_WARN([ffmpeg specified as decoder, but it's not present, disabling
sound])
- mp3_decoder=none
- sound_handler=none
+ AC_MSG_WARN([ffmpeg specified as decoder, but it's not present, disabling
media handling])
+ media_handler=none
fi
fi
-if test x"$mp3_decoder" = x"mad"; then
+if test x"$media_handler" = x"mad"; then
dnl Will set MAD_LIBS and MAD_CFLAGS.
dnl Handles --with-mad-incl and --with-mad-lib
GNASH_PKG_FIND(mad, [mad.h], [mad library], mad_copyright)
if test x"${ac_cv_path_mad_lib}" = x ; then
- mp3_decoder=none
- sound_handler=none
- AC_MSG_WARN([Libmad specified as decoder, but it's not present, disabling
sound])
+ media_handler=none
+ AC_MSG_WARN([Libmad specified as decoder, but it's not present, disabling
media handling])
fi
fi
dnl I'm kinda lazy, get rid of this later... //Markus
-AM_CONDITIONAL(HAVE_MAD, test x$mp3_decoder = xmad)
+AM_CONDITIONAL(HAVE_MAD, test x$media_handler = xmad)
-AM_CONDITIONAL(USE_SOUND_GST, test x$sound_handler = xgst)
-AM_CONDITIONAL(USE_SOUND_SDL, test x$sound_handler = xsdl)
-AM_CONDITIONAL(USE_FFMPEG_ENGINE, test x$mp3_decoder = xffmpeg)
-AM_CONDITIONAL(USE_MAD_ENGINE, test x$mp3_decoder = xmad)
+AM_CONDITIONAL(USE_SOUND_GST, test x$media_handler = xgst)
+AM_CONDITIONAL(USE_SOUND_SDL, test x$media_handler = xmad -o x$media_handler =
xffmpeg)
+AM_CONDITIONAL(USE_FFMPEG_ENGINE, test x$media_handler = xffmpeg)
+AM_CONDITIONAL(USE_MAD_ENGINE, test x$media_handler = xmad)
dnl AM_CONDITIONAL(HAVE_FFMPEG, [test x"${FFMPEG_LIBS}" != x])
-case "${sound_handler}" in
- gst) AC_DEFINE([SOUND_GST], [1], [Use GSTREAMER for sound]) ;;
- sdl) AC_DEFINE([SOUND_SDL], [1], [Use SDL for sound]) ;;
+case "${media_handler}" in
+ gst) AC_DEFINE([SOUND_GST], [1], [Use GSTREAMER for media handling]) ;;
+ ffmpeg) AC_DEFINE([SOUND_SDL], [1], [Use SDL for sound handing]) ;;
+ mad) AC_DEFINE([SOUND_SDL], [1], [Use SDL for sound handling]) ;;
*)
esac
-case "${mp3_decoder}" in
- ffmpeg) AC_DEFINE([USE_FFMPEG], [1], [Use FFMPEG for mp3 decoding]) ;;
- mad) AC_DEFINE([USE_MAD], [1], [Use MAD for mp3 decoding]) ;;
+case "${media_handler}" in
+ ffmpeg) AC_DEFINE([USE_FFMPEG], [1], [Use FFMPEG for media decoding]) ;;
+ mad) AC_DEFINE([USE_MAD], [1], [Use MAD for media decoding]) ;;
*)
esac
-if test "$sound_handler" = "gst"; then
+if test "$media_handler" = "gst"; then
GNASH_PKG_FIND(gstreamer, [gst/gst.h], [gstreamer library], gst_init, [0.10])
fi
dnl I'm kinda lazy, get rid of this later... //Markus
-AM_CONDITIONAL(HAVE_GST, test x$sound_handler = xgst)
+AM_CONDITIONAL(HAVE_GST, test x$media_handler = xgst)
if test x$gui = xfltk; then
GNASH_PKG_FIND(fltk2, [fltk/FL_API.h], [Fast Light Toolkit], fl_window_flush)
@@ -870,10 +850,8 @@
AC_SUBST(RENDERER_CONFIG)
GUI_CONFIG=$gui
AC_SUBST(GUI_CONFIG)
-SOUND_CONFIG=$sound_handler
-AC_SUBST(SOUND_CONFIG)
-DECODER_CONFIG=$mp3_decoder
-AC_SUBST(DECODER_CONFIG)
+MEDIA_CONFIG=$media_handler
+AC_SUBST(MEDIA_CONFIG)
dnl AC_CONFIG_LINKS(doc/C/images)
AC_CONFIG_LINKS(testsuite/libbase/gnashrc:testsuite/libbase/gnashrc.in)
@@ -987,9 +965,9 @@
echo " Renderer engine: "$renderer
echo " GUI: "$gui
-echo " Sound handler: "$sound_handler
-if test x"$sound_handler" = xsdl; then
-echo " MP3 decoder: "$mp3_decoder
+echo " Media handler: "$media_handler
+if test x"$_handler" = xffmpeg -o x"$_handler" = xmad; then
+echo " Using SDL for sound handling"
fi
echo ""
@@ -1213,7 +1191,7 @@
fi #}
-if test "$sound_handler" = "gst"; then
+if test "$media_handler" = "gst"; then
if test x"$GSTREAMER_LIBS" != x; then
if test x"$GSTREAMER_CFLAGS" != x; then
echo " Gstreamer flags are: $GSTREAMER_CFLAGS"
@@ -1222,13 +1200,12 @@
fi
echo " Gstreamer libs are: $GSTREAMER_LIBS"
else
- echo " ERROR: gstreamer sound requested, but no gstreamer 0.10+
found"
+ echo " ERROR: gstreamer media handling requested, but no gstreamer
0.10+ found"
nogo=true
fi
fi
-if test "$sound_handler" = "sdl"; then
- if test x"$mp3_decoder" = x"mad"; then
+ if test x"$media_handler" = x"mad"; then
echo " MP3 support enabled through libmad"
if test x"$MAD_LIBS" != x; then
if test x"$MAD_CFLAGS" != x; then
@@ -1241,12 +1218,12 @@
echo " ERROR: No libmad (mp3) development package installed!"
echo " You need to have the libmad development package
installed"
echo " to enable mp3 decoding. You can either reconfigure
using"
- echo " --with-mp3-decoder=ffmpeg to use ffmpeg or install
libmad0-dev"
+ echo " --media-handler=ffmpeg to use ffmpeg or install
libmad0-dev"
echo " (using apt-get) or libmad (using yum)."
nogo=true
fi
else
- if test x"$mp3_decoder" = x"ffmpeg"; then
+ if test x"$media_handler" = x"ffmpeg"; then
if test x${ffmpeg_version} != xok; then
echo " ERROR: You have version ${ffmpeg_version} of ffmpeg
installed."
echo " This version of ffmpeg may not work!"
@@ -1254,7 +1231,7 @@
nogo=true
fi
if test x"$FFMPEG_LIBS" != x; then
- echo " MP3 support enabled through ffmpeg"
+ echo " MP3 and video support enabled through ffmpeg"
if test x"$FFMPEG_CFLAGS" != x; then
echo " ffmpeg flags are: $FFMPEG_CFLAGS"
else
@@ -1265,13 +1242,12 @@
echo " ERROR: No ffmpeg development package installed!"
echo " You need to have the ffmpeg development package
installed"
echo " to enable mp3 decoding. You can either
reconfigure using"
- echo " --with-mp3-decoder=mad to use libmad or install
libavcodec-dev"
+ echo " --media-handler=mad to use libmad or install
libavcodec-dev"
echo " and libdts-dev (using apt-get) or
<package_names_here> (using yum).".
nogo=true
fi
fi
fi
-fi
if test "$renderer" = "cairo"; then
if test x"$CAIRO_LIBS" != x; then
@@ -1339,7 +1315,7 @@
fi
fi
-if test x"$sound_handler" = x"sdl"; then
+if test x"$media_handler" = x"ffmpeg" -o x"$media_handler" = x"mad"; then
if test x"$SDL_LIBS" != x; then
echo " SDL flags are: $SDL_CFLAGS"
echo " SDL libs are: $SDL_LIBS"
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- gui/Makefile.am 31 Mar 2007 21:16:49 -0000 1.61
+++ gui/Makefile.am 2 Apr 2007 16:46:32 -0000 1.62
@@ -17,7 +17,7 @@
#
-# $Id: Makefile.am,v 1.61 2007/03/31 21:16:49 strk Exp $
+# $Id: Makefile.am,v 1.62 2007/04/02 16:46:32 tgc Exp $
AUTOMAKE_OPTIONS =
@@ -178,8 +178,7 @@
AM_CPPFLAGS += -DPKGDATADIR=\"$(pkgdatadir)\"
AM_CPPFLAGS += -DRENDERER_CONFIG=\"$(RENDERER_CONFIG)\"
AM_CPPFLAGS += -DGUI_CONFIG=\"$(GUI_CONFIG)\"
-AM_CPPFLAGS += -DSOUND_CONFIG=\"$(SOUND_CONFIG)\"
-AM_CPPFLAGS += -DDECODER_CONFIG=\"$(DECODER_CONFIG)\"
+AM_CPPFLAGS += -DMEDIA_CONFIG=\"$(MEDIA_CONFIG)\"
AM_CPPFLAGS += -DTARGET_CONFIG=\"$(target)\"
dist_images_DATA = images/gnash_128_96.ico images/GnashG.png
Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- gui/gnash.cpp 6 Mar 2007 18:06:13 -0000 1.66
+++ gui/gnash.cpp 2 Apr 2007 16:46:32 -0000 1.67
@@ -134,8 +134,7 @@
<< " Target: " << TARGET_CONFIG << endl
<< " Renderer: " << RENDERER_CONFIG
<< " GUI: " << GUI_CONFIG
- << " Sound handler: " << SOUND_CONFIG
- << " Decoder: " << DECODER_CONFIG
+ << " Media handler: " << MEDIA_CONFIG
<< endl;
}
Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- gui/gtk.cpp 2 Apr 2007 15:45:22 -0000 1.80
+++ gui/gtk.cpp 2 Apr 2007 16:46:32 -0000 1.81
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: gtk.cpp,v 1.80 2007/04/02 15:45:22 strk Exp $ */
+/* $Id: gtk.cpp,v 1.81 2007/04/02 16:46:32 tgc Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -856,12 +856,8 @@
comments += RENDERER_CONFIG;
comments += " GUI: ";
comments += GUI_CONFIG; // gtk of course!
- comments += " Sound: ";
- comments += SOUND_CONFIG;
- if (SOUND_CONFIG != "none") {
- comments += " MP3 decoder: ";
- comments += DECODER_CONFIG;
- }
+ comments += " Media: ";
+ comments += MEDIA_CONFIG;
comments += ".";
gtk_about_dialog_set_url_hook(NULL, NULL, NULL);
Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/asobj/NetStreamFfmpeg.cpp 30 Mar 2007 22:58:11 -0000 1.27
+++ server/asobj/NetStreamFfmpeg.cpp 2 Apr 2007 16:46:32 -0000 1.28
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: NetStreamFfmpeg.cpp,v 1.27 2007/03/30 22:58:11 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.28 2007/04/02 16:46:32 tgc Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -936,7 +936,8 @@
as_value status;
if (m_statusChanged && get_member(std::string("onStatus"), &status) &&
status.is_function()) {
- for (int i = m_status_messages.size()-1; i >= 0; --i) {
+ int size = m_status_messages.size();
+ for (int i = 0; i < size; ++i) {
boost::intrusive_ptr<as_object> o = new as_object();
o->init_member(std::string("code"),
as_value(m_status_messages[i]), 1);
Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/asobj/NetStreamGst.cpp 30 Mar 2007 22:58:11 -0000 1.19
+++ server/asobj/NetStreamGst.cpp 2 Apr 2007 16:46:32 -0000 1.20
@@ -483,7 +483,8 @@
}
} else {
- assert(0);
+ log_error("Unsupported video codec");
+ return;
}
g_object_set (G_OBJECT (ns->videoinputcaps), "caps",
videonincaps, NULL);
@@ -514,7 +515,8 @@
g_object_set (G_OBJECT (ns->audioinputcaps), "caps",
audioincaps, NULL);
gst_caps_unref (audioincaps);
} else {
- assert(0);
+ log_error("Unsupported audio codec");
+ return;
}
}
@@ -565,19 +567,19 @@
// put it all in the pipeline and link the elements
if (!ns->m_isFLV) {
- gst_bin_add_many (GST_BIN (ns->pipeline),ns->audiosink,
ns->audioconv, NULL);
+ if (sound) gst_bin_add_many (GST_BIN
(ns->pipeline),ns->audiosink, ns->audioconv, NULL);
gst_bin_add_many (GST_BIN (ns->pipeline), ns->source,
ns->decoder, ns->colorspace,
ns->videosink, ns->videorate, ns->videocaps,
ns->volume, NULL);
gst_element_link(ns->source, ns->decoder);
gst_element_link_many(ns->colorspace, ns->videocaps,
ns->videorate, ns->videosink, NULL);
- gst_element_link_many(ns->audioconv, ns->volume, ns->audiosink,
NULL);
+ if (sound) gst_element_link_many(ns->audioconv, ns->volume,
ns->audiosink, NULL);
} else {
gst_bin_add_many (GST_BIN (ns->pipeline), ns->videosource,
ns->videoinputcaps, ns->videodecoder, ns->colorspace, ns->videocaps,
ns->videorate, ns->videosink, NULL);
- gst_bin_add_many (GST_BIN (ns->pipeline), ns->audiosource,
ns->audioinputcaps, ns->audiodecoder, ns->audioconv, ns->volume, ns->audiosink,
NULL);
+ if (sound) gst_bin_add_many (GST_BIN (ns->pipeline),
ns->audiosource, ns->audioinputcaps, ns->audiodecoder, ns->audioconv,
ns->volume, ns->audiosink, NULL);
- gst_element_link_many(ns->audiosource, ns->audioinputcaps,
ns->audiodecoder, ns->audioconv, ns->volume, ns->audiosink, NULL);
+ if (sound) gst_element_link_many(ns->audiosource,
ns->audioinputcaps, ns->audiodecoder, ns->audioconv, ns->volume, ns->audiosink,
NULL);
gst_element_link_many(ns->videosource, ns->videoinputcaps,
ns->videodecoder, ns->colorspace, ns->videocaps, ns->videorate, ns->videosink,
NULL);
}
@@ -679,7 +681,8 @@
as_value status;
if (m_statusChanged && get_member(std::string("onStatus"), &status) &&
status.is_function()) {
- for (int i = m_status_messages.size()-1; i >= 0; --i) {
+ int size = m_status_messages.size();
+ for (int i = 0; i < size; ++i) {
boost::intrusive_ptr<as_object> o = new as_object();
o->init_member(std::string("code"),
as_value(m_status_messages[i]), 1);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog Makefile.am configure.ac gui/Ma...,
Tomas Groth <=