diff options
-rw-r--r-- | src/ServerInfoManager.cc | 4 | ||||
-rw-r--r-- | src/ServerInfoManager.hh | 2 | ||||
-rw-r--r-- | src/SinkInputWindow.cc | 4 | ||||
-rw-r--r-- | src/SinkInputWindow.hh | 3 | ||||
-rw-r--r-- | src/SourceOutputWindow.cc | 4 | ||||
-rw-r--r-- | src/SourceOutputWindow.hh | 3 | ||||
-rw-r--r-- | src/paman.glade | 150 |
7 files changed, 142 insertions, 28 deletions
diff --git a/src/ServerInfoManager.cc b/src/ServerInfoManager.cc index e05b401..adb91b2 100644 --- a/src/ServerInfoManager.cc +++ b/src/ServerInfoManager.cc @@ -182,6 +182,7 @@ SinkInputInfo::SinkInputInfo(const struct pa_sink_input_info &i) : volume(i.volume), buffer_usec(i.buffer_usec), sink_usec(i.sink_usec), + resample_method(i.resample_method ? i.resample_method : "<i>n/a</i>"), window(NULL) { } @@ -200,6 +201,7 @@ void SinkInputInfo::update(const struct pa_sink_input_info &i) { volume = i.volume; buffer_usec = i.buffer_usec; sink_usec = i.sink_usec; + resample_method = i.resample_method ? i.resample_method : "<i>n/a</i>"; if (window) window->updateInfo(*this); @@ -226,6 +228,7 @@ SourceOutputInfo::SourceOutputInfo(const struct pa_source_output_info &i) : owner_module(i.owner_module), buffer_usec(i.buffer_usec), source_usec(i.source_usec), + resample_method(i.resample_method ? i.resample_method : "<i>n/a</i>"), window(NULL) { } @@ -243,6 +246,7 @@ void SourceOutputInfo::update(const struct pa_source_output_info &i) { owner_module = i.owner_module; buffer_usec = i.buffer_usec; source_usec = i.source_usec; + resample_method = i.resample_method ? i.resample_method : "<i>n/a</i>"; if (window) window->updateInfo(*this); diff --git a/src/ServerInfoManager.hh b/src/ServerInfoManager.hh index a3f0aaf..bdce711 100644 --- a/src/ServerInfoManager.hh +++ b/src/ServerInfoManager.hh @@ -117,6 +117,7 @@ public: uint32_t owner_module; pa_volume_t volume; pa_usec_t buffer_usec, sink_usec; + Glib::ustring resample_method; Gtk::TreeRowReference treeRef; @@ -139,6 +140,7 @@ public: uint32_t client; uint32_t owner_module; pa_usec_t buffer_usec, source_usec; + Glib::ustring resample_method; Gtk::TreeRowReference treeRef; diff --git a/src/SinkInputWindow.cc b/src/SinkInputWindow.cc index 1cf7476..5b2365d 100644 --- a/src/SinkInputWindow.cc +++ b/src/SinkInputWindow.cc @@ -15,6 +15,7 @@ SinkInputWindow::SinkInputWindow(BaseObjectType* cobject, const Glib::RefPtr<Gno clientLabel(NULL), ownerModuleLabel(NULL), volumeLabel(NULL), + resampleMethodLabel(NULL), closeButton(NULL), toOwnerModuleButton(NULL), toClientButton(NULL), @@ -40,6 +41,7 @@ SinkInputWindow::SinkInputWindow(BaseObjectType* cobject, const Glib::RefPtr<Gno refGlade->get_widget("volumeResetButton", volumeResetButton); refGlade->get_widget("volumeMuteButton", volumeMuteButton); refGlade->get_widget("killButton", killButton); + refGlade->get_widget("resampleMethodLabel", resampleMethodLabel); closeButton->signal_clicked().connect(sigc::mem_fun(*this, &SinkInputWindow::onCloseButton)); toOwnerModuleButton->signal_clicked().connect(sigc::mem_fun(*this, &SinkInputWindow::onToOwnerModuleButton)); @@ -96,6 +98,8 @@ void SinkInputWindow::updateInfo(const SinkInputInfo &i) { else snprintf(t, sizeof(t), "%0.0f%% (-∞dB)", percent); volumeLabel->set_markup(t); + + resampleMethodLabel->set_markup(i.resample_method); set_title("Sink Input: "+i.name); diff --git a/src/SinkInputWindow.hh b/src/SinkInputWindow.hh index 01ef7b8..fd78fd2 100644 --- a/src/SinkInputWindow.hh +++ b/src/SinkInputWindow.hh @@ -20,7 +20,8 @@ public: *sinkLabel, *clientLabel, *ownerModuleLabel, - *volumeLabel; + *volumeLabel, + *resampleMethodLabel; Gtk::Button *closeButton, *toOwnerModuleButton, diff --git a/src/SourceOutputWindow.cc b/src/SourceOutputWindow.cc index fde5c0e..68d43d9 100644 --- a/src/SourceOutputWindow.cc +++ b/src/SourceOutputWindow.cc @@ -14,6 +14,7 @@ SourceOutputWindow::SourceOutputWindow(BaseObjectType* cobject, const Glib::RefP clientLabel(NULL), ownerModuleLabel(NULL), latencyLabel(NULL), + resampleMethodLabel(NULL), closeButton(NULL), toOwnerModuleButton(NULL), toClientButton(NULL), @@ -32,6 +33,7 @@ SourceOutputWindow::SourceOutputWindow(BaseObjectType* cobject, const Glib::RefP refGlade->get_widget("toClientButton", toClientButton); refGlade->get_widget("toSourceButton", toSourceButton); refGlade->get_widget("killButton", killButton); + refGlade->get_widget("resampleMethodLabel", resampleMethodLabel); closeButton->signal_clicked().connect(sigc::mem_fun(*this, &SourceOutputWindow::onCloseButton)); toOwnerModuleButton->signal_clicked().connect(sigc::mem_fun(*this, &SourceOutputWindow::onToOwnerModuleButton)); @@ -76,6 +78,8 @@ void SourceOutputWindow::updateInfo(const SourceOutputInfo &i) { clientLabel->set_text(client->name); } + resampleMethodLabel->set_markup(i.resample_method); + set_title("Source Output: "+i.name); this->source = i.source; diff --git a/src/SourceOutputWindow.hh b/src/SourceOutputWindow.hh index c474f72..f6cbc6b 100644 --- a/src/SourceOutputWindow.hh +++ b/src/SourceOutputWindow.hh @@ -19,7 +19,8 @@ public: *sourceLabel, *clientLabel, *ownerModuleLabel, - *latencyLabel; + *latencyLabel, + *resampleMethodLabel; Gtk::Button *closeButton, *toOwnerModuleButton, diff --git a/src/paman.glade b/src/paman.glade index a50e572..881884f 100644 --- a/src/paman.glade +++ b/src/paman.glade @@ -3572,7 +3572,7 @@ <child> <widget class="GtkTable" id="table6"> <property name="visible">True</property> - <property name="n_rows">8</property> + <property name="n_rows">9</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">6</property> @@ -3795,30 +3795,6 @@ </child> <child> - <widget class="GtkLabel" id="label4754"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Volume:</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">1</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">7</property> - <property name="bottom_attach">8</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> <widget class="GtkLabel" id="sampleTypeLabel"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -3944,6 +3920,30 @@ </child> <child> + <widget class="GtkLabel" id="label4754"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Volume:</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">1</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">8</property> + <property name="bottom_attach">9</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> <widget class="GtkHBox" id="hbox10"> <property name="visible">True</property> <property name="homogeneous">False</property> @@ -4028,6 +4028,55 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">8</property> + <property name="bottom_attach">9</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label4833"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Resample Method:</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">1</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="resampleMethodLabel"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">label4834</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">7</property> <property name="bottom_attach">8</property> <property name="x_options">fill</property> @@ -4224,7 +4273,7 @@ <child> <widget class="GtkTable" id="table7"> <property name="visible">True</property> - <property name="n_rows">7</property> + <property name="n_rows">8</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">6</property> @@ -4570,6 +4619,55 @@ <property name="y_options"></property> </packing> </child> + + <child> + <widget class="GtkLabel" id="label4835"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Resample Method:</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">1</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="resampleMethodLabel"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">label4836</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> |