X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs_provider.cpp;h=d3343bdf1557b5d54b6c8ea0ee09249d099f9ce6;hb=9d99a7ab7450ddb180d26f9677d7e95a748a361c;hp=7d425611f6e9c3ff7e4ca3338f532ec1334dd2b2;hpb=48c2ac8c879a83c4f8737b978ca9c3232bb2e70d;p=vlc diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp index 7d425611f6..d3343bdf15 100644 --- a/modules/gui/qt4/dialogs_provider.cpp +++ b/modules/gui/qt4/dialogs_provider.cpp @@ -1,7 +1,7 @@ /***************************************************************************** - * main_inteface.cpp : Main interface + * dialogs_provider.cpp : Dialog Provider ***************************************************************************** - * Copyright (C) 2006-2007 the VideoLAN team + * Copyright (C) 2006-2009 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -22,40 +22,56 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include "qt4.hpp" #include "dialogs_provider.hpp" -#include "main_interface.hpp" +#include "input_manager.hpp" /* Load Subtitles */ #include "menus.hpp" -#include +#include "recents.hpp" +#include "util/qt_dirs.hpp" /* The dialogs */ #include "dialogs/playlist.hpp" +#include "dialogs/bookmarks.hpp" #include "dialogs/preferences.hpp" #include "dialogs/mediainfo.hpp" #include "dialogs/messages.hpp" #include "dialogs/extended.hpp" +#include "dialogs/vlm.hpp" #include "dialogs/sout.hpp" +#include "dialogs/convert.hpp" #include "dialogs/open.hpp" -#include "dialogs/vlm.hpp" +#include "dialogs/openurl.hpp" #include "dialogs/help.hpp" #include "dialogs/gototime.hpp" #include "dialogs/podcast_configuration.hpp" -#include "dialogs/vlm.hpp" +#include "dialogs/toolbar.hpp" +#include "dialogs/plugins.hpp" +#include "dialogs/external.hpp" +#include "dialogs/epg.hpp" +#include "dialogs/errors.hpp" + +#include +#include +#include +#include +#define I_OP_DIR_WINTITLE I_DIR_OR_FOLDER( N_("Open Directory"), \ + N_("Open Folder") ) DialogsProvider* DialogsProvider::instance = NULL; DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) : QObject( NULL ), p_intf( _p_intf ) { - fixed_timer = new QTimer( this ); - fixed_timer->start( 150 /* milliseconds */ ); + b_isDying = false; + /* Various signal mappers for the menus */ menusMapper = new QSignalMapper(); CONNECT( menusMapper, mapped(QObject *), this, menuAction( QObject *) ); @@ -65,25 +81,42 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) : SDMapper = new QSignalMapper(); CONNECT( SDMapper, mapped (QString), this, SDMenuAction( QString ) ); + + new DialogHandler (p_intf, this ); } DialogsProvider::~DialogsProvider() { PlaylistDialog::killInstance(); MediaInfoDialog::killInstance(); - fixed_timer->stop(); + MessagesDialog::killInstance(); + ExtendedDialog::killInstance(); + BookmarksDialog::killInstance(); + HelpDialog::killInstance(); +#ifdef UPDATE_CHECK + UpdateDialog::killInstance(); +#endif + PluginDialog::killInstance(); + + delete menusMapper; + delete menusUpdateMapper; + delete SDMapper; + + QVLCMenu::PopupMenu( p_intf, false ); + QVLCMenu::AudioPopupMenu( p_intf, false ); + QVLCMenu::VideoPopupMenu( p_intf, false ); + QVLCMenu::MiscPopupMenu( p_intf, false ); } void DialogsProvider::quit() { - vlc_object_kill( p_intf ); - QApplication::closeAllWindows(); - QApplication::quit(); + b_isDying = true; + libvlc_Quit( p_intf->p_libvlc ); } void DialogsProvider::customEvent( QEvent *event ) { - if( event->type() == DialogEvent_Type ) + if( event->type() == (int)DialogEvent_Type ) { DialogEvent *de = static_cast(event); switch( de->i_dialog ) @@ -91,6 +124,8 @@ void DialogsProvider::customEvent( QEvent *event ) case INTF_DIALOG_FILE_SIMPLE: case INTF_DIALOG_FILE: openDialog(); break; + case INTF_DIALOG_FILE_GENERIC: + openFileGenericDialog( de->p_arg ); break; case INTF_DIALOG_DISC: openDiscDialog(); break; case INTF_DIALOG_NET: @@ -112,22 +147,27 @@ void DialogsProvider::customEvent( QEvent *event ) bookmarksDialog(); break; case INTF_DIALOG_EXTENDED: extendedDialog(); break; +#ifdef ENABLE_VLM case INTF_DIALOG_VLM: vlmDialog(); break; - case INTF_DIALOG_INTERACTION: - doInteraction( de->p_arg ); break; +#endif case INTF_DIALOG_POPUPMENU: QVLCMenu::PopupMenu( p_intf, (de->i_arg != 0) ); break; case INTF_DIALOG_AUDIOPOPUPMENU: - QVLCMenu::AudioPopupMenu( p_intf ); break; + QVLCMenu::AudioPopupMenu( p_intf, (de->i_arg != 0) ); break; case INTF_DIALOG_VIDEOPOPUPMENU: - QVLCMenu::VideoPopupMenu( p_intf ); break; + QVLCMenu::VideoPopupMenu( p_intf, (de->i_arg != 0) ); break; case INTF_DIALOG_MISCPOPUPMENU: - QVLCMenu::MiscPopupMenu( p_intf ); break; + QVLCMenu::MiscPopupMenu( p_intf, (de->i_arg != 0) ); break; case INTF_DIALOG_WIZARD: case INTF_DIALOG_STREAMWIZARD: + openAndStreamingDialogs(); break; +#ifdef UPDATE_CHECK case INTF_DIALOG_UPDATEVLC: + updateDialog(); break; +#endif case INTF_DIALOG_EXIT: + quit(); break; default: msg_Warn( p_intf, "unimplemented dialog" ); } @@ -144,12 +184,26 @@ void DialogsProvider::playlistDialog() void DialogsProvider::prefsDialog() { - PrefsDialog::getInstance( p_intf )->toggleVisible(); + PrefsDialog *p = new PrefsDialog( (QWidget *)p_intf->p_sys->p_mi, p_intf ); + p->toggleVisible(); } void DialogsProvider::extendedDialog() { - ExtendedDialog::getInstance( p_intf )->toggleVisible(); + if( !ExtendedDialog::getInstance( p_intf )->isVisible() || /* Hidden */ + ExtendedDialog::getInstance( p_intf )->currentTab() != 0 ) /* wrong tab */ + ExtendedDialog::getInstance( p_intf )->showTab( 0 ); + else + ExtendedDialog::getInstance( p_intf )->hide(); +} + +void DialogsProvider::synchroDialog() +{ + if( !ExtendedDialog::getInstance( p_intf )->isVisible() || /* Hidden */ + ExtendedDialog::getInstance( p_intf )->currentTab() != 2 ) /* wrong tab */ + ExtendedDialog::getInstance( p_intf )->showTab( 2 ); + else + ExtendedDialog::getInstance( p_intf )->hide(); } void DialogsProvider::messagesDialog() @@ -162,10 +216,12 @@ void DialogsProvider::gotoTimeDialog() GotoTimeDialog::getInstance( p_intf )->toggleVisible(); } +#ifdef ENABLE_VLM void DialogsProvider::vlmDialog() { VLMDialog::getInstance( p_intf )->toggleVisible(); } +#endif void DialogsProvider::helpDialog() { @@ -186,7 +242,7 @@ void DialogsProvider::aboutDialog() void DialogsProvider::mediaInfoDialog() { - MediaInfoDialog::getInstance( p_intf )->toggleVisible(); + MediaInfoDialog::getInstance( p_intf )->showTab( 0 ); } void DialogsProvider::mediaCodecDialog() @@ -196,8 +252,7 @@ void DialogsProvider::mediaCodecDialog() void DialogsProvider::bookmarksDialog() { - /* TODO - Implement me */ - /* BookmarkDialog::getInstance( p_intf )->toggleVisible(); */ + BookmarksDialog::getInstance( p_intf )->toggleVisible(); } void DialogsProvider::podcastConfigureDialog() @@ -205,7 +260,90 @@ void DialogsProvider::podcastConfigureDialog() PodcastConfigDialog::getInstance( p_intf )->toggleVisible(); } +void DialogsProvider::toolbarDialog() +{ + ToolbarEditDialog *toolbarEditor = new ToolbarEditDialog( (QWidget *)p_intf->p_sys->p_mi, p_intf ); + if( toolbarEditor->exec() == QDialog::Accepted ) + emit toolBarConfUpdated(); +} +void DialogsProvider::pluginDialog() +{ + PluginDialog::getInstance( p_intf )->toggleVisible(); +} + +void DialogsProvider::epgDialog() +{ + EpgDialog::getInstance( p_intf )->toggleVisible(); +} + +/* Generic open file */ +void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg ) +{ + if( p_arg == NULL ) + { + msg_Warn( p_intf, "openFileGenericDialog() called with NULL arg" ); + return; + } + + /* Replace the extensions to a Qt format */ + int i = 0; + QString extensions = qfu( p_arg->psz_extensions ); + while ( ( i = extensions.indexOf( "|", i ) ) != -1 ) + { + if( ( extensions.count( "|" ) % 2 ) == 0 ) + extensions.replace( i, 1, ");;" ); + else + extensions.replace( i, 1, "(" ); + } + extensions.replace( ";*", " *" ); + extensions.append( ")" ); + + /* Save */ + if( p_arg->b_save ) + { + QString file = QFileDialog::getSaveFileName( NULL, p_arg->psz_title, + p_intf->p_sys->filepath, extensions ); + if( !file.isEmpty() ) + { + p_arg->i_results = 1; + p_arg->psz_results = (char **)malloc( p_arg->i_results * sizeof( char * ) ); + p_arg->psz_results[0] = strdup( qtu( toNativeSepNoSlash( file ) ) ); + } + else + p_arg->i_results = 0; + } + else /* non-save mode */ + { + QStringList files = QFileDialog::getOpenFileNames( NULL, + p_arg->psz_title, p_intf->p_sys->filepath, + extensions ); + p_arg->i_results = files.count(); + p_arg->psz_results = (char **)malloc( p_arg->i_results * sizeof( char * ) ); + i = 0; + foreach( const QString &file, files ) + p_arg->psz_results[i++] = strdup( qtu( toNativeSepNoSlash( file ) ) ); + if(i == 0) + p_intf->p_sys->filepath = QString::fromAscii(""); + else + p_intf->p_sys->filepath = qfu( p_arg->psz_results[i-1] ); + } + + /* Callback */ + if( p_arg->pf_callback ) + p_arg->pf_callback( p_arg ); + + /* Clean afterwards */ + if( p_arg->psz_results ) + { + for( i = 0; i < p_arg->i_results; i++ ) + free( p_arg->psz_results[i] ); + free( p_arg->psz_results ); + } + free( p_arg->psz_title ); + free( p_arg->psz_extensions ); + free( p_arg ); +} /**************************************************************************** * All the open/add stuff * Open Dialog first - Simple Open then @@ -237,25 +375,25 @@ void DialogsProvider::openCaptureDialog() } /* Same as the open one, but force the enqueue */ -void DialogsProvider::PLAppendDialog() +void DialogsProvider::PLAppendDialog( int tab ) { - OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, OPEN_AND_ENQUEUE) - ->showTab( OPEN_FILE_TAB ); + OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, + OPEN_AND_ENQUEUE )->showTab( tab ); } -/* Unimplemmented yet - Usefull ? */ -void DialogsProvider::MLAppendDialog() +void DialogsProvider::MLAppendDialog( int tab ) { + OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, + OPEN_AND_ENQUEUE, false, false ) + ->showTab( tab ); } /** * Simple open - * Not used anymore. Let the code until we are sure we don't want it - * Two opens make it confusing for the user. ***/ -QStringList DialogsProvider::showSimpleOpen( QString help, +QStringList DialogsProvider::showSimpleOpen( const QString& help, int filters, - QString path ) + const QString& path ) { QString fileTypes = ""; if( filters & EXT_FILTER_MEDIA ) { @@ -274,11 +412,16 @@ QStringList DialogsProvider::showSimpleOpen( QString help, ADD_FILTER_SUBTITLE( fileTypes ); } ADD_FILTER_ALL( fileTypes ); - fileTypes.replace(QString(";*"), QString(" *")); - return QFileDialog::getOpenFileNames( NULL, - help.isNull() ? qfu(I_OP_SEL_FILES ) : help, - path.isNull() ? qfu( p_intf->p_libvlc->psz_homedir ) : path, + fileTypes.replace( ";*", " *"); + + QStringList files = QFileDialog::getOpenFileNames( NULL, + help.isEmpty() ? qtr(I_OP_SEL_FILES ) : help, + path.isEmpty() ? p_intf->p_sys->filepath : path, fileTypes ); + + if( !files.isEmpty() ) savedirpathFromFile( files.last() ); + + return files; } /** @@ -290,15 +433,17 @@ void DialogsProvider::addFromSimple( bool pl, bool go) { QStringList files = DialogsProvider::showSimpleOpen(); int i = 0; - foreach( QString file, files ) + files.sort(); + foreach( const QString &file, files ) { - const char * psz_utf8 = qtu( file ); - playlist_Add( THEPL, psz_utf8, NULL, - go ? ( PLAYLIST_APPEND | ( i ? 0 : PLAYLIST_GO ) | - ( i ? PLAYLIST_PREPARSE : 0 ) ) + char* psz_uri = make_URI( qtu( toNativeSeparators(file) ), NULL ); + playlist_Add( THEPL, psz_uri, NULL, + go ? ( PLAYLIST_APPEND | ( i ? PLAYLIST_PREPARSE : PLAYLIST_GO ) ) : ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ), - PLAYLIST_END, - pl ? VLC_TRUE : VLC_FALSE, VLC_FALSE ); + PLAYLIST_END, pl, pl_Unlocked ); + free( psz_uri ); + RecentsMRL::getInstance( p_intf )->addRecent( + toNativeSeparators( file ) ); i++; } } @@ -318,6 +463,30 @@ void DialogsProvider::simpleMLAppendDialog() addFromSimple( false, false ); } +/* Url & Clipboard */ +/** + * Open a MRL. + * If the clipboard contains URLs, the first is automatically 'preselected'. + **/ +void DialogsProvider::openUrlDialog() +{ + OpenUrlDialog *oud = new OpenUrlDialog( p_intf ); + if( oud->exec() == QDialog::Accepted ) + { + QString url = oud->url(); + if( !url.isEmpty() ) + { + playlist_Add( THEPL, qtu( url ), + NULL, !oud->shouldEnqueue() ? + ( PLAYLIST_APPEND | PLAYLIST_GO ) + : ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ), + PLAYLIST_END, true, false ); + RecentsMRL::getInstance( p_intf )->addRecent( url ); + } + } + delete oud; +} + /* Directory */ /** * Open a directory, @@ -326,16 +495,38 @@ void DialogsProvider::simpleMLAppendDialog() **/ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go ) { - QString dir = QFileDialog::getExistingDirectory( 0, qtr("Open directory") ); - if (!dir.isEmpty()) { - input_item_t *p_input = input_ItemNewExt( THEPL, qtu(dir), NULL, - 0, NULL, -1 ); + QString dir = QFileDialog::getExistingDirectory( NULL, qtr( I_OP_DIR_WINTITLE ), p_intf->p_sys->filepath ); - playlist_AddInput( THEPL, p_input, - go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND, - PLAYLIST_END, pl, VLC_FALSE ); - input_Read( THEPL, p_input, VLC_FALSE ); - } + if( dir.isEmpty() ) + return; + + const char *scheme = "directory"; + if( dir.endsWith( "/VIDEO_TS", Qt::CaseInsensitive ) ) + scheme = "dvd"; + + char *uri = make_URI( qtu( dir ), scheme ); + if( unlikely(uri == NULL) ) + return; + + RecentsMRL::getInstance( p_intf )->addRecent( qfu(uri) ); + + input_item_t *p_input = input_item_New( THEPL, uri, NULL ); + free( uri ); + if( unlikely( p_input == NULL ) ) + return; + + /* FIXME: playlist_AddInput() can fail */ + playlist_AddInput( THEPL, p_input, + go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND, + PLAYLIST_END, pl, pl_Unlocked ); + if( !go ) + input_Read( THEPL, p_input ); + vlc_gc_decref( p_input ); +} + +void DialogsProvider::PLOpenDir() +{ + openDirectory( p_intf, true, true ); } void DialogsProvider::PLAppendDir() @@ -353,134 +544,176 @@ void DialogsProvider::MLAppendDir() ****************/ void DialogsProvider::openAPlaylist() { - QStringList files = showSimpleOpen( qtr( "Open playlist file" ), + QStringList files = showSimpleOpen( qtr( "Open playlist..." ), EXT_FILTER_PLAYLIST ); - foreach( QString file, files ) + foreach( const QString &file, files ) { - playlist_Import( THEPL, qtu(file) ); + playlist_Import( THEPL, qtu( toNativeSeparators( file ) ) ); } } void DialogsProvider::saveAPlaylist() { - QFileDialog *qfd = new QFileDialog( NULL, - qtr( "Choose a filename to save playlist" ), - qfu( p_intf->p_libvlc->psz_homedir ), - qtr( "XSPF playlist (*.xspf);; " ) + - qtr( "M3U playlist (*.m3u);; Any (*.*) " ) ); - qfd->setFileMode( QFileDialog::AnyFile ); - qfd->setAcceptMode( QFileDialog::AcceptSave ); - qfd->setConfirmOverwrite( true ); - - if( qfd->exec() == QDialog::Accepted ) + static const struct { - if( qfd->selectedFiles().count() > 0 ) - { - static const char psz_xspf[] = "export-xspf", - psz_m3u[] = "export-m3u"; - const char *psz_module; - - QString file = qfd->selectedFiles().first(); - QString filter = qfd->selectedFilter(); + char filter[24]; + char module[12]; + } types[] = { + { N_("XSPF playlist (*.xspf)"), "export-xspf", }, + { N_("M3U8 playlist (*.m3u)"), "export-m3u8", }, + { N_("M3U playlist (*.m3u)"), "export-m3u", }, + { N_("HTML playlist (*.html)"), "export-html", }, + }; + QString filters, selected; + + for( size_t i = 0; i < sizeof (types) / sizeof (types[0]); i++ ) + { + if( !filters.isEmpty() ) + filters += ";;"; + filters += qfu( vlc_gettext( types[i].filter ) ); + } - if( file.contains( ".xsp" ) || - ( filter.contains( ".xspf" ) && !file.contains( ".m3u" ) ) ) - { - psz_module = psz_xspf; - if( !file.contains( ".xsp" ) ) - file.append( ".xspf" ); - } - else - { - psz_module = psz_m3u; - if( !file.contains( ".m3u" ) ) - file.append( ".m3u" ); - } + QString file = QFileDialog::getSaveFileName( NULL, + qtr( "Save playlist as..." ), + p_intf->p_sys->filepath, filters, &selected ); + if( file.isEmpty() ) + return; - playlist_Export( THEPL, qtu( file ), THEPL->p_local_category, - psz_module); + for( size_t i = 0; i < sizeof (types) / sizeof (types[0]); i++) + if( selected == qfu( vlc_gettext( types[i].filter ) ) ) + { + playlist_Export( THEPL, qtu( toNativeSeparators( file ) ), + THEPL->p_playing, types[i].module ); + break; } - } - delete qfd; } - /**************************************************************************** * Sout emulation ****************************************************************************/ -//FIXME !! -void DialogsProvider::streamingDialog( QString mrl, bool b_transcode_only ) +void DialogsProvider::streamingDialog( QWidget *parent, + const QString& mrl, + bool b_transcode_only, + QStringList options ) { - SoutDialog *s = new SoutDialog( p_intf->p_sys->p_mi, p_intf, - b_transcode_only ); - if( s->exec() == QDialog::Accepted ) + QString soutoption; + + /* Stream */ + if( !b_transcode_only ) + { + SoutDialog *s = new SoutDialog( parent, p_intf, mrl ); + if( s->exec() == QDialog::Accepted ) + { + soutoption = s->getMrl(); + delete s; + } + else + { + delete s; return; + } + } else { + /* Convert */ + ConvertDialog *s = new ConvertDialog( parent, p_intf, mrl ); + if( s->exec() == QDialog::Accepted ) + { + soutoption = s->getMrl(); + delete s; + } + else + { + delete s; return; + } + } + + /* Get SoutMRL */ + if( !soutoption.isEmpty() ) { - msg_Err( p_intf, "mrl %s", qta( s->getMrl() ) ); - /* Just do it */ - int i_len = strlen( qtu( s->getMrl() ) ) + 10; - char *psz_option = (char*)malloc( i_len ); - snprintf( psz_option, i_len - 1, "%s", qtu( s->getMrl() ) ); - - playlist_AddExt( THEPL, qtu( mrl ), "Streaming", - PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END, - -1, &psz_option, 1, VLC_TRUE, VLC_FALSE ); + options += soutoption.split( " :"); + + /* Create Input */ + input_item_t *p_input; + p_input = input_item_New( p_intf, qtu( mrl ), _("Streaming") ); + + /* Add normal Options */ + for( int j = 0; j < options.size(); j++ ) + { + QString qs = colon_unescape( options[j] ); + if( !qs.isEmpty() ) + { + input_item_AddOption( p_input, qtu( qs ), + VLC_INPUT_OPTION_TRUSTED ); + msg_Dbg( p_intf, "Adding option: %s", qtu( qs ) ); + } + } + + /* Switch between enqueuing and starting the item */ + /* FIXME: playlist_AddInput() can fail */ + playlist_AddInput( THEPL, p_input, + PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END, true, pl_Unlocked ); + vlc_gc_decref( p_input ); + + RecentsMRL::getInstance( p_intf )->addRecent( mrl ); } - delete s; } -void DialogsProvider::openThenStreamingDialogs() +void DialogsProvider::openAndStreamingDialogs() { - OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, OPEN_AND_STREAM ) - ->showTab( 0 ); + OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, OPEN_AND_STREAM ) + ->showTab( OPEN_FILE_TAB ); } -void DialogsProvider::openThenTranscodingDialogs() +void DialogsProvider::openAndTranscodingDialogs() { - OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, OPEN_AND_SAVE ) - ->showTab( 0 ); + OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, false, OPEN_AND_SAVE ) + ->showTab( OPEN_FILE_TAB ); } -/* -void DialogsProvider::streamingDialog() + +void DialogsProvider::loadSubtitlesFile() { - OpenDialog *o = new OpenDialog( p_intf->p_sys->p_mi, p_intf, true ); - if ( o->exec() == QDialog::Accepted ) + input_thread_t *p_input = THEMIM->getInput(); + if( !p_input ) return; + + input_item_t *p_item = input_GetItem( p_input ); + if( !p_item ) return; + + char *path = input_item_GetURI( p_item ); + if( !path ) path = strdup( "" ); + + char *sep = strrchr( path, DIR_SEP_CHAR ); + if( sep ) *sep = '\0'; + + QStringList qsl = showSimpleOpen( qtr( "Open subtitles..." ), + EXT_FILTER_SUBTITLE, + qfu( path ) ); + free( path ); + foreach( const QString &qsFile, qsl ) { - SoutDialog *s = new SoutDialog( p_intf->p_sys->p_mi, p_intf ); - if( s->exec() == QDialog::Accepted ) - { - msg_Err(p_intf, "mrl %s\n", qta(s->mrl)); - /* Just do it - int i_len = strlen( qtu(s->mrl) ) + 10; - char *psz_option = (char*)malloc(i_len); - snprintf( psz_option, i_len - 1, ":sout=%s", qtu(s->mrl)); - - playlist_AddExt( THEPL, qtu( o->mrl ), "Streaming", - PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END, - -1, &psz_option, 1, VLC_TRUE, VLC_FALSE ); - } - delete s; + if( input_AddSubtitle( p_input, qtu( toNativeSeparators( qsFile ) ), + true ) ) + msg_Warn( p_intf, "unable to load subtitles from '%s'", + qtu( qsFile ) ); } - delete o; -}*/ +} /**************************************************************************** - * Menus / Interaction + * Menus ****************************************************************************/ void DialogsProvider::menuAction( QObject *data ) { - QVLCMenu::DoAction( p_intf, data ); + QVLCMenu::DoAction( data ); } void DialogsProvider::menuUpdateAction( QObject *data ) { - MenuFunc * f = qobject_cast(data); - f->doFunc( p_intf ); + MenuFunc *func = qobject_cast(data); + assert( func ); + func->doFunc( p_intf ); } -void DialogsProvider::SDMenuAction( QString data ) +void DialogsProvider::SDMenuAction( const QString& data ) { char *psz_sd = strdup( qtu( data ) ); if( !playlist_IsServicesDiscoveryLoaded( THEPL, psz_sd ) ) @@ -490,39 +723,15 @@ void DialogsProvider::SDMenuAction( QString data ) free( psz_sd ); } -void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg ) +/** + * Play the MRL contained in the Recently played menu. + **/ +void DialogsProvider::playMRL( const QString &mrl ) { - InteractionDialog *qdialog; - interaction_dialog_t *p_dialog = p_arg->p_dialog; - switch( p_dialog->i_action ) - { - case INTERACT_NEW: - qdialog = new InteractionDialog( p_intf, p_dialog ); - p_dialog->p_private = (void*)qdialog; - if( !(p_dialog->i_status == ANSWERED_DIALOG) ) - qdialog->show(); - break; - case INTERACT_UPDATE: - qdialog = (InteractionDialog*)(p_dialog->p_private); - if( qdialog) - qdialog->update(); - break; - case INTERACT_HIDE: - qdialog = (InteractionDialog*)(p_dialog->p_private); - if( qdialog ) - qdialog->hide(); - p_dialog->i_status = HIDDEN_DIALOG; - break; - case INTERACT_DESTROY: - qdialog = (InteractionDialog*)(p_dialog->p_private); - if( !p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR ) - delete qdialog; - p_dialog->i_status = DESTROYED_DIALOG; - break; - } -} + char* psz_uri = make_URI( qtu(mrl), NULL ); + playlist_Add( THEPL, psz_uri, NULL, + PLAYLIST_APPEND | PLAYLIST_GO , PLAYLIST_END, true, false ); + free( psz_uri ); -void DialogsProvider::switchToSkins() -{ - var_SetString( p_intf, "intf-switch", "skins2" ); + RecentsMRL::getInstance( p_intf )->addRecent( mrl ); }