Mercurial > mplayer.hg

changeset 30019:2d62e9614c8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow pulseaudio to restore the previous volume on init instead of forcing to full volume. The old behaviour can be restored by using -volume 100.
author reimar
date Fri, 18 Dec 2009 20:26:28 +0000
parents ae5d67d8ee95
children d652e17184f9
files libao2/ao_pulse.c
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libao2/ao_pulse.c	Fri Dec 18 20:22:39 2009 +0000
+++ b/libao2/ao_pulse.c	Fri Dec 18 20:26:28 2009 +0000
@@ -141,7 +141,6 @@
     char *host = NULL;
     char *sink = NULL;
     char *version = pa_get_library_version();
-    struct pa_cvolume volume;
 
     if (ao_subdevice) {
         devarg = strdup(ao_subdevice);
@@ -187,8 +186,6 @@
     pa_channel_map_init_auto(&map, ss.channels, PA_CHANNEL_MAP_ALSA);
     ao_data.bps = pa_bytes_per_second(&ss);
 
-    pa_cvolume_reset(&volume, ss.channels);
-
     if (!(mainloop = pa_threaded_mainloop_new())) {
         mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Failed to allocate main loop\n");
         goto fail;
@@ -222,7 +219,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 */