From: NicoHood <git@xxxxxxxxxxx>
---
src/paprefs.cc | 32 ++++++++++++++++++++++++++++++++
src/paprefs.glade | 36 +++++++++++++++++++++++++++++++-----
2 files changed, 63 insertions(+), 5 deletions(-)
diff --git a/src/paprefs.cc b/src/paprefs.cc
index 123fea5..8bd9884 100644
--- a/src/paprefs.cc
+++ b/src/paprefs.cc
@@ -61,6 +61,7 @@ public:
*rtpLoopbackCheckButton,
*rtpPortCheckButton,
*combineCheckButton,
+ *loopbackCheckButton,
*upnpMediaServerCheckButton,
*upnpNullSinkCheckButton;
@@ -70,6 +71,7 @@ public:
*rtpNullSinkRadioButton;
Glib::RefPtr<Gio::Settings> combineSettings;
+ Glib::RefPtr<Gio::Settings> loopbackSettings;
Glib::RefPtr<Gio::Settings> remoteAccessSettings;
Glib::RefPtr<Gio::Settings> zeroconfSettings;
Glib::RefPtr<Gio::Settings> raopSettings;
@@ -89,6 +91,7 @@ public:
void onChangeRtpReceive();
void onChangeRtpSend();
void onChangeCombine();
+ void onChangeLoopback();
void onChangeUpnp();
void onZeroconfDiscoverInstallButtonClicked();
@@ -110,6 +113,7 @@ public:
void writeToGSettingsRtpReceive();
void writeToGSettingsRtpSend();
void writeToGSettingsCombine();
+ void writeToGSettingsLoopback();
void writeToGSettingsUPnP();
void onGSettingsChange(const Glib::ustring& key);
@@ -156,6 +160,7 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
x->get_widget("rtpLoopbackCheckButton", rtpLoopbackCheckButton);
x->get_widget("rtpPortCheckButton", rtpPortCheckButton);
x->get_widget("combineCheckButton", combineCheckButton);
+ x->get_widget("loopbackCheckButton", loopbackCheckButton);
x->get_widget("upnpMediaServerCheckButton", upnpMediaServerCheckButton);
x->get_widget("upnpNullSinkCheckButton", upnpNullSinkCheckButton);
@@ -169,6 +174,9 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
combineSettings = Gio::Settings::create(MODULE_GROUP_SCHEMA,
MODULE_GROUPS_PATH "/combine/");
+ loopbackSettings = Gio::Settings::create(MODULE_GROUP_SCHEMA,
+ MODULE_GROUPS_PATH "/loopback/");
+
remoteAccessSettings = Gio::Settings::create(MODULE_GROUP_SCHEMA,
MODULE_GROUPS_PATH "/remote-access/");
@@ -188,6 +196,7 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
MODULE_GROUPS_PATH "/upnp-media-server/");
combineSettings->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::onGSettingsChange));
+ loopbackSettings->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::onGSettingsChange));
remoteAccessSettings->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::onGSettingsChange));
zeroconfSettings->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::onGSettingsChange));
raopSettings->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::onGSettingsChange));
@@ -215,6 +224,7 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
rtpNullSinkRadioButton->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::onChangeRtpSend));
combineCheckButton->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::onChangeCombine));
+ loopbackCheckButton->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::onChangeLoopback));
upnpMediaServerCheckButton->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::onChangeUpnp));
upnpNullSinkCheckButton->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::onChangeUpnp));
@@ -322,6 +332,13 @@ void MainWindow::onChangeCombine() {
writeToGSettingsCombine();
}
+void MainWindow::onChangeLoopback() {
+ if (ignoreChanges)
+ return;
+
+ writeToGSettingsLoopback();
+}
+
void MainWindow::onChangeUpnp() {
if (ignoreChanges)
@@ -430,6 +447,20 @@ void MainWindow::writeToGSettingsCombine() {
combineSettings->apply();
}
+void MainWindow::writeToGSettingsLoopback() {
+ loopbackSettings->delay();
+
+ if (loopbackCheckButton->get_active()) {
+ loopbackSettings->set_string("name0", Glib::ustring("module-loopback"));
+ loopbackSettings->set_string("args0", Glib::ustring("--latency-msec=5"));
+
+ loopbackSettings->set_boolean("enabled", true);
+ } else
+ loopbackSettings->set_boolean("enabled", false);
+
+ loopbackSettings->apply();
+}
+
void MainWindow::writeToGSettingsRemoteAccess() {
bool zeroconfEnabled, anonymousEnabled;
@@ -663,6 +694,7 @@ void MainWindow::readFromGSettings() {
rtpNullSinkRadioButton->set_active(TRUE);
combineCheckButton->set_active(combineSettings->get_boolean("enabled"));
+ loopbackCheckButton->set_active(loopbackSettings->get_boolean("enabled"));
upnpMediaServerCheckButton->set_active(upnpSettings->get_boolean("enabled"));
diff --git a/src/paprefs.glade b/src/paprefs.glade
index 401e9c1..0f250cc 100644
--- a/src/paprefs.glade
+++ b/src/paprefs.glade
@@ -1,12 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface>
- <!-- interface-requires gtk+ 2.16 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.10"/>
<object class="GtkWindow" id="mainWindow">
<property name="can_focus">False</property>
<property name="title" translatable="yes">PulseAudio Preferences</property>
<property name="resizable">False</property>
<property name="icon_name">preferences-desktop</property>
+ <child>
+ <placeholder/>
+ </child>
<child>
<object class="GtkVBox" id="vbox20">
<property name="visible">True</property>
@@ -337,6 +340,9 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label3">
@@ -537,6 +543,9 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label2">
@@ -572,13 +581,31 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="loopbackCheckButton">
+ <property name="label" translatable="yes">Add _loopback output device for routing audio from a source to a sink</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Simultaneous _Output</property>
+ <property name="label" translatable="yes">_Miscellaneous</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -625,4 +652,3 @@
</child>
</object>
</interface>
-
--
2.17.0
