]> git.sesse.net Git - vlc/commitdiff
Qt menus: prefer THEMIM->getInput()
authorJean-Philippe Andre <jpeg@via.ecp.fr>
Mon, 16 Jun 2008 21:01:02 +0000 (23:01 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 17 Jun 2008 02:58:33 +0000 (19:58 -0700)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
modules/gui/qt4/dialogs_provider.cpp

index 87a26b9723c28cdccb1dd2e3f2ea57d0c4bc991d..67002ded710c7ee1bbdb586c06113c1aaa93f160 100644 (file)
@@ -36,6 +36,7 @@
 #include "main_interface.hpp"
 #include "menus.hpp"
 #include <vlc_intf_strings.h>
+#include "input_manager.hpp"
 
 /* The dialogs */
 #include "dialogs/playlist.hpp"
@@ -532,19 +533,15 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
 
 void DialogsProvider::loadSubtitlesFile()
 {
-    playlist_t *p_playlist = pl_Yield( p_intf );
-    if( !p_playlist || !p_playlist->p_input )
-    {
-        msg_Err( p_intf, "cannot get input" );
+    input_thread_t *p_input = THEMIM->getInput();
+    if( !p_input )
         return;
-    }
     QString qsFile = QFileDialog::getOpenFileName(
              NULL,
              qtr( "Choose subtitles file" ),
              "",
              qtr( "Subtitles files (*.cdg *.idx *.srt *.sub *.utf);;"
                   "All files (*)" ) );
-    if( !input_AddSubtitles( p_playlist->p_input, qtu( qsFile ), true ) )
+    if( !input_AddSubtitles( p_input, qtu( qsFile ), true ) )
         msg_Warn( p_intf, "unable to load subtitles file..." );
-    pl_Release( p_playlist );
 }