sys/sunaudio/gstsunaudiosink.c: Do not modify the ports value. If the user has turned off the built-in speakers, then...

Original commit message from CVS:
Patch by: Brian Cameron  <brian dot cameron at sun dot com>
* sys/sunaudio/gstsunaudiosink.c: (gst_sunaudiosink_prepare):
Do not modify the ports value. If the user has turned off the
built-in speakers, then we should not reset it in the prepare
function, since this causes the built-in speakers to turn
back on anytime the user changes a track in totem, rhythmbox,
etc. (#346066).
This commit is contained in:
Brian Cameron 2006-06-28 08:36:30 +00:00 committed by Tim-Philipp Müller
parent c00aec3f15
commit 2657a246ea
2 changed files with 11 additions and 3 deletions

View file

@ -1,3 +1,14 @@
2006-06-28 Tim-Philipp Müller <tim at centricular dot net>
Patch by: Brian Cameron <brian dot cameron at sun dot com>
* sys/sunaudio/gstsunaudiosink.c: (gst_sunaudiosink_prepare):
Do not modify the ports value. If the user has turned off the
built-in speakers, then we should not reset it in the prepare
function, since this causes the built-in speakers to turn
back on anytime the user changes a track in totem, rhythmbox,
etc. (#346066).
2006-06-23 Wim Taymans <wim@fluendo.com> 2006-06-23 Wim Taymans <wim@fluendo.com>
* gst/goom/gstgoom.c: (gst_goom_src_negotiate): * gst/goom/gstgoom.c: (gst_goom_src_negotiate):

View file

@ -330,9 +330,6 @@ gst_sunaudiosink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec)
return FALSE; return FALSE;
ports = ainfo.play.port; ports = ainfo.play.port;
if (!(ports & AUDIO_SPEAKER) && (ainfo.play.avail_ports & AUDIO_SPEAKER)) {
ports = ports | AUDIO_SPEAKER;
}
AUDIO_INITINFO (&ainfo); AUDIO_INITINFO (&ainfo);