From 5132a24b3511d2fad35721020da596b47e169e0a Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Tue, 20 Nov 2012 19:51:41 +0530 Subject: [PATCH] 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. --- src/pavucontrol.glade | 243 ++++++++++++++++++++++-------------------- src/sinkwidget.cc | 9 +- 2 files changed, 133 insertions(+), 119 deletions(-) diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade index 616574d..6defb3d 100644 --- a/src/pavucontrol.glade +++ b/src/pavucontrol.glade @@ -394,91 +394,6 @@ 1 - - - False - 2 - 3 - - - - - - PCM - False - True - False - True - False - True - True - - - - - AC3 - False - True - True - False - True - - - 1 - 2 - - - - - DTS - False - True - True - False - True - - - 1 - 2 - - - - - EAC3 - False - True - True - False - True - - - 2 - 3 - - - - - MPEG - False - True - True - False - True - - - 1 - 2 - 1 - 2 - - - - - False - False - 2 - - True @@ -494,7 +409,7 @@ False False - 3 + 2 @@ -503,51 +418,147 @@ False True - + True False - 6 - - True + False - 0 - <b>Latency offset:</b> - True + 2 + 3 + + + + + + PCM + False + True + False + True + False + True + True + + + + + AC3 + False + True + True + False + True + + + 1 + 2 + + + + + DTS + False + True + True + False + True + + + 1 + 2 + + + + + EAC3 + False + True + True + False + True + + + 2 + 3 + + + + + MPEG + False + True + True + False + True + + + 1 + 2 + 1 + 2 + + False - True + False 0 - - True - True - • - False - False - True - True - - - True - True - 1 - - - - + True False - ms - True + 6 + + + True + False + 0 + <b>Latency offset:</b> + True + + + False + True + 0 + + + + + True + True + • + False + False + True + True + + + True + True + 1 + + + + + True + False + ms + True + + + False + True + 2 + + False - True - 2 + False + 1 @@ -563,7 +574,7 @@ False False - 4 + 3 diff --git a/src/sinkwidget.cc b/src/sinkwidget.cc index dc52115..1726550 100644 --- a/src/sinkwidget.cc +++ b/src/sinkwidget.cc @@ -156,10 +156,13 @@ void SinkWidget::onPortChange() { void SinkWidget::setDigital(bool digital) { #if HAVE_EXT_DEVICE_RESTORE_API - if (digital) + if (digital) { encodingSelect->show(); - else + advancedOptions->set_sensitive(true); + } else { + /* advancedOptions has sensitive=false by default */ encodingSelect->hide(); + } #endif } @@ -191,4 +194,4 @@ void SinkWidget::onEncodingsChange() { free(formats); pa_operation_unref(o); #endif -} \ No newline at end of file +}