MediaInfoDialog::killInstance();
}
+void DialogsProvider::quit()
+{
+ p_intf->b_die = VLC_TRUE;
+ QApplication::quit();
+}
+
void DialogsProvider::customEvent( QEvent *event )
{
if( event->type() == DialogEvent_Type )
switch( de->i_dialog )
{
case INTF_DIALOG_FILE:
+ openDialog(); break;
case INTF_DIALOG_DISC:
+ openDiscDialog(); break;
case INTF_DIALOG_NET:
+ openNetDialog(); break;
case INTF_DIALOG_CAPTURE:
- openDialog( de->i_dialog ); break;
+ openDialog(); break;
case INTF_DIALOG_PLAYLIST:
playlistDialog(); break;
case INTF_DIALOG_MESSAGES:
case INTF_DIALOG_MISCPOPUPMENU:
popupMenu( de->i_dialog ); break;
case INTF_DIALOG_FILEINFO:
- MediaInfoDialog(); break;
+ mediaInfoDialog(); break;
case INTF_DIALOG_INTERACTION:
doInteraction( de->p_arg ); break;
case INTF_DIALOG_VLM:
}
}
+/****************************************************************************
+ * Individual simple dialogs
+ ****************************************************************************/
void DialogsProvider::playlistDialog()
{
PlaylistDialog::getInstance( p_intf )->toggleVisible();
}
-void DialogsProvider::openDialog()
-{
- openDialog( 0 );
-}
-void DialogsProvider::PLAppendDialog()
+void DialogsProvider::prefsDialog()
{
+ PrefsDialog::getInstance( p_intf )->toggleVisible();
}
-void DialogsProvider::MLAppendDialog()
+void DialogsProvider::extendedDialog()
{
+ ExtendedDialog::getInstance( p_intf )->toggleVisible();
}
-void DialogsProvider::openDialog( int i_tab )
+
+void DialogsProvider::messagesDialog()
{
- OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf )->showTab( i_tab );
+ MessagesDialog::getInstance( p_intf )->toggleVisible();
}
-void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
+void DialogsProvider::helpDialog()
{
- 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;
- }
+ HelpDialog::getInstance( p_intf )->toggleVisible();
}
-void DialogsProvider::quit()
+void DialogsProvider::aboutDialog()
{
- p_intf->b_die = VLC_TRUE;
- QApplication::quit();
+ AboutDialog::getInstance( p_intf )->toggleVisible();
}
-void DialogsProvider::MediaInfoDialog()
+void DialogsProvider::mediaInfoDialog()
{
MediaInfoDialog::getInstance( p_intf )->toggleVisible();
}
-void DialogsProvider::streamingDialog()
+void DialogsProvider::bookmarksDialog()
{
- OpenDialog *o = new OpenDialog( p_intf->p_sys->p_mi, p_intf, true );
- if ( o->exec() == QDialog::Accepted )
- {
- 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 );
- }
- delete s;
- }
- delete o;
}
-void DialogsProvider::prefsDialog()
+/****************************************************************************
+ * All the open/add stuff
+ ****************************************************************************/
+
+void DialogsProvider::openDialog()
{
- PrefsDialog::getInstance( p_intf )->toggleVisible();
+ openDialog( 0 );
}
-void DialogsProvider::extendedDialog()
+void DialogsProvider::openDiscDialog()
{
- ExtendedDialog::getInstance( p_intf )->toggleVisible();
+ openDialog( 1 );
}
-
-void DialogsProvider::messagesDialog()
+void DialogsProvider::openNetDialog()
{
- MessagesDialog::getInstance( p_intf )->toggleVisible();
+ openDialog( 2 );
}
-
-void DialogsProvider::helpDialog()
+void DialogsProvider::openDialog( int i_tab )
{
- HelpDialog::getInstance( p_intf )->toggleVisible();
+ OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf )->showTab( i_tab );
}
-void DialogsProvider::aboutDialog()
+void DialogsProvider::PLAppendDialog()
{
- AboutDialog::getInstance( p_intf )->toggleVisible();
}
-
-void DialogsProvider::menuAction( QObject *data )
+void DialogsProvider::MLAppendDialog()
{
- QVLCMenu::DoAction( p_intf, data );
}
-void DialogsProvider::menuUpdateAction( QObject *data )
-{
- MenuFunc * f = qobject_cast<MenuFunc *>(data);
- f->doFunc( p_intf );
-}
-void DialogsProvider::SDMenuAction( QString data )
+/**** Simple open ****/
+
+QStringList DialogsProvider::showSimpleOpen()
{
- char *psz_sd = data.toUtf8().data();
- if( !playlist_IsServicesDiscoveryLoaded( THEPL, psz_sd ) )
- playlist_ServicesDiscoveryAdd( THEPL, psz_sd );
- else
- playlist_ServicesDiscoveryRemove( THEPL, psz_sd );
+ QString FileTypes;
+ FileTypes = _("Media Files");
+ FileTypes += " ( ";
+ FileTypes += EXTENSIONS_MEDIA;
+ FileTypes += ");;";
+ FileTypes += _("Video Files");
+ FileTypes += " ( ";
+ FileTypes += EXTENSIONS_VIDEO;
+ FileTypes += ");;";
+ FileTypes += _("Sound Files");
+ FileTypes += " ( ";
+ FileTypes += EXTENSIONS_AUDIO;
+ FileTypes += ");;";
+ FileTypes += _("PlayList Files");
+ FileTypes += " ( ";
+ FileTypes += EXTENSIONS_PLAYLIST;
+ FileTypes += ");;";
+ FileTypes += _("All Files");
+ FileTypes += " (*.*)";
+ FileTypes.replace(QString(";*"), QString(" *"));
+ return QFileDialog::getOpenFileNames( NULL, qfu(I_OP_SEL_FILES ),
+ p_intf->p_libvlc->psz_homedir, FileTypes );
}
-
-void DialogsProvider::simplePLAppendDialog()
+void DialogsProvider::addFromSimple( bool pl, bool go)
{
- QStringList files = showSimpleOpen();
- QString file;
- foreach( file, files )
+ QStringList files = DialogsProvider::showSimpleOpen();
+ int i = 0;
+ foreach( QString file, files )
{
const char * psz_utf8 = qtu( file );
playlist_Add( THEPL, psz_utf8, NULL,
- PLAYLIST_APPEND | PLAYLIST_PREPARSE, PLAYLIST_END, VLC_TRUE );
+ go ? ( PLAYLIST_APPEND | ( i ? 0 : PLAYLIST_GO ) |
+ ( i ? PLAYLIST_PREPARSE : 0 ) )
+ : ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ),
+ PLAYLIST_END,
+ pl ? VLC_TRUE : VLC_FALSE );
+ i++;
}
}
+void DialogsProvider::simplePLAppendDialog()
+{
+ addFromSimple( true, false );
+}
+
void DialogsProvider::simpleMLAppendDialog()
{
- QStringList files = showSimpleOpen();
- QString file;
- foreach( file, files )
- {
- const char * psz_utf8 = qtu( file );
- playlist_Add( THEPL, psz_utf8, psz_utf8,
- PLAYLIST_APPEND | PLAYLIST_PREPARSE, PLAYLIST_END,
- VLC_TRUE);
- }
+ addFromSimple( false, false );
}
void DialogsProvider::simpleOpenDialog()
+{
+ addFromSimple( true, true );
+}
+
+void DialogsProvider::openPlaylist()
{
QStringList files = showSimpleOpen();
- QString file;
- for( size_t i = 0 ; i< files.size(); i++ )
+ foreach( QString file, files )
{
- const char * psz_utf8 = qtu( files[i] );
- /* Play the first one, parse and enqueue the other ones */
- playlist_Add( THEPL, psz_utf8, NULL,
- PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO) |
- ( i ? PLAYLIST_PREPARSE : 0 ),
- PLAYLIST_END, VLC_TRUE );
+ playlist_Import( THEPL, qtu(file) );
}
}
-void DialogsProvider::openPlaylist()
+void DialogsProvider::savePlaylist()
{
- QStringList files = showSimpleOpen();
- QString file;
- for( size_t i = 0 ; i< files.size(); i++ )
+ QFileDialog *qfd = new QFileDialog( NULL,
+ qtr("Choose a filename to save playlist"),
+ p_intf->p_libvlc->psz_homedir,
+ qfu("XSPF playlist (*.xspf);; ") +
+ qfu("M3U playlist (*.m3u);; Any (*.*) ") );
+ qfd->setFileMode( QFileDialog::AnyFile );
+ qfd->setAcceptMode( QFileDialog::AcceptSave );
+ qfd->setConfirmOverwrite( true );
+
+ if( qfd->exec() == QDialog::Accepted )
{
- const char * psz_utf8 = qtu( files[i] );
- playlist_Import( THEPL, psz_utf8 );
+ if( qfd->selectedFiles().count() > 0 )
+ {
+ char *psz_module, *psz_m3u = "export-m3u",
+ *psz_xspf = "export-xspf";
+
+ QString file = qfd->selectedFiles().first();
+ QString filter = qfd->selectedFilter();
+
+ 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" );
+ }
+
+ playlist_Export( THEPL, qtu(file), THEPL->p_local_category,
+ psz_module);
+ }
}
+ delete qfd;
}
-void DialogsProvider::openDirectory()
+static void openDirectory( intf_thread_t* p_intf, bool pl, bool go )
{
QString dir = QFileDialog::getExistingDirectory ( 0,
_("Open directory") );
- const char *psz_utf8 = qtu( dir );
- input_item_t *p_input = input_ItemNewExt( THEPL, psz_utf8, NULL,
+ input_item_t *p_input = input_ItemNewExt( THEPL, qtu(dir), NULL,
0, NULL, -1 );
- playlist_AddInput( THEPL, p_input, PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE);
+ playlist_AddInput( THEPL, p_input,
+ go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND,
+ PLAYLIST_END, pl);
input_Read( THEPL, p_input, VLC_FALSE );
}
-void DialogsProvider::openMLDirectory()
+
+void DialogsProvider::PLAppendDir()
{
- QString dir = QFileDialog::getExistingDirectory ( 0,
- _("Open directory") );
- const char *psz_utf8 = qtu( dir );
- input_item_t *p_input = input_ItemNewExt( THEPL, psz_utf8, NULL,
- 0, NULL, -1 );
- playlist_AddInput( THEPL, p_input, PLAYLIST_APPEND, PLAYLIST_END,
- VLC_FALSE );
- input_Read( THEPL, p_input, VLC_FALSE );
+ openDirectory( p_intf, true, false );
}
-QStringList DialogsProvider::showSimpleOpen()
+void DialogsProvider::MLAppendDir()
{
- QString FileTypes;
- FileTypes = _("Media Files");
- FileTypes += " ( ";
- FileTypes += EXTENSIONS_MEDIA;
- FileTypes += ");;";
- FileTypes += _("Video Files");
- FileTypes += " ( ";
- FileTypes += EXTENSIONS_VIDEO;
- FileTypes += ");;";
- FileTypes += _("Sound Files");
- FileTypes += " ( ";
- FileTypes += EXTENSIONS_AUDIO;
- FileTypes += ");;";
- FileTypes += _("PlayList Files");
- FileTypes += " ( ";
- FileTypes += EXTENSIONS_PLAYLIST;
- FileTypes += ");;";
- FileTypes += _("All Files");
- FileTypes += " (*.*)";
- FileTypes.replace(QString(";*"), QString(" *"));
- return QFileDialog::getOpenFileNames( NULL, qfu(I_POP_SEL_FILES ),
- p_intf->p_libvlc->psz_homedir, FileTypes );
+ openDirectory( p_intf, false , false );
}
-void DialogsProvider::switchToSkins()
+
+/****************************************************************************
+ * Sout emulation
+ ****************************************************************************/
+
+void DialogsProvider::streamingDialog()
{
- var_SetString( p_intf, "intf-switch", "skins2" );
+ OpenDialog *o = new OpenDialog( p_intf->p_sys->p_mi, p_intf, true );
+ if ( o->exec() == QDialog::Accepted )
+ {
+ 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 );
+ }
+ delete s;
+ }
+ delete o;
}
-void DialogsProvider::bookmarksDialog()
+/****************************************************************************
+ * Menus / Interaction
+ ****************************************************************************/
+
+void DialogsProvider::menuAction( QObject *data )
{
+ QVLCMenu::DoAction( p_intf, data );
}
-void DialogsProvider::popupMenu( int i_dialog )
+void DialogsProvider::menuUpdateAction( QObject *data )
{
+ MenuFunc * f = qobject_cast<MenuFunc *>(data);
+ f->doFunc( p_intf );
+}
+void DialogsProvider::SDMenuAction( QString data )
+{
+ char *psz_sd = strdup( qtu( data ) );
+ if( !playlist_IsServicesDiscoveryLoaded( THEPL, psz_sd ) )
+ playlist_ServicesDiscoveryAdd( THEPL, psz_sd );
+ else
+ playlist_ServicesDiscoveryRemove( THEPL, psz_sd );
+
+ free( psz_sd );
+}
+
+
+void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
+{
+ 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;
+ }
+}
+
+void DialogsProvider::switchToSkins()
+{
+ var_SetString( p_intf, "intf-switch", "skins2" );
+}
+
+void DialogsProvider::popupMenu( int i_dialog )
+{
}
projects / vlc / blobdiff