diff --git a/01e4826b653065268e7a4b8d57e528836e167a23.patch b/01e4826b653065268e7a4b8d57e528836e167a23.patch new file mode 100644 index 0000000..028188f --- /dev/null +++ b/01e4826b653065268e7a4b8d57e528836e167a23.patch @@ -0,0 +1,51 @@ +diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc +index b7f7a9b..2bf3463 100644 +--- a/src/pavucontrol.cc ++++ b/src/pavucontrol.cc +@@ -409,7 +409,6 @@ void ChannelWidget::onVolumeScaleValueChanged() { + streamWidget->updateChannelVolume(channel, volume); + + if (beepDevice != "") { +- g_debug("blah: %s", beepDevice.c_str()); + ca_context_change_device(ca_gtk_context_get(), beepDevice.c_str()); + + ca_context_cancel(ca_gtk_context_get(), 2); +@@ -423,8 +422,6 @@ void ChannelWidget::onVolumeScaleValueChanged() { + CA_PROP_CANBERRA_ENABLE, "1", + NULL); + +- g_debug("%i = %s", r, ca_strerror(r)); +- + ca_context_change_device(ca_gtk_context_get(), NULL); + } + } +@@ -935,7 +932,7 @@ void RoleWidget::executeVolumeUpdate() { + info.channel_map.channels = 1; + info.channel_map.map[0] = PA_CHANNEL_POSITION_MONO; + info.volume = volume; +- info.device = device.c_str(); ++ info.device = device == "" ? NULL : device.c_str(); + info.mute = muteToggleButton->get_active(); + + pa_operation* o; +@@ -947,7 +944,6 @@ void RoleWidget::executeVolumeUpdate() { + pa_operation_unref(o); + } + +- + /*** MainWindow ***/ + + MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr& x) : +@@ -1423,10 +1419,10 @@ void MainWindow::updateRole(const pa_ext_stream_restore_info &info) { + + eventRoleWidget->updating = true; + +- eventRoleWidget->device = info.device; ++ eventRoleWidget->device = info.device ? info.device : ""; + + volume.channels = 1; +- volume.values[0] = pa_cvolume_avg(&info.volume); ++ volume.values[0] = pa_cvolume_max(&info.volume); + + eventRoleWidget->setVolume(volume); + eventRoleWidget->muteToggleButton->set_active(info.mute); diff --git a/pavucontrol.spec b/pavucontrol.spec index c1c299e..4f0729d 100644 --- a/pavucontrol.spec +++ b/pavucontrol.spec @@ -15,7 +15,8 @@ BuildRequires: libsigc++20-devel lynx BuildRequires: desktop-file-utils BuildRequires: libcanberra-devel BuildRequires: intltool -Requires: pulseaudio-lib >= 0.9.12 +Requires: pulseaudio-lib >= 0.9.15 +Patch0: 01e4826b653065268e7a4b8d57e528836e167a23.patch %description PulseAudio Volume Control (pavucontrol) is a simple GTK based volume control @@ -23,16 +24,14 @@ tool ("mixer") for the PulseAudio sound server. In contrast to classic mixer tools this one allows you to control both the volume of hardware devices and of each playback stream separately. - %prep %setup -q - +%patch0 -p1 -b .01e4826b653065268e7a4b8d57e528836e167a23 %build %configure make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -47,7 +46,6 @@ desktop-file-install \ %clean rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang %defattr(-,root,root,-) %doc LICENSE doc/README @@ -56,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/pavucontrol.desktop %changelog +* Wed Feb 25 2009 Lennart Poettering 0.9.7-4 +- Preview of upcoming 0.9.8 + * Thu Oct 9 2008 Matthias Clasen 0.9.7-3 - Handle locales properly