summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2004-12-14 06:43:30 +0000
committerDavid Schleef <ds@schleef.org>2004-12-14 06:43:30 +0000
commit3dd58c9cf6320daef51dcc65bfc7cddbdd727b4b (patch)
treeddb9c07b122a5ef6573943d9a04eb61b3188a04a
parent7ee764ec09cf292cd8dff74cce180e54f4841830 (diff)
downloadgst-plugins-bad-3dd58c9cf6320daef51dcc65bfc7cddbdd727b4b.tar.gz
gst-plugins-bad-3dd58c9cf6320daef51dcc65bfc7cddbdd727b4b.tar.bz2
gst-plugins-bad-3dd58c9cf6320daef51dcc65bfc7cddbdd727b4b.zip
configure.ac: Applied patch from bug #143659, making default and added code for OS/X.
Original commit message from CVS: * configure.ac: Applied patch from bug #143659, making default sources and sinks OS-dependent (for Solaris), and added code for OS/X. * gconf/gstreamer.schemas.in: use OS-dependent sinks in gconf.
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac24
-rw-r--r--gconf/gstreamer.schemas.in10
3 files changed, 36 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b91ee1f..88de3c78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-13 David Schleef <ds@schleef.org>
+
+ * configure.ac: Applied patch from bug #143659, making default
+ sources and sinks OS-dependent (for Solaris), and added code
+ for OS/X.
+ * gconf/gstreamer.schemas.in: use OS-dependent sinks in gconf.
+
2004-12-13 Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
* gst-libs/gst/riff/riff-media.c:
diff --git a/configure.ac b/configure.ac
index 2d64fbec..72514037 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,6 +100,30 @@ fi
dnl Check for FIONREAD ioctl declaration :
GST_CHECK_FIONREAD()
+DEFAULT_AUDIOSINK="osssink"
+DEFAULT_VIDEOSINK="xvimagesink"
+DEFAULT_AUDIOSRC="osssrc"
+DEFAULT_VIDEOSRC="v4lsrc"
+DEFAULT_VISUALIZER="goom"
+case "$host" in
+ *-sun-* | *pc-solaris* )
+ DEFAULT_AUDIOSINK="sunaudiosink"
+ DEFAULT_VIDEOSINK="ximagesink"
+ DEFAULT_AUDIOSRC="sunaudiosrc"
+ ;;
+ *-darwin* )
+ DEFAULT_AUDIOSINK="osxaudiosink"
+ DEFAULT_AUDIOSRC="osxaudiosrc"
+ DEFAULT_VIDEOSINK="osxvideosink"
+ ;;
+esac
+
+AC_SUBST(DEFAULT_AUDIOSINK)
+AC_SUBST(DEFAULT_AUDIOSRC)
+AC_SUBST(DEFAULT_VIDEOSINK)
+AC_SUBST(DEFAULT_VIDEOSRC)
+AC_SUBST(DEFAULT_VISUALIZER)
+
dnl ############################################
dnl # Super Duper options for plug-in building #
dnl ############################################
diff --git a/gconf/gstreamer.schemas.in b/gconf/gstreamer.schemas.in
index e40af399..f2b6580c 100644
--- a/gconf/gstreamer.schemas.in
+++ b/gconf/gstreamer.schemas.in
@@ -5,7 +5,7 @@
<applyto>/system/gstreamer/@GST_MAJORMINOR@/default/audiosink</applyto>
<owner>gstreamer</owner>
<type>string</type>
- <default>osssink</default>
+ <default>@DEFAULT_AUDIOSINK@</default>
<locale name="C">
<short>default GStreamer audiosink</short>
<long>GStreamer can play audio using any number of output elements. Some possible choices are osssink, esdsink and alsasink. The audiosink can be a partial pipeline instead of just one element.</long>
@@ -16,7 +16,7 @@
<applyto>/system/gstreamer/@GST_MAJORMINOR@/default/videosink</applyto>
<owner>gstreamer</owner>
<type>string</type>
- <default>xvimagesink</default>
+ <default>@DEFAULT_VIDEOSINK@</default>
<locale name="C">
<short>default GStreamer videosink</short>
<long>GStreamer can play video using any number of output elements. Some possible choices are xvideosink, sdlvideosink and aasink. The videosink can be a partial pipeline instead of just one element.</long>
@@ -27,7 +27,7 @@
<applyto>/system/gstreamer/@GST_MAJORMINOR@/default/audiosrc</applyto>
<owner>gstreamer</owner>
<type>string</type>
- <default>osssrc</default>
+ <default>@DEFAULT_AUDIOSRC@</default>
<locale name="C">
<short>default GStreamer audio source</short>
<long>GStreamer can record audio using any number of input elements. Some possible choices are osssrc, esdsrc and alsasrc. The audio source can be a partial pipeline instead of just one element.</long>
@@ -38,7 +38,7 @@
<applyto>/system/gstreamer/@GST_MAJORMINOR@/default/videosrc</applyto>
<owner>gstreamer</owner>
<type>string</type>
- <default>v4lsrc</default>
+ <default>@DEFAULT_VIDEOSRC@</default>
<locale name="C">
<short>default GStreamer video source</short>
<long>GStreamer can record video from any number of input elements. Some possible choices are v4lsrc and videotestsrc. The video source can be a partial pipeline instead of just one element.</long>
@@ -49,7 +49,7 @@
<applyto>/system/gstreamer/@GST_MAJORMINOR@/default/visualization</applyto>
<owner>gstreamer</owner>
<type>string</type>
- <default>goom</default>
+ <default>@DEFAULT_VISUALIZER@</default>
<locale name="C">
<short>default GStreamer visualization plugin</short>
<long>GStreamer can put visualization plugins in a pipeline to transform audio stream in video frames. Default is goom but more visualization plugins will be ported soon. The visualization plugin can be a partial pipeline instead of just one element.</long>