From 65cb23b0eddf61d768a17c721ad7d00644aa70ec Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 21 Aug 2006 00:56:38 +0000
Subject: - add new option "All Except Monitor Sources" to sources option menu
 - show a nice hint that one can right click on a stream

git-svn-id: file:///home/lennart/svn/public/pavucontrol/trunk@45 c17c95f2-f111-0410-90bf-f30a9569010c
---
 src/pavucontrol.cc | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/pavucontrol.cc')

diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
index 8cd1e62..1dfdf52 100644
--- a/src/pavucontrol.cc
+++ b/src/pavucontrol.cc
@@ -46,6 +46,7 @@ enum SinkType {
 
 enum SourceType{
     SOURCE_ALL,
+    SOURCE_NO_MONITOR,
     SOURCE_HARDWARE,
     SOURCE_VIRTUAL,
     SOURCE_MONITOR,
@@ -492,8 +493,8 @@ void SinkInputWidget::SinkMenuItem::onToggle() {
 
 MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) :
     Gtk::Window(cobject),
-    showSinkType(SINK_HARDWARE),
-    showSourceType(SOURCE_HARDWARE) {
+    showSinkType(SINK_ALL),
+    showSourceType(SOURCE_NO_MONITOR) {
 
     x->get_widget("streamsVBox", streamsVBox);
     x->get_widget("sinksVBox", sinksVBox);
@@ -679,7 +680,9 @@ void MainWindow::updateDeviceVisibility() {
     for (std::map<uint32_t, SourceWidget*>::iterator i = sourceWidgets.begin(); i != sourceWidgets.end(); ++i) {
         SourceWidget* w = i->second;
 
-        if (showSourceType == SOURCE_ALL || w->type == showSourceType) {
+        if (showSourceType == SOURCE_ALL ||
+            w->type == showSourceType ||
+            (showSourceType == SOURCE_NO_MONITOR && w->type != SOURCE_MONITOR)) {
             w->show_all();
             is_empty = false;
         }
@@ -728,7 +731,7 @@ void MainWindow::onSinkTypeComboBoxChanged() {
     showSinkType = (SinkType) sinkTypeComboBox->get_active_row_number();
 
     if (showSinkType == (SinkType) -1)
-        sinkTypeComboBox->set_active((int) SINK_HARDWARE);
+        sinkTypeComboBox->set_active((int) SINK_ALL);
 
     updateDeviceVisibility();
 }
@@ -737,7 +740,7 @@ void MainWindow::onSourceTypeComboBoxChanged() {
     showSourceType = (SourceType) sourceTypeComboBox->get_active_row_number();
 
     if (showSourceType == (SourceType) -1)
-        sourceTypeComboBox->set_active((int) SOURCE_HARDWARE);
+        sourceTypeComboBox->set_active((int) SOURCE_NO_MONITOR);
 
     updateDeviceVisibility();
 }
-- 
cgit