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

sinkwidget: add support for AAC pass-through

This commit is contained in:
Akihiro Tsukada 2013-02-25 01:03:31 +09:00 committed by Tanu Kaskinen
parent 0d7cbc57a0
commit cbf3acb543
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pavucontrol.glade
View File

@ -426,9 +426,6 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="n_rows">2</property> <property name="n_rows">2</property>
<property name="n_columns">3</property> <property name="n_columns">3</property>
<child>
<placeholder/>
</child>
<child> <child>
<object class="GtkCheckButton" id="encodingFormatPCM"> <object class="GtkCheckButton" id="encodingFormatPCM">
<property name="label" translatable="yes">PCM</property> <property name="label" translatable="yes">PCM</property>
@ -499,6 +496,22 @@
<property name="bottom_attach">2</property> <property name="bottom_attach">2</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkCheckButton" id="encodingFormatAAC">
<property name="label" translatable="yes">AAC</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>

12
src/sinkwidget.cc
View File

@ -62,6 +62,18 @@ SinkWidget::SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
encodings[i].encoding = PA_ENCODING_DTS_IEC61937; encodings[i].encoding = PA_ENCODING_DTS_IEC61937;
x->get_widget("encodingFormatDTS", encodings[i].widget); x->get_widget("encodingFormatDTS", encodings[i].widget);
encodings[i].widget->signal_toggled().connect(sigc::mem_fun(*this, &SinkWidget::onEncodingsChange)); encodings[i].widget->signal_toggled().connect(sigc::mem_fun(*this, &SinkWidget::onEncodingsChange));
++i;
encodings[i].encoding = PA_ENCODING_INVALID;
x->get_widget("encodingFormatAAC", encodings[i].widget);
encodings[i].widget->set_sensitive(false);
#ifdef PA_ENCODING_MPEG2_AAC_IEC61937
if (pa_context_get_server_protocol_version(get_context()) >= 28) {
encodings[i].encoding = PA_ENCODING_MPEG2_AAC_IEC61937;
encodings[i].widget->signal_toggled().connect(sigc::mem_fun(*this, &SinkWidget::onEncodingsChange));
encodings[i].widget->set_sensitive(true);
}
#endif
#endif #endif
} }

2
src/sinkwidget.h
View File

@ -27,7 +27,7 @@
#if HAVE_EXT_DEVICE_RESTORE_API #if HAVE_EXT_DEVICE_RESTORE_API
# include <pulse/format.h> # include <pulse/format.h>
# define PAVU_NUM_ENCODINGS 5 # define PAVU_NUM_ENCODINGS 6
typedef struct { typedef struct {
pa_encoding encoding; pa_encoding encoding;