Attachment 99272 Details for Bug 50056 – sloppily disable feedback sound

[patch] sloppily disable feedback sound

no-popping.patch (text/plain), 1.65 KB, created by main.haarp on 2014-05-18 12:58:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: main.haarp

Created: 2014-05-18 12:58:14 UTC

Size: 1.65 KB

patch

obsolete

>--- src/pavucontrol.cc.old	2011-09-04 20:46:27.000000000 +0200
>+++ src/pavucontrol.cc	2014-05-18 14:44:04.336698444 +0200
>@@ -27,8 +27,6 @@
> #include <pulse/ext-stream-restore.h>
> #include <pulse/ext-device-manager.h>
>
>-#include <canberra-gtk.h>
>-
> #include "pavucontrol.h"
> #include "i18n.h"
> #include "minimalstreamwidget.h"
>@@ -656,8 +654,6 @@
>     try {
>         Gtk::Main kit(argc, argv, options);
>
>-        ca_context_set_driver(ca_gtk_context_get(), "pulse");
>-
>         MainWindow* mainWindow = MainWindow::create();
>
>         pa_glib_mainloop *m = pa_glib_mainloop_new(g_main_context_default());
>--- src/sinkwidget.cc.old	2014-05-18 14:34:47.486696564 +0200
>+++ src/sinkwidget.cc	2014-05-18 14:42:22.806698101 +0200
>@@ -24,7 +24,6 @@
>
> #include "sinkwidget.h"
>
>-#include <canberra-gtk.h>
> #if HAVE_EXT_DEVICE_RESTORE_API
> #  include <pulse/format.h>
> #  include <pulse/ext-device-restore.h>
>@@ -84,23 +83,6 @@
>     }
>
>     pa_operation_unref(o);
>-
>-    ca_context_playing(ca_gtk_context_get(), 2, &playing);
>-    if (playing)
>-        return;
>-
>-    snprintf(dev, sizeof(dev), "%lu", (unsigned long) index);
>-    ca_context_change_device(ca_gtk_context_get(), dev);
>-
>-    ca_gtk_play_for_widget(GTK_WIDGET(gobj()),
>-                           2,
>-                           CA_PROP_EVENT_DESCRIPTION, _("Volume Control Feedback Sound"),
>-                           CA_PROP_EVENT_ID, "audio-volume-change",
>-                           CA_PROP_CANBERRA_CACHE_CONTROL, "permanent",
>-                           CA_PROP_CANBERRA_ENABLE, "1",
>-                           NULL);
>-
>-    ca_context_change_device(ca_gtk_context_get(), NULL);
> }
>
> void SinkWidget::onMuteToggleButton() {

Actions: View | Splinter Review

Attachments on bug 50056: 99272

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.