diff -u mplayer-1.0~rc3+svn20090426/debian/changelog mplayer-1.0~rc3+svn20090426/debian/changelog --- mplayer-1.0~rc3+svn20090426/debian/changelog +++ mplayer-1.0~rc3+svn20090426/debian/changelog @@ -1,3 +1,11 @@ +mplayer (2:1.0~rc3+svn20090426-1ubuntu11) lucid; urgency=low + + * Add 50_fix_initial_volume_setting_pulse_output.patch to resolve the + stream volume being set to max upon each mplayer invocation + (LP: #482408) + + -- Daniel T Chen Wed, 18 Nov 2009 19:42:09 -0500 + mplayer (2:1.0~rc3+svn20090426-1ubuntu10) karmic; urgency=low * make sure that patches are applied for non-i386 builds as well. diff -u mplayer-1.0~rc3+svn20090426/debian/patches/series mplayer-1.0~rc3+svn20090426/debian/patches/series --- mplayer-1.0~rc3+svn20090426/debian/patches/series +++ mplayer-1.0~rc3+svn20090426/debian/patches/series @@ -6,0 +7 @@ +50_fix_initial_volume_setting_pulse_output.patch only in patch2: unchanged: --- mplayer-1.0~rc3+svn20090426.orig/debian/patches/50_fix_initial_volume_setting_pulse_output.patch +++ mplayer-1.0~rc3+svn20090426/debian/patches/50_fix_initial_volume_setting_pulse_output.patch @@ -0,0 +1,16 @@ +Author: Marcus Blumhagen +Comment: Fixes LP: #482408 where the stream volume would erroneously be set to max for each new mplayer invocation + +Index: mplayer-1.0~rc3+svn20090426/libao2/ao_pulse.c +=================================================================== +--- mplayer-1.0~rc3+svn20090426.orig/libao2/ao_pulse.c 2009-11-18 19:31:12.000000000 -0500 ++++ mplayer-1.0~rc3+svn20090426/libao2/ao_pulse.c 2009-11-18 19:31:54.000000000 -0500 +@@ -221,7 +221,7 @@ + pa_stream_set_write_callback(stream, stream_request_cb, NULL); + pa_stream_set_latency_update_callback(stream, stream_latency_update_cb, NULL); + +- if (pa_stream_connect_playback(stream, sink, NULL, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, &volume, NULL) < 0) ++ if (pa_stream_connect_playback(stream, sink, NULL, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL) < 0) + goto unlock_and_fail; + + /* Wait until the stream is ready */