[vlc-commits] Qt: sout: fix subtitles overlay options

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Jun  1 11:02:41 2018 +0200| [9e9ba745ec52138ad7981509ab4efc0cd1355902] | committer: Francois Cartegnie

Qt: sout: fix subtitles overlay options

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=9e9ba745ec52138ad7981509ab4efc0cd1355902
---

 modules/gui/qt/components/sout/profile_selector.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt/components/sout/profile_selector.cpp b/modules/gui/qt/components/sout/profile_selector.cpp
index 3d10e00763..6fae3a2eee 100644
--- a/modules/gui/qt/components/sout/profile_selector.cpp
+++ b/modules/gui/qt/components/sout/profile_selector.cpp
@@ -343,12 +343,16 @@ void VLCProfileSelector::updateOptions( int i )
     HASHPICK( "subtitles", "enable" );
     if( !value.isEmpty() )
     {
-        HASHPICK( "subtitles", "codec" );
-        smrl.option( "scodec", value );
-
         HASHPICK( "subtitles", "overlay" );
-        if ( !value.isEmpty() )
+        if ( value.isEmpty() )
+        {
+            HASHPICK( "subtitles", "codec" );
+            smrl.option( "scodec", value );
+        }
+        else
+        {
             smrl.option( "soverlay" );
+        }
     } else {
         smrl.option( "scodec", "none" );
     }
@@ -453,6 +457,8 @@ VLCProfileEditor::VLCProfileEditor( const QString& qs_name, const QString& value
              this, activatePanels() );
     CONNECT( ui.valueholder_audio_copy, stateChanged( int ),
              this, activatePanels() );
+    CONNECT( ui.valueholder_subtitles_overlay, stateChanged( int ),
+             this, activatePanels() );
     CONNECT( ui.valueholder_vcodec_bitrate, editingFinished( ),
              this, fixBirateState() );
     CONNECT( ui.valueholder_vcodec_qp, editingFinished( ),
@@ -883,6 +889,7 @@ void VLCProfileEditor::activatePanels()
 {
     ui.transcodevideo->setEnabled( ! ui.valueholder_video_copy->isChecked() );
     ui.transcodeaudio->setEnabled( ! ui.valueholder_audio_copy->isChecked() );
+    ui.valueholder_subtitles_codec->setEnabled( ! ui.valueholder_subtitles_overlay->isChecked() );
 }
 
 void VLCProfileEditor::fixBirateState()