Ticket #164: paprefs-speaker-setup.patch

src/paprefs.cc

@@ -29 +29 @@
-#include <libglademm.h>
-#include <gconfmm.h>
-
+#include <stdlib.h>
+#include <glibmm/spawn.h>
+
-#define PA_GCONF_ROOT "/system/pulseaudio"
-#define PA_GCONF_PATH_MODULES PA_GCONF_ROOT"/modules"
-
@@ -55 +58 @@
-        *rtpSpeakerRadioButton,
-        *rtpNullSinkRadioButton;
-
+    Gtk::ComboBox
+       *speakerLayoutComboBox;
+
-    Glib::RefPtr<Gnome::Conf::Client> gconf;
-
-    bool ignoreChanges;
@@ -65 +71 @@
-    void onChangeZeroconfDiscover();
-    void onChangeRtpReceive();
-    void onChangeRtpSend();
+    void onChangeSpeakerLayout();
-    void onChangeCombine();
-    void readFromGConf();
-    void checkForModules();
@@ -73 +80 @@
-    void writeToGConfRtpReceive();
-    void writeToGConfRtpSend();
-    void writeToGConfCombine();
+    void writeToGConfSpeakerLayout();
-    void onGConfChange(const Glib::ustring& key, const Gnome::Conf::Value& value);
-
-    bool rtpRecvAvailable, rtpSendAvailable, zeroconfPublishAvailable, zeroconfDiscoverAvailable, remoteAvailable;
@@ -97 +105 @@
-    x->get_widget("rtpSpeakerRadioButton", rtpSpeakerRadioButton);
-    x->get_widget("rtpNullSinkRadioButton", rtpNullSinkRadioButton);
-
+    x->get_widget("speakerLayout", speakerLayoutComboBox);
+
-    Gdk::Color c("white");
-    titleEventBox->modify_bg(Gtk::STATE_NORMAL, c);
-
@@ -126 +136 @@
-    rtpNullSinkRadioButton->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::onChangeRtpSend));
-
-    combineCheckButton->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::onChangeCombine));
+
+    speakerLayoutComboBox->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::onChangeSpeakerLayout));
-}
-
-MainWindow* MainWindow::create() {
@@ -193 +205 @@
-    writeToGConfRtpSend();
-}
-
+void MainWindow::onChangeSpeakerLayout() {
+    if (ignoreChanges)
+        return;
+
+    writeToGConfSpeakerLayout();
+}
+
-void MainWindow::onChangeCombine() {
-    Gnome::Conf::ChangeSet changeSet;
-
@@ -202 +221 @@
-    writeToGConfCombine();
-}
-
+void MainWindow::writeToGConfSpeakerLayout() {
+    gchar *contents, *local_path;
+    gsize length;
+    GString *new_contents = NULL;
+
+    local_path = g_strdup_printf ("%s/.pulse/daemon.conf", g_get_home_dir ());
+    if (!g_file_get_contents (local_path, &contents, &length, NULL))
+    g_file_get_contents ("/etc/pulse/daemon.conf", &contents, &length, NULL);
+
+    new_contents = g_string_new (NULL);
+    if (contents) {
+    gchar **lines;
+    gint i;
+
+    lines = g_strsplit (contents, "\n", 0);
+    if (lines) {
+            gboolean has_default_samples = FALSE;
+        for (i = 0; lines[i] != NULL; i++) {
+        if (!g_ascii_strncasecmp ((const gchar *) lines[i],
+                      "default-sample-channels",
+                      23)) {
+            g_string_append_printf (new_contents, "default-sample-channels = %d\n",
+                        speakerLayoutComboBox->get_active_row_number() + 1);
+            has_default_samples = TRUE;
+        } else {
+                    g_string_append (new_contents, lines[i]);
+            g_string_append (new_contents, "\n");
+        }
+        }
+
+        if (!has_default_samples) {
+        g_string_append_printf (new_contents, "default-sample-channels = %d\n",
+                    speakerLayoutComboBox->get_active_row_number() + 1);
+        }
+
+        g_strfreev (lines);
+    } else {
+        g_string_append_printf (new_contents, "default-sample-channels = %d\n",
+                    speakerLayoutComboBox->get_active_row_number() + 1);
+    }
+
+    } else {
+    g_string_append_printf (new_contents, "default-sample-channels = %d\n",
+                speakerLayoutComboBox->get_active_row_number() + 1);
+    }
+
+    /* Save the configuration to local daemon.conf */
+    g_file_set_contents (local_path, new_contents->str, new_contents->len, NULL);
+
+    g_free (contents);
+    g_string_free (new_contents, TRUE);
+    g_free (local_path);
+
+    /* Restart the pulseaudio daemon */
+    Glib::spawn_command_line_sync ("pulseaudio -k");
+    Glib::spawn_command_line_sync ("pulseaudio -D");
+}
+
-void MainWindow::writeToGConfCombine() {
-    Gnome::Conf::ChangeSet changeSet;
-    changeSet.set(PA_GCONF_PATH_MODULES"/combine/locked", true);
@@ -385 +462 @@
-
-    combineCheckButton->set_active(gconf->get_bool(PA_GCONF_PATH_MODULES"/combine/enabled"));
-
+    /* Get speaker layout from daemon.conf file */
+    {
+    gchar *contents, *local_path;
+    gsize length;
+    int speakerLayout;
+
+    local_path = g_strdup_printf ("%s/.pulse/daemon.conf", g_get_home_dir ());
+    if (!g_file_get_contents (local_path, &contents, &length, NULL))
+        g_file_get_contents ("/etc/pulse/daemon.conf", &contents, &length, NULL);
+
+    g_free (local_path);
+
+    if (contents) {
+        gchar **lines;
+        gint i;
+
+        lines = g_strsplit (contents, "\n", 0);
+        if (lines) {
+        for (i = 0; lines[i] != NULL; i++) {
+            if (!g_ascii_strncasecmp ((const gchar *) lines[i],
+                          "default-sample-channels",
+                          23)) {
+            gchar **current_line;
+            int j;
+
+            current_line = g_strsplit (lines[i], "=", 2);
+            if (current_line) {
+                gchar *s = g_strdup (current_line[1] ? current_line[1] : "2");
+                gchar *number = g_strstrip (s);
+
+                speakerLayout = number ? atoi (number) : 2;
+                if (speakerLayout >= 1 && speakerLayout <= 9)
+                    speakerLayoutComboBox->set_active (speakerLayout - 1);
+                else
+                    speakerLayoutComboBox->set_active(1);
+
+                g_strfreev (current_line);
+                g_free (number);
+            } else
+                 speakerLayoutComboBox->set_active(1);
+
+            break;
+            }
+        }
+
+        g_strfreev (lines);
+        } else
+        speakerLayoutComboBox->set_active(1);
+
+        g_free (contents);
+    } else
+        speakerLayoutComboBox->set_active(1);
+    }
+
+    printf ("Exit from parsing code");
+
-    ignoreChanges = FALSE;
-
-    updateSensitive();
+
+    printf ("readFromGConf successful");
-}
-
-void MainWindow::checkForModules() {

src/paprefs.glade

@@ -1 @@
-encoding="UTF-8" standalone="no"?
-
-
+standalone="no"?> <!--*- mode: xml -*--
+http://glade.gnome.org/
+
-<glade-interface>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+