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

sinkwidget: Move format selection options to 'Advanced' expander 

There's no reason to present this for all S/PDIF and HDMI cases. The
user can select it when required.
This commit is contained in:
Arun Raghavan 2012-11-20 19:51:41 +05:30
parent c69cffecdc
commit 5132a24b35
2 changed files with 133 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/pavucontrol.glade
View File

@ -394,6 +394,33 @@
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkVBox" id="channelsVBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkExpander" id="advancedOptions">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child> <child>
<object class="GtkTable" id="encodingSelect"> <object class="GtkTable" id="encodingSelect">
<property name="can_focus">False</property> <property name="can_focus">False</property>
@ -476,32 +503,9 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="position">2</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkVBox" id="channelsVBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkExpander" id="advancedOptions">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<child> <child>
<object class="GtkHBox" id="offsetSelect"> <object class="GtkHBox" id="offsetSelect">
<property name="visible">True</property> <property name="visible">True</property>
@ -551,6 +555,13 @@
</packing> </packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child> </child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="advancedLabel"> <object class="GtkLabel" id="advancedLabel">
@ -563,7 +574,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="position">4</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
</object> </object>

7
src/sinkwidget.cc
View File

@ -156,10 +156,13 @@ void SinkWidget::onPortChange() {
void SinkWidget::setDigital(bool digital) { void SinkWidget::setDigital(bool digital) {
#if HAVE_EXT_DEVICE_RESTORE_API #if HAVE_EXT_DEVICE_RESTORE_API
if (digital) if (digital) {
encodingSelect->show(); encodingSelect->show();
else advancedOptions->set_sensitive(true);
} else {
/* advancedOptions has sensitive=false by default */
encodingSelect->hide(); encodingSelect->hide();
}
#endif #endif
} }