Hello community, here is the log from the commit of package espeak for openSUSE:Factory checked in at Wed Mar 23 13:52:13 CET 2011. -------- --- espeak/espeak.changes 2010-04-07 22:02:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/espeak/espeak.changes 2011-03-22 07:37:59.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 22 07:34:38 CET 2011 - tiwai@suse.de + +- Fix full-volume reset problem with PulseAudio (bnc#679975) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- espeak-volume-full-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ espeak.spec ++++++ --- /var/tmp/diff_new_pack.awCiWI/_old 2011-03-23 13:51:58.000000000 +0100 +++ /var/tmp/diff_new_pack.awCiWI/_new 2011-03-23 13:51:58.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package espeak (Version 1.43.03) +# spec file for package espeak # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: espeak Version: 1.43.03 -Release: 1 +Release: 7 %define _version %{version}-source License: GPLv3+ Summary: Software speech synthesizer (text-to-speech) @@ -29,6 +29,8 @@ Source1: espeak.1 # PATCH-FIX-UPSTREAM espeak-audio-runtime-detection.patch vuntz@opensuse.org -- Taken from Fedora Patch0: espeak-audio-runtime-detection.patch +# PATCH-FIX-SUSE espeak-volume-full-fix.diff tiwai@suse.de -- Fix full-volume with PulseAudio (bnc#679975) +Patch1: espeak-volume-full-fix.diff BuildRequires: gcc-c++ BuildRequires: portaudio-devel BuildRequires: pulseaudio-devel @@ -61,6 +63,7 @@ %prep %setup -q -n %{name}-%{_version} %patch0 -p1 +%patch1 -p1 # Don't use the included binary voice dictionaries; we compile these from # source %{__rm} espeak-data/*_dict ++++++ espeak-volume-full-fix.diff ++++++ --- src/wave_pulse.cpp | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) --- a/src/wave_pulse.cpp +++ b/src/wave_pulse.cpp @@ -114,9 +114,6 @@ static pa_stream *stream = NULL; static pa_threaded_mainloop *mainloop = NULL; -static pa_cvolume volume; -static int volume_valid = 0; - static int do_trigger = 0; static uint64_t written = 0; static int time_offset_msec = 0; @@ -171,9 +168,6 @@ if (!i) return; - - volume = i->volume; - volume_valid = 1; } static void subscribe_cb(struct pa_context *c, enum pa_subscription_event_type t, uint32_t index, void *userdata) { @@ -514,12 +508,6 @@ if (!pa_sample_spec_valid(&ss)) return false; -/* if (!volume_valid) { */ - pa_cvolume_reset(&volume, ss.channels); - volume_valid = 1; -/* } else if (volume.channels != ss.channels) */ -/* pa_cvolume_set(&volume, ss.channels, pa_cvolume_avg(&volume)); */ - SHOW_TIME("pa_threaded_mainloop_new (call)"); if (!(mainloop = pa_threaded_mainloop_new())) { SHOW("Failed to allocate main loop\n",""); @@ -583,7 +571,7 @@ a_attr.fragsize = 0; SHOW_TIME("pa_connect_playback"); - if (pa_stream_connect_playback(stream, NULL, &a_attr, (pa_stream_flags_t)(PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE), &volume, NULL) < 0) { + if (pa_stream_connect_playback(stream, NULL, &a_attr, (pa_stream_flags_t)(PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE), NULL, NULL) < 0) { SHOW("Failed to connect stream: %s", pa_strerror(pa_context_errno(context))); goto unlock_and_fail; } @@ -630,11 +618,6 @@ pa_threaded_mainloop_wait(mainloop); } -/* if (!volume_valid) { */ -/* SHOW("pa_context_get_sink_input_info() failed: %s", pa_strerror(pa_context_errno(context))); */ -/* goto unlock_and_fail; */ -/* } */ - do_trigger = 0; written = 0; time_offset_msec = 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org