summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--sys/sunaudio/gstsunaudiomixerctrl.c4
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 92ea0305..e79f65ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2006-09-15 Wim Taymans <wim@fluendo.com>
+ Patch by: Darren Kenny <darren dot kenny at sun dot com>
+
+ * sys/sunaudio/gstsunaudiomixerctrl.c:
+ (gst_sunaudiomixer_ctrl_build_list):
+ Set the output track as the MASTER so that the gnome-settings-daemon
+ keybindings for changing the volume using the keyboard works.
+ Fixes #356142.
+
+2006-09-15 Wim Taymans <wim@fluendo.com>
+
* gst/multipart/multipartdemux.c: (gst_multipart_demux_chain):
Fix documentation, it is not possible to control the framerate of jpegdec
using filtered caps yet. Fixes #355210.
diff --git a/sys/sunaudio/gstsunaudiomixerctrl.c b/sys/sunaudio/gstsunaudiomixerctrl.c
index fe4b738a..39df6ff5 100644
--- a/sys/sunaudio/gstsunaudiomixerctrl.c
+++ b/sys/sunaudio/gstsunaudiomixerctrl.c
@@ -74,9 +74,9 @@ gst_sunaudiomixer_ctrl_build_list (GstSunAudioMixerCtrl * mixer)
if (mixer->tracklist == NULL) {
g_return_if_fail (mixer->mixer_fd != -1);
- /* Output */
+ /* Output & should be MASTER when it's the only one. */
track = gst_sunaudiomixer_track_new (GST_SUNAUDIO_TRACK_OUTPUT,
- 2, GST_MIXER_TRACK_OUTPUT);
+ 2, GST_MIXER_TRACK_OUTPUT | GST_MIXER_TRACK_MASTER);
mixer->tracklist = g_list_append (mixer->tracklist, track);
/* Input */