diff --git a/src/Makefile.am b/src/Makefile.am
index 4a228b8..966e391 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,7 @@ pavucontrol_SOURCES= \
minimalstreamwidget.h minimalstreamwidget.cc \
channelwidget.h channelwidget.cc \
streamwidget.h streamwidget.cc \
+ cardwidget.h cardwidget.cc \
pavucontrol.h pavucontrol.cc \
i18n.h
diff --git a/src/cardwidget.cc b/src/cardwidget.cc
new file mode 100644
index 0000000..4410c5f
--- /dev/null
+++ b/src/cardwidget.cc
@@ -0,0 +1,90 @@
+/***
+ This file is part of pavucontrol.
+
+ Copyright 2006-2008 Lennart Poettering
+ Copyright 2009 Colin Guthrie
+
+ pavucontrol is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ pavucontrol is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with pavucontrol. If not, see .
+***/
+
+#include "cardwidget.h"
+
+#include "i18n.h"
+
+/*** CardWidget ***/
+CardWidget::CardWidget(BaseObjectType* cobject, const Glib::RefPtr& x) :
+ Gtk::VBox(cobject) {
+
+ x->get_widget("nameLabel", nameLabel);
+ x->get_widget("profileList", profileList);
+ x->get_widget("iconImage", iconImage);
+
+ treeModel = Gtk::ListStore::create(profileModel);
+ profileList->set_model(treeModel);
+ profileList->pack_start(profileModel.desc);
+
+ profileList->signal_changed().connect( sigc::mem_fun(*this, &CardWidget::onProfileChange));
+}
+
+CardWidget* CardWidget::create() {
+ CardWidget* w;
+ Glib::RefPtr x = Gnome::Glade::Xml::create(GLADE_FILE, "cardWidget");
+ x->get_widget_derived("cardWidget", w);
+ return w;
+}
+
+
+void CardWidget::prepareMenu() {
+ int idx = 0;
+ int active_idx = -1;
+
+ treeModel->clear();
+ //Fill the ComboBox's Tree Model:
+ for (std::map::iterator i = profiles.begin(); i != profiles.end(); ++i) {
+ Gtk::TreeModel::Row row = *(treeModel->append());
+ row[profileModel.name] = i->first;
+ row[profileModel.desc] = i->second;
+ if (i->first == activeProfile)
+ active_idx = idx;
+ idx++;
+ }
+
+ if (active_idx >= 0)
+ profileList->set_active(active_idx);
+}
+
+void CardWidget::onProfileChange() {
+ Gtk::TreeModel::iterator iter;
+
+ if (updating)
+ return;
+
+ iter = profileList->get_active();
+ if (iter)
+ {
+ Gtk::TreeModel::Row row = *iter;
+ if (row)
+ {
+ pa_operation* o;
+ Glib::ustring profile = row[profileModel.name];
+
+ if (!(o = pa_context_set_card_profile_by_index(get_context(), index, profile.c_str(), NULL, NULL))) {
+ show_error(_("pa_context_set_card_profile_by_index() failed"));
+ return;
+ }
+
+ pa_operation_unref(o);
+ }
+ }
+}
diff --git a/src/cardwidget.h b/src/cardwidget.h
new file mode 100644
index 0000000..bca22c1
--- /dev/null
+++ b/src/cardwidget.h
@@ -0,0 +1,68 @@
+/***
+ This file is part of pavucontrol.
+
+ Copyright 2006-2008 Lennart Poettering
+ Copyright 2009 Colin Guthrie
+
+ pavucontrol is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ pavucontrol is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with pavucontrol. If not, see .
+***/
+
+#ifndef cardwidget_h
+#define cardwidget_h
+
+#include "pavucontrol.h"
+
+class CardWidget : public Gtk::VBox {
+public:
+ CardWidget(BaseObjectType* cobject, const Glib::RefPtr& x);
+ static CardWidget* create();
+
+ Gtk::Label *nameLabel;
+ Gtk::ToggleButton *streamToggleButton;
+ Gtk::Menu menu;
+ Gtk::Image *iconImage;
+ Glib::ustring name;
+ uint32_t index;
+ bool updating;
+
+ std::map profiles;
+ Glib::ustring activeProfile;
+ bool hasSinks;
+ bool hasSources;
+
+ void prepareMenu();
+
+protected:
+ virtual void onProfileChange();
+
+ //Tree model columns:
+ class ModelColumns : public Gtk::TreeModel::ColumnRecord
+ {
+ public:
+
+ ModelColumns()
+ { add(name); add(desc); }
+
+ Gtk::TreeModelColumn name;
+ Gtk::TreeModelColumn desc;
+ };
+
+ ModelColumns profileModel;
+
+ //Child widgets:
+ Gtk::ComboBox *profileList;
+ Glib::RefPtr treeModel;
+};
+
+#endif
diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
index 64b4d8c..ca6366c 100644
--- a/src/pavucontrol.cc
+++ b/src/pavucontrol.cc
@@ -34,6 +34,7 @@
#include "minimalstreamwidget.h"
#include "channelwidget.h"
#include "streamwidget.h"
+#include "cardwidget.h"
static pa_context *context = NULL;
static int n_outstanding = 0;
@@ -66,48 +67,6 @@ enum SourceType{
class MainWindow;
-class CardWidget : public Gtk::VBox {
-public:
- CardWidget(BaseObjectType* cobject, const Glib::RefPtr& x);
- static CardWidget* create();
-
- Gtk::Label *nameLabel;
- Gtk::ToggleButton *streamToggleButton;
- Gtk::Menu menu;
- Gtk::Image *iconImage;
- Glib::ustring name;
- uint32_t index;
- bool updating;
-
- std::map profiles;
- Glib::ustring activeProfile;
- bool hasSinks;
- bool hasSources;
-
- void prepareMenu();
-
-protected:
- virtual void onProfileChange();
-
- //Tree model columns:
- class ModelColumns : public Gtk::TreeModel::ColumnRecord
- {
- public:
-
- ModelColumns()
- { add(name); add(desc); }
-
- Gtk::TreeModelColumn name;
- Gtk::TreeModelColumn desc;
- };
-
- ModelColumns profileModel;
-
- //Child widgets:
- Gtk::ComboBox *profileList;
- Glib::RefPtr treeModel;
-};
-
class SinkWidget : public StreamWidget {
public:
SinkWidget(BaseObjectType* cobject, const Glib::RefPtr& x);
@@ -308,73 +267,6 @@ void show_error(const char *txt) {
Gtk::Main::quit();
}
-/*** CardWidget ***/
-CardWidget::CardWidget(BaseObjectType* cobject, const Glib::RefPtr& x) :
- Gtk::VBox(cobject) {
-
- x->get_widget("nameLabel", nameLabel);
- x->get_widget("profileList", profileList);
- x->get_widget("iconImage", iconImage);
-
- treeModel = Gtk::ListStore::create(profileModel);
- profileList->set_model(treeModel);
- profileList->pack_start(profileModel.desc);
-
- profileList->signal_changed().connect( sigc::mem_fun(*this, &CardWidget::onProfileChange));
-}
-
-CardWidget* CardWidget::create() {
- CardWidget* w;
- Glib::RefPtr x = Gnome::Glade::Xml::create(GLADE_FILE, "cardWidget");
- x->get_widget_derived("cardWidget", w);
- return w;
-}
-
-
-void CardWidget::prepareMenu() {
- int idx = 0;
- int active_idx = -1;
-
- treeModel->clear();
- //Fill the ComboBox's Tree Model:
- for (std::map::iterator i = profiles.begin(); i != profiles.end(); ++i) {
- Gtk::TreeModel::Row row = *(treeModel->append());
- row[profileModel.name] = i->first;
- row[profileModel.desc] = i->second;
- if (i->first == activeProfile)
- active_idx = idx;
- idx++;
- }
-
- if (active_idx >= 0)
- profileList->set_active(active_idx);
-}
-
-void CardWidget::onProfileChange() {
- Gtk::TreeModel::iterator iter;
-
- if (updating)
- return;
-
- iter = profileList->get_active();
- if (iter)
- {
- Gtk::TreeModel::Row row = *iter;
- if (row)
- {
- pa_operation* o;
- Glib::ustring profile = row[profileModel.name];
-
- if (!(o = pa_context_set_card_profile_by_index(context, index, profile.c_str(), NULL, NULL))) {
- show_error(_("pa_context_set_card_profile_by_index() failed"));
- return;
- }
-
- pa_operation_unref(o);
- }
- }
-}
-
SinkWidget::SinkWidget(BaseObjectType* cobject, const Glib::RefPtr& x) :
StreamWidget(cobject, x),
@@ -1898,6 +1790,10 @@ void context_state_callback(pa_context *c, void *userdata) {
}
}
+pa_context* get_context(void) {
+ return context;
+}
+
int main(int argc, char *argv[]) {
/* Initialize the i18n stuff */
diff --git a/src/pavucontrol.h b/src/pavucontrol.h
index 55256d7..2dec8cd 100644
--- a/src/pavucontrol.h
+++ b/src/pavucontrol.h
@@ -34,4 +34,7 @@
#define GLADE_FILE "pavucontrol.glade"
#endif
+pa_context* get_context(void);
+void show_error(const char *txt);
+
#endif