diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | sys/sunaudio/gstsunaudiomixer.c | 9 | ||||
| -rw-r--r-- | sys/sunaudio/gstsunaudiosrc.c | 11 |
5 files changed, 24 insertions, 15 deletions
@@ -1,3 +1,13 @@ +2007-02-11 Stefan Kost <ensonic@users.sf.net> + + * configure.ac: + Activate monoscope when building with --enable-experimental. Fix + --enable-external configure switch description. + + * sys/sunaudio/gstsunaudiomixer.c: (gst_sunaudiomixer_base_init): + * sys/sunaudio/gstsunaudiosrc.c: (gst_sunaudiosrc_dispose): + Help gst-indent. + 2007-02-09 Tim-Philipp Müller <tim at centricular dot net> * gst/avi/gstavimux.c: (gst_avi_mux_riff_get_avi_header): diff --git a/common b/common -Subproject de43a8f3c629983e0bea0b8eb617e52ed35a6cd +Subproject 66d97715fc83888fd1b5469c569f0ef5bbea628 diff --git a/configure.ac b/configure.ac index ae43de2d..0bb1f372 100644 --- a/configure.ac +++ b/configure.ac @@ -138,13 +138,8 @@ if test "x$HAVE_WINSOCK2_H" = "xyes"; then AC_SUBST(WIN32_LIBS) fi -dnl disable monoscope plugin -GST_PLUGINS_SELECTED=`echo $GST_PLUGINS_SELECTED | $SED -e s/monoscope//` - -AC_SUBST(GST_PLUGINS_SELECTED) - dnl ext plug-ins; plug-ins that have external dependencies -GST_CHECK_FEATURE(EXTERNAL, [enable building of plug-ins with external deps],, +GST_CHECK_FEATURE(EXTERNAL, [building of plug-ins with external deps],, [HAVE_EXTERNAL=yes], enabled, [ AC_MSG_NOTICE(building external plug-ins) @@ -164,8 +159,10 @@ GST_CHECK_FEATURE(EXPERIMENTAL, [enable building of experimental plug-ins],, ],[ AC_MSG_NOTICE(not building experimental plug-ins) USE_GST_V4L2="no" + GST_PLUGINS_SELECTED=`echo $GST_PLUGINS_SELECTED | $SED -e s/monoscope//` ]) +AC_SUBST(GST_PLUGINS_SELECTED) dnl *** checks for platform *** diff --git a/sys/sunaudio/gstsunaudiomixer.c b/sys/sunaudio/gstsunaudiomixer.c index a5eb0c93..ba209924 100644 --- a/sys/sunaudio/gstsunaudiomixer.c +++ b/sys/sunaudio/gstsunaudiomixer.c @@ -42,14 +42,15 @@ GST_ELEMENT_DETAILS ("Sun Audio Mixer", "Brian Cameron <brian.cameron@sun.com>"); GST_BOILERPLATE_WITH_INTERFACE (GstSunAudioMixer, gst_sunaudiomixer, - GstElement, GST_TYPE_ELEMENT, GstMixer, GST_TYPE_MIXER, gst_sunaudiomixer) + GstElement, GST_TYPE_ELEMENT, GstMixer, GST_TYPE_MIXER, gst_sunaudiomixer); - GST_IMPLEMENT_SUNAUDIO_MIXER_CTRL_METHODS (GstSunAudioMixer, gst_sunaudiomixer) +GST_IMPLEMENT_SUNAUDIO_MIXER_CTRL_METHODS (GstSunAudioMixer, gst_sunaudiomixer); - static GstStateChangeReturn gst_sunaudiomixer_change_state (GstElement * +static GstStateChangeReturn gst_sunaudiomixer_change_state (GstElement * element, GstStateChange transition); - static void gst_sunaudiomixer_base_init (gpointer klass) +static void +gst_sunaudiomixer_base_init (gpointer klass) { gst_element_class_set_details (GST_ELEMENT_CLASS (klass), &gst_sunaudiomixer_details); diff --git a/sys/sunaudio/gstsunaudiosrc.c b/sys/sunaudio/gstsunaudiosrc.c index d9b47f1d..4a7d3567 100644 --- a/sys/sunaudio/gstsunaudiosrc.c +++ b/sys/sunaudio/gstsunaudiosrc.c @@ -93,12 +93,12 @@ enum }; GST_BOILERPLATE_WITH_INTERFACE (GstSunAudioSrc, gst_sunaudiosrc, - GstAudioSrc, GST_TYPE_AUDIO_SRC, GstMixer, GST_TYPE_MIXER, gst_sunaudiosrc) + GstAudioSrc, GST_TYPE_AUDIO_SRC, GstMixer, GST_TYPE_MIXER, gst_sunaudiosrc); - GST_IMPLEMENT_SUNAUDIO_MIXER_CTRL_METHODS (GstSunAudioSrc, gst_sunaudiosrc) +GST_IMPLEMENT_SUNAUDIO_MIXER_CTRL_METHODS (GstSunAudioSrc, gst_sunaudiosrc); - static GstStaticPadTemplate gst_sunaudiosrc_factory = - GST_STATIC_PAD_TEMPLATE ("src", +static GstStaticPadTemplate gst_sunaudiosrc_factory = +GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-raw-int, " @@ -108,7 +108,8 @@ GST_BOILERPLATE_WITH_INTERFACE (GstSunAudioSrc, gst_sunaudiosrc, "rate = (int) [ 5510, 48000 ], " "channels = (int) [ 1, 2 ]") ); - static void gst_sunaudiosrc_dispose (GObject * object) +static void +gst_sunaudiosrc_dispose (GObject * object) { G_OBJECT_CLASS (parent_class)->dispose (object); } |