itdominator
/
pavucontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow for the sink input peak detect to survive across sink moves.

This commit is contained in:
Colin Guthrie 2009-10-17 15:59:29 +01:00
parent 68e3401350
commit 78f5194541
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/mainwindow.cc
View File

@ -317,8 +317,7 @@ void MainWindow::createMonitorStreamForSource(uint32_t source_idx) {
} }
} }
void MainWindow::createMonitorStreamForSinkInput(uint32_t sink_input_idx, uint32_t sink_idx) { void MainWindow::createMonitorStreamForSinkInput(SinkInputWidget* w, uint32_t sink_idx) {
pa_stream *s;
char t[16]; char t[16];
pa_buffer_attr attr; pa_buffer_attr attr;
pa_sample_spec ss; pa_sample_spec ss;
@ -331,6 +330,11 @@ void MainWindow::createMonitorStreamForSinkInput(uint32_t sink_input_idx, uint32
if (!sinkWidgets.count(sink_idx)) if (!sinkWidgets.count(sink_idx))
return; return;
if (w->peak) {
pa_stream_disconnect(w->peak);
w->peak = NULL;
}
monitor_source_idx = sinkWidgets[sink_idx]->monitor_index; monitor_source_idx = sinkWidgets[sink_idx]->monitor_index;
memset(&attr, 0, sizeof(attr)); memset(&attr, 0, sizeof(attr));
@ -339,18 +343,19 @@ void MainWindow::createMonitorStreamForSinkInput(uint32_t sink_input_idx, uint32
snprintf(t, sizeof(t), "%u", monitor_source_idx); snprintf(t, sizeof(t), "%u", monitor_source_idx);
if (!(s = pa_stream_new(get_context(), _("Peak detect"), &ss, NULL))) { if (!(w->peak = pa_stream_new(get_context(), _("Peak detect"), &ss, NULL))) {
show_error(_("Failed to create monitoring stream")); show_error(_("Failed to create monitoring stream"));
return; return;
} }
pa_stream_set_monitor_stream(s, sink_input_idx); pa_stream_set_monitor_stream(w->peak, w->index);
pa_stream_set_read_callback(s, read_callback, this); pa_stream_set_read_callback(w->peak, read_callback, this);
pa_stream_set_suspended_callback(s, suspended_callback, this); pa_stream_set_suspended_callback(w->peak, suspended_callback, this);
if (pa_stream_connect_record(s, t, &attr, (pa_stream_flags_t) (PA_STREAM_DONT_MOVE|PA_STREAM_PEAK_DETECT|PA_STREAM_ADJUST_LATENCY)) < 0) { if (pa_stream_connect_record(w->peak, t, &attr, (pa_stream_flags_t) (PA_STREAM_DONT_MOVE|PA_STREAM_PEAK_DETECT|PA_STREAM_ADJUST_LATENCY)) < 0) {
show_error(_("Failed to connect monitoring stream")); show_error(_("Failed to connect monitoring stream"));
pa_stream_unref(s); pa_stream_unref(w->peak);
w->peak = NULL;
return; return;
} }
} }
@ -469,9 +474,12 @@ void MainWindow::updateSinkInput(const pa_sink_input_info &info) {
} }
} }
if (sinkInputWidgets.count(info.index)) if (sinkInputWidgets.count(info.index)) {
w = sinkInputWidgets[info.index]; w = sinkInputWidgets[info.index];
else { if (pa_context_get_server_protocol_version(get_context()) >= 13)
if (w->sinkIndex() != info.sink)
createMonitorStreamForSinkInput(w, info.sink);
} else {
sinkInputWidgets[info.index] = w = SinkInputWidget::create(this); sinkInputWidgets[info.index] = w = SinkInputWidget::create(this);
w->setChannelMap(info.channel_map, true); w->setChannelMap(info.channel_map, true);
streamsVBox->pack_start(*w, false, false, 0); streamsVBox->pack_start(*w, false, false, 0);
@ -480,7 +488,7 @@ void MainWindow::updateSinkInput(const pa_sink_input_info &info) {
is_new = true; is_new = true;
if (pa_context_get_server_protocol_version(get_context()) >= 13) if (pa_context_get_server_protocol_version(get_context()) >= 13)
createMonitorStreamForSinkInput(info.index, info.sink); createMonitorStreamForSinkInput(w, info.sink);
} }
w->updating = true; w->updating = true;

2
src/mainwindow.h
View File

@ -80,7 +80,7 @@ public:
void updateDeviceVisibility(); void updateDeviceVisibility();
void reallyUpdateDeviceVisibility(); void reallyUpdateDeviceVisibility();
void createMonitorStreamForSource(uint32_t source_idx); void createMonitorStreamForSource(uint32_t source_idx);
void createMonitorStreamForSinkInput(uint32_t sink_input_idx, uint32_t sink_idx); void createMonitorStreamForSinkInput(SinkInputWidget* w, uint32_t sink_idx);
void setIconFromProplist(Gtk::Image *icon, pa_proplist *l, const char *name); void setIconFromProplist(Gtk::Image *icon, pa_proplist *l, const char *name);

3
src/streamwidget.cc
View File

@ -31,7 +31,8 @@
/*** StreamWidget ***/ /*** StreamWidget ***/
StreamWidget::StreamWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : StreamWidget::StreamWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) :
MinimalStreamWidget(cobject, x), MinimalStreamWidget(cobject, x),
mpMainWindow(NULL) { mpMainWindow(NULL),
peak(NULL) {
x->get_widget("lockToggleButton", lockToggleButton); x->get_widget("lockToggleButton", lockToggleButton);
x->get_widget("muteToggleButton", muteToggleButton); x->get_widget("muteToggleButton", muteToggleButton);

1
src/streamwidget.h
View File

@ -43,6 +43,7 @@ public:
pa_channel_map channelMap; pa_channel_map channelMap;
pa_cvolume volume; pa_cvolume volume;
pa_stream *peak;
ChannelWidget *channelWidgets[PA_CHANNELS_MAX]; ChannelWidget *channelWidgets[PA_CHANNELS_MAX];