[vlc-commits] Qt4: use OpenDialog::getOptions() where appropriate

Rémi Denis-Courmont git at videolan.org
Fri Feb 10 17:51:00 CET 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Feb  9 23:24:21 2012 +0200| [fb182fe6340540719906d5699b3cdbd49a91357e] | committer: Rémi Denis-Courmont

Qt4: use OpenDialog::getOptions() where appropriate

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

 modules/gui/qt4/dialogs/open.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index 610c19b..f3257a7 100644
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -229,7 +229,7 @@ OpenDialog::~OpenDialog()
 QString OpenDialog::getMRL( bool b_all )
 {
     if( itemsMRL.count() == 0 ) return "";
-    return b_all ? itemsMRL[0] + ui.advancedLineInput->text()
+    return b_all ? itemsMRL[0] + getOptions()
                  : itemsMRL[0];
 }
 
@@ -373,7 +373,7 @@ void OpenDialog::enqueue( bool b_enqueue )
         p_input = input_item_New( qtu( itemsMRL[i] ), NULL );
 
         /* Take options from the UI, not from what we stored */
-        QStringList optionsList = ui.advancedLineInput->text().split( " :" );
+        QStringList optionsList = getOptions().split( " :" );
 
         /* Insert options */
         for( int j = 0; j < optionsList.count(); j++ )
@@ -415,7 +415,7 @@ void OpenDialog::stream( bool b_transcode_only )
     /* Dbg and send :D */
     msg_Dbg( p_intf, "MRL passed to the Sout: %s", qtu( soutMRL ) );
     THEDP->streamingDialog( this, soutMRL, b_transcode_only,
-                            ui.advancedLineInput->text().split( " :" ) );
+                            getOptions().split( " :" ) );
 }
 
 /* Update the MRL items from the panels */



More information about the vlc-commits mailing list