From 0f1cc10947820ced5bb91b1957278722278bf9b3 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Fri, 7 Dec 2007 19:29:39 +0000 Subject: sys/oss/: Allow the AUDIODEV environment variable to redirect us to a different default OSS device, like sunaudiosink... Original commit message from CVS: * sys/oss/gstosssink.c: * sys/oss/gstosssrc.c: Allow the AUDIODEV environment variable to redirect us to a different default OSS device, like sunaudiosink does on Solaris (makes audio play automatically on SunRays). --- ChangeLog | 8 ++++++++ sys/oss/gstosssink.c | 7 ++++++- sys/oss/gstosssrc.c | 8 +++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1937df5b..92309637 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-12-07 Jan Schmidt + + * sys/oss/gstosssink.c: + * sys/oss/gstosssrc.c: + Allow the AUDIODEV environment variable to redirect us + to a different default OSS device, like sunaudiosink does + on Solaris (makes audio play automatically on SunRays). + 2007-12-06 Sebastian Dröge * gst/audiofx/audioamplify.c: (gst_audio_amplify_transform_ip): diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c index 9f2a7eae..83c88476 100644 --- a/sys/oss/gstosssink.c +++ b/sys/oss/gstosssink.c @@ -235,9 +235,14 @@ gst_oss_sink_class_init (GstOssSinkClass * klass) static void gst_oss_sink_init (GstOssSink * osssink) { + const gchar *device; + GST_DEBUG_OBJECT (osssink, "initializing osssink"); - osssink->device = g_strdup (DEFAULT_DEVICE); + device = g_getenv ("AUDIODEV"); + if (device == NULL) + device = DEFAULT_DEVICE; + osssink->device = g_strdup (device); osssink->fd = -1; } diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c index 34d901a2..3d8f3f75 100644 --- a/sys/oss/gstosssrc.c +++ b/sys/oss/gstosssrc.c @@ -230,10 +230,16 @@ gst_oss_src_get_property (GObject * object, guint prop_id, static void gst_oss_src_init (GstOssSrc * osssrc, GstOssSrcClass * g_class) { + const gchar *device; + GST_DEBUG ("initializing osssrc"); + device = g_getenv ("AUDIODEV"); + if (device == NULL) + device = DEFAULT_DEVICE; + osssrc->fd = -1; - osssrc->device = g_strdup (DEFAULT_DEVICE); + osssrc->device = g_strdup (device); osssrc->device_name = g_strdup (DEFAULT_DEVICE_NAME); } -- cgit