From 8af6520c602afd75418ac5b33f75f40a4706dcb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?poljar=20=28Damir=20Jeli=C4=87=29?= Date: Thu, 26 Jul 2012 15:42:10 +0200 Subject: [PATCH] sink/sourcewidget: Move the index and card_index to the devicewidget This is a minor cleanup that moves the index of the sink/source and the card_index from the sink/source widget to the device widget. --- src/devicewidget.h | 1 + src/sinkwidget.h | 2 +- src/sourcewidget.h | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/devicewidget.h b/src/devicewidget.h index 2ad5d1e..94f14e6 100644 --- a/src/devicewidget.h +++ b/src/devicewidget.h @@ -39,6 +39,7 @@ public: Glib::ustring name; Glib::ustring description; + uint32_t index, card_index; Gtk::ToggleButton *lockToggleButton, *muteToggleButton, *defaultToggleButton; diff --git a/src/sinkwidget.h b/src/sinkwidget.h index 4b79879..a2fbab9 100644 --- a/src/sinkwidget.h +++ b/src/sinkwidget.h @@ -41,7 +41,7 @@ public: static SinkWidget* create(MainWindow* mainWindow); SinkType type; - uint32_t index, monitor_index, card_index; + uint32_t monitor_index; bool can_decibel; #if HAVE_EXT_DEVICE_RESTORE_API diff --git a/src/sourcewidget.h b/src/sourcewidget.h index ebd92e3..9b7809c 100644 --- a/src/sourcewidget.h +++ b/src/sourcewidget.h @@ -31,7 +31,6 @@ public: static SourceWidget* create(MainWindow* mainWindow); SourceType type; - uint32_t index, card_index; bool can_decibel; virtual void onMuteToggleButton();