MessagesDialog::killInstance();
ExtendedDialog::killInstance();
BookmarksDialog::killInstance();
+ HelpDialog::killInstance();
+#ifdef UPDATE_CHECK
+ UpdateDialog::killInstance();
+#endif
+
fixed_timer->stop();
}
void DialogsProvider::quit()
{
- vlc_object_kill( p_intf );
+ vlc_object_kill( p_intf->p_libvlc );
QApplication::closeAllWindows();
QApplication::quit();
}
( i ? PLAYLIST_PREPARSE : 0 ) )
: ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ),
PLAYLIST_END,
- pl ? VLC_TRUE : VLC_FALSE, VLC_FALSE );
+ pl ? true : false, false );
i++;
}
}
qtu( "directory://" + dir ), NULL,
0, NULL, -1 );
+ /* FIXME: playlist_AddInput() can fail */
playlist_AddInput( THEPL, p_input,
go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND,
- PLAYLIST_END, pl, VLC_FALSE );
- input_Read( THEPL, p_input, VLC_FALSE );
+ PLAYLIST_END, pl, false );
+ input_Read( THEPL, p_input, false );
+ vlc_gc_decref( p_input );
}
}
if( s->exec() == QDialog::Accepted )
{
- msg_Err( p_intf, "Sout mrl %s", qta( s->getMrl() ) );
+ msg_Dbg( p_intf, "Sout mrl %s", qta( s->getMrl() ) );
/* Just do it */
int i_len = strlen( qtu( s->getMrl() ) ) + 10;
char *psz_option = (char*)malloc( i_len );
playlist_AddExt( THEPL, qtu( mrl ), "Streaming",
PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END,
- -1, &psz_option, 1, VLC_TRUE, VLC_FALSE );
+ -1, &psz_option, 1, true, false );
}
}
qdialog = (InteractionDialog*)(p_dialog->p_private);
if( qdialog )
qdialog->update();
+ else
+ {
+ /* The INTERACT_NEW message was forgotten
+ so we must create the dialog and update it*/
+ qdialog = new InteractionDialog( p_intf, p_dialog );
+ p_dialog->p_private = (void*)qdialog;
+ if( !(p_dialog->i_status == ANSWERED_DIALOG) )
+ qdialog->show();
+ if( qdialog )
+ qdialog->update();
+ }
break;
case INTERACT_HIDE:
qdialog = (InteractionDialog*)(p_dialog->p_private);
break;
}
}
-
-void DialogsProvider::switchToSkins()
-{
- var_SetString( p_intf, "intf-switch", "skins2" );
-}
-
-void DialogsProvider::switchToWx()
-{
- var_SetString( p_intf, "intf-switch", "wxwidgets" );
-}