vlc | branch: master | Francois Cartegnie <[email protected]> | Fri Jun 1 11:02:41 2018 +0200| [33ad1b242af8f1e4ed6140b9764a9d9c08a8fbed] | committer: Francois Cartegnie
Qt: sout: fix subtitles overlay options > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=33ad1b242af8f1e4ed6140b9764a9d9c08a8fbed --- 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 a6a36aaebc..864c1a1f2a 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() _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
