Split sinkwidget into it's own files.
This commit is contained in:
parent
d3a66f65b5
commit
38e7792eec
|
@ -29,6 +29,7 @@ pavucontrol_SOURCES= \
|
|||
channelwidget.h channelwidget.cc \
|
||||
streamwidget.h streamwidget.cc \
|
||||
cardwidget.h cardwidget.cc \
|
||||
sinkwidget.h sinkwidget.cc \
|
||||
pavucontrol.h pavucontrol.cc \
|
||||
i18n.h
|
||||
|
||||
|
|
|
@ -35,56 +35,13 @@
|
|||
#include "channelwidget.h"
|
||||
#include "streamwidget.h"
|
||||
#include "cardwidget.h"
|
||||
#include "sinkwidget.h"
|
||||
|
||||
static pa_context *context = NULL;
|
||||
static int n_outstanding = 0;
|
||||
|
||||
enum SinkInputType {
|
||||
SINK_INPUT_ALL,
|
||||
SINK_INPUT_CLIENT,
|
||||
SINK_INPUT_VIRTUAL
|
||||
};
|
||||
|
||||
enum SinkType {
|
||||
SINK_ALL,
|
||||
SINK_HARDWARE,
|
||||
SINK_VIRTUAL,
|
||||
};
|
||||
|
||||
enum SourceOutputType {
|
||||
SOURCE_OUTPUT_ALL,
|
||||
SOURCE_OUTPUT_CLIENT,
|
||||
SOURCE_OUTPUT_VIRTUAL
|
||||
};
|
||||
|
||||
enum SourceType{
|
||||
SOURCE_ALL,
|
||||
SOURCE_NO_MONITOR,
|
||||
SOURCE_HARDWARE,
|
||||
SOURCE_VIRTUAL,
|
||||
SOURCE_MONITOR,
|
||||
};
|
||||
|
||||
class MainWindow;
|
||||
|
||||
class SinkWidget : public StreamWidget {
|
||||
public:
|
||||
SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x);
|
||||
static SinkWidget* create();
|
||||
|
||||
SinkType type;
|
||||
Glib::ustring description;
|
||||
Glib::ustring name;
|
||||
uint32_t index, monitor_index, card_index;
|
||||
bool can_decibel;
|
||||
|
||||
Gtk::CheckMenuItem defaultMenuItem;
|
||||
|
||||
virtual void onMuteToggleButton();
|
||||
virtual void executeVolumeUpdate();
|
||||
virtual void onDefaultToggle();
|
||||
};
|
||||
|
||||
class SourceWidget : public StreamWidget {
|
||||
public:
|
||||
SourceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x);
|
||||
|
@ -268,64 +225,6 @@ void show_error(const char *txt) {
|
|||
}
|
||||
|
||||
|
||||
SinkWidget::SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) :
|
||||
StreamWidget(cobject, x),
|
||||
defaultMenuItem("_Default", true){
|
||||
|
||||
add_events(Gdk::BUTTON_PRESS_MASK);
|
||||
|
||||
defaultMenuItem.set_active(false);
|
||||
defaultMenuItem.signal_toggled().connect(sigc::mem_fun(*this, &SinkWidget::onDefaultToggle));
|
||||
menu.append(defaultMenuItem);
|
||||
menu.show_all();
|
||||
}
|
||||
|
||||
SinkWidget* SinkWidget::create() {
|
||||
SinkWidget* w;
|
||||
Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "streamWidget");
|
||||
x->get_widget_derived("streamWidget", w);
|
||||
return w;
|
||||
}
|
||||
|
||||
void SinkWidget::executeVolumeUpdate() {
|
||||
pa_operation* o;
|
||||
|
||||
if (!(o = pa_context_set_sink_volume_by_index(context, index, &volume, NULL, NULL))) {
|
||||
show_error(_("pa_context_set_sink_volume_by_index() failed"));
|
||||
return;
|
||||
}
|
||||
|
||||
pa_operation_unref(o);
|
||||
}
|
||||
|
||||
void SinkWidget::onMuteToggleButton() {
|
||||
StreamWidget::onMuteToggleButton();
|
||||
|
||||
if (updating)
|
||||
return;
|
||||
|
||||
pa_operation* o;
|
||||
if (!(o = pa_context_set_sink_mute_by_index(context, index, muteToggleButton->get_active(), NULL, NULL))) {
|
||||
show_error(_("pa_context_set_sink_mute_by_index() failed"));
|
||||
return;
|
||||
}
|
||||
|
||||
pa_operation_unref(o);
|
||||
}
|
||||
|
||||
void SinkWidget::onDefaultToggle() {
|
||||
pa_operation* o;
|
||||
|
||||
if (updating)
|
||||
return;
|
||||
|
||||
if (!(o = pa_context_set_default_sink(context, name.c_str(), NULL, NULL))) {
|
||||
show_error(_("pa_context_set_default_sink() failed"));
|
||||
return;
|
||||
}
|
||||
pa_operation_unref(o);
|
||||
}
|
||||
|
||||
SourceWidget::SourceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) :
|
||||
StreamWidget(cobject, x),
|
||||
defaultMenuItem(_("_Default"), true){
|
||||
|
|
|
@ -34,6 +34,32 @@
|
|||
#define GLADE_FILE "pavucontrol.glade"
|
||||
#endif
|
||||
|
||||
enum SinkInputType {
|
||||
SINK_INPUT_ALL,
|
||||
SINK_INPUT_CLIENT,
|
||||
SINK_INPUT_VIRTUAL
|
||||
};
|
||||
|
||||
enum SinkType {
|
||||
SINK_ALL,
|
||||
SINK_HARDWARE,
|
||||
SINK_VIRTUAL,
|
||||
};
|
||||
|
||||
enum SourceOutputType {
|
||||
SOURCE_OUTPUT_ALL,
|
||||
SOURCE_OUTPUT_CLIENT,
|
||||
SOURCE_OUTPUT_VIRTUAL
|
||||
};
|
||||
|
||||
enum SourceType {
|
||||
SOURCE_ALL,
|
||||
SOURCE_NO_MONITOR,
|
||||
SOURCE_HARDWARE,
|
||||
SOURCE_VIRTUAL,
|
||||
SOURCE_MONITOR,
|
||||
};
|
||||
|
||||
pa_context* get_context(void);
|
||||
void show_error(const char *txt);
|
||||
|
||||
|
|
|
@ -0,0 +1,81 @@
|
|||
/***
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "sinkwidget.h"
|
||||
|
||||
#include "i18n.h"
|
||||
|
||||
SinkWidget::SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) :
|
||||
StreamWidget(cobject, x),
|
||||
defaultMenuItem("_Default", true){
|
||||
|
||||
add_events(Gdk::BUTTON_PRESS_MASK);
|
||||
|
||||
defaultMenuItem.set_active(false);
|
||||
defaultMenuItem.signal_toggled().connect(sigc::mem_fun(*this, &SinkWidget::onDefaultToggle));
|
||||
menu.append(defaultMenuItem);
|
||||
menu.show_all();
|
||||
}
|
||||
|
||||
SinkWidget* SinkWidget::create() {
|
||||
SinkWidget* w;
|
||||
Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "streamWidget");
|
||||
x->get_widget_derived("streamWidget", w);
|
||||
return w;
|
||||
}
|
||||
|
||||
void SinkWidget::executeVolumeUpdate() {
|
||||
pa_operation* o;
|
||||
|
||||
if (!(o = pa_context_set_sink_volume_by_index(get_context(), index, &volume, NULL, NULL))) {
|
||||
show_error(_("pa_context_set_sink_volume_by_index() failed"));
|
||||
return;
|
||||
}
|
||||
|
||||
pa_operation_unref(o);
|
||||
}
|
||||
|
||||
void SinkWidget::onMuteToggleButton() {
|
||||
StreamWidget::onMuteToggleButton();
|
||||
|
||||
if (updating)
|
||||
return;
|
||||
|
||||
pa_operation* o;
|
||||
if (!(o = pa_context_set_sink_mute_by_index(get_context(), index, muteToggleButton->get_active(), NULL, NULL))) {
|
||||
show_error(_("pa_context_set_sink_mute_by_index() failed"));
|
||||
return;
|
||||
}
|
||||
|
||||
pa_operation_unref(o);
|
||||
}
|
||||
|
||||
void SinkWidget::onDefaultToggle() {
|
||||
pa_operation* o;
|
||||
|
||||
if (updating)
|
||||
return;
|
||||
|
||||
if (!(o = pa_context_set_default_sink(get_context(), name.c_str(), NULL, NULL))) {
|
||||
show_error(_("pa_context_set_default_sink() failed"));
|
||||
return;
|
||||
}
|
||||
pa_operation_unref(o);
|
||||
}
|
|
@ -0,0 +1,46 @@
|
|||
/***
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#ifndef sinkwidget_h
|
||||
#define sinkwidget_h
|
||||
|
||||
#include "pavucontrol.h"
|
||||
|
||||
#include "streamwidget.h"
|
||||
|
||||
class SinkWidget : public StreamWidget {
|
||||
public:
|
||||
SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x);
|
||||
static SinkWidget* create();
|
||||
|
||||
SinkType type;
|
||||
Glib::ustring description;
|
||||
Glib::ustring name;
|
||||
uint32_t index, monitor_index, card_index;
|
||||
bool can_decibel;
|
||||
|
||||
Gtk::CheckMenuItem defaultMenuItem;
|
||||
|
||||
virtual void onMuteToggleButton();
|
||||
virtual void executeVolumeUpdate();
|
||||
virtual void onDefaultToggle();
|
||||
};
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue