diff options
author | Brian Cameron <brian.cameron@sun.com> | 2006-06-09 17:29:08 +0000 |
---|---|---|
committer | Wim Taymans <wim.taymans@gmail.com> | 2006-06-09 17:29:08 +0000 |
commit | 6052579ae40b22a9f17a3864ef1fdc896f7d351b (patch) | |
tree | 9693d422dc6fdd750d955b244391f8d0a33bd5b3 /sys/sunaudio/gstsunaudiosink.c | |
parent | 78d078e9863ddec028f6ded082bfdb3fee189608 (diff) |
sys/sunaudio/: Attached find a patch that fixes a number of bugs with the SunAudio mixer plugin and fixes #344101: 1....
Original commit message from CVS:
Patch by: Brian Cameron <brian dot cameron at sun dot com>
* sys/sunaudio/gstsunaudiomixerctrl.c:
(gst_sunaudiomixer_ctrl_open), (gst_sunaudiomixer_ctrl_build_list),
(gst_sunaudiomixer_ctrl_new), (gst_sunaudiomixer_ctrl_set_volume),
(gst_sunaudiomixer_ctrl_set_mute):
* sys/sunaudio/gstsunaudiosink.c: (gst_sunaudiosink_class_init),
(gst_sunaudiosink_init), (gst_sunaudiosink_prepare),
(gst_sunaudiosink_write):
Attached find a patch that fixes a number of bugs with the SunAudio mixer
plugin and fixes #344101:
1. The gst_sunaudiomixer_ctrl_build_list kept appending the same 3 tracks onto
the tracklist causing gnome-volume-control's preferences dialog to be messed
up and would core dump if you checked/unchecked any item.
2. We weren't previously setting the MUTE flag properly. Fixing this makes
gnome-volume-control work better.
3. Now we properly define the input track to be GST_MIXER_TRACK_INPUT and
the monitor to be GST_MIXER_TRACK_OUTPUT, so that makes gnome-volume-control
look better.
Also some minor cleanup in gstsunaudiosink.c.
Diffstat (limited to 'sys/sunaudio/gstsunaudiosink.c')
-rw-r--r-- | sys/sunaudio/gstsunaudiosink.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sys/sunaudio/gstsunaudiosink.c b/sys/sunaudio/gstsunaudiosink.c index be6de940..7dd56d60 100644 --- a/sys/sunaudio/gstsunaudiosink.c +++ b/sys/sunaudio/gstsunaudiosink.c @@ -160,10 +160,6 @@ gst_sunaudiosink_class_init (GstSunAudioSinkClass * klass) gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_sunaudiosink_get_property); - g_object_class_install_property (gobject_class, PROP_DEVICE, - g_param_spec_string ("device", "Device", "Audio Device (/dev/audio)", - DEFAULT_DEVICE, G_PARAM_READWRITE)); - gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_sunaudiosink_getcaps); gstaudiosink_class->open = GST_DEBUG_FUNCPTR (gst_sunaudiosink_open); @@ -174,17 +170,22 @@ gst_sunaudiosink_class_init (GstSunAudioSinkClass * klass) gstaudiosink_class->write = GST_DEBUG_FUNCPTR (gst_sunaudiosink_write); gstaudiosink_class->delay = GST_DEBUG_FUNCPTR (gst_sunaudiosink_delay); gstaudiosink_class->reset = GST_DEBUG_FUNCPTR (gst_sunaudiosink_reset); + + g_object_class_install_property (gobject_class, PROP_DEVICE, + g_param_spec_string ("device", "Device", "Audio Device (/dev/audio)", + DEFAULT_DEVICE, G_PARAM_READWRITE)); + } static void gst_sunaudiosink_init (GstSunAudioSink * sunaudiosink) { const char *audiodev; - GstClockTime buffer_time; - GValue gvalue = { 0, }; GST_DEBUG_OBJECT (sunaudiosink, "initializing sunaudiosink"); + sunaudiosink->fd = -1; + audiodev = g_getenv ("AUDIODEV"); if (audiodev == NULL) audiodev = DEFAULT_DEVICE; @@ -340,7 +341,6 @@ gst_sunaudiosink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec) ainfo.play.precision = spec->width; ainfo.play.encoding = AUDIO_ENCODING_LINEAR; ainfo.play.port = ports; - ainfo.output_muted = 0; /* * SunAudio doesn't really give access to buffer size, these values work. Setting @@ -376,9 +376,7 @@ gst_sunaudiosink_unprepare (GstAudioSink * asink) static guint gst_sunaudiosink_write (GstAudioSink * asink, gpointer data, guint length) { - GstSunAudioSink *sunaudiosink = GST_SUNAUDIO_SINK (asink); - - return write (sunaudiosink->fd, data, length); + return write (GST_SUNAUDIO_SINK (asink)->fd, data, length); } /* |