diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | src/channelwidget.cc | 2 | ||||
| -rw-r--r-- | src/mainwindow.cc | 8 |
4 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 246680f..c5b5cb2 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,7 @@ AC_PROG_LN_S AC_TYPE_SIGNAL AC_HEADER_STDC -PKG_CHECK_MODULES(GUILIBS, [ gtkmm-2.4 libglademm-2.4 sigc++-2.0 libcanberra-gtk >= 0.16 ]) +PKG_CHECK_MODULES(GUILIBS, [ gtkmm-2.4 >= 2.16 libglademm-2.4 sigc++-2.0 libcanberra-gtk >= 0.16 ]) AC_SUBST(GUILIBS_CFLAGS) AC_SUBST(GUILIBS_LIBS) @@ -48,7 +48,7 @@ if test -d ../pulseaudio ; then PULSE_LIBS='-L$(top_srcdir)/../pulseaudio/src/.libs -lpulse -lpulse-mainloop-glib' echo "*** Found pulseaudio in ../pulseaudio, using that version ***" else - PKG_CHECK_MODULES(PULSE, [ libpulse >= 0.9.15 libpulse-mainloop-glib >= 0.9.15 ]) + PKG_CHECK_MODULES(PULSE, [ libpulse >= 0.9.16 libpulse-mainloop-glib >= 0.9.16 ]) fi AC_SUBST(PULSE_LIBS) diff --git a/po/POTFILES.in b/po/POTFILES.in index 1fa8bc9..23b3af3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -10,3 +10,4 @@ src/sinkinputwidget.cc src/sinkwidget.cc src/sourceoutputwidget.cc src/sourcewidget.cc +src/streamwidget.cc diff --git a/src/channelwidget.cc b/src/channelwidget.cc index 9fd62d8..bcfcd82 100644 --- a/src/channelwidget.cc +++ b/src/channelwidget.cc @@ -40,7 +40,7 @@ ChannelWidget::ChannelWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome:: x->get_widget("volumeScale", volumeScale); volumeScale->set_value(100.0); - volumeScale->set_increments(100.0/PA_VOLUME_NORM, 100.0/PA_VOLUME_NORM); + volumeScale->set_increments(1.0, 5.0); volumeScale->signal_value_changed().connect(sigc::mem_fun(*this, &ChannelWidget::onVolumeScaleValueChanged)); } diff --git a/src/mainwindow.cc b/src/mainwindow.cc index 563a615..65455a3 100644 --- a/src/mainwindow.cc +++ b/src/mainwindow.cc @@ -457,9 +457,17 @@ finish: } void MainWindow::updateSinkInput(const pa_sink_input_info &info) { + const char *t; SinkInputWidget *w; bool is_new = false; + if ((t = pa_proplist_gets(info.proplist, "module-stream-restore.id"))) { + if (strcmp(t, "sink-input-by-media-role:event") == 0) { + g_debug(_("Ignoring sink-input due to it being designated as an event and thus handled by the Event widget")); + return; + } + } + if (sinkInputWidgets.count(info.index)) w = sinkInputWidgets[info.index]; else { |