}
/* Unregister callbacks */
- var_DelCallback( getIntf()->p_sys->p_playlist, "intf-popupmenu",
+ var_DelCallback( getIntf()->p_libvlc, "intf-popupmenu",
PopupMenuCB, this );
}
void Dialogs::destroy( intf_thread_t *pIntf )
{
- if( pIntf->p_sys->p_dialogs )
- {
- delete pIntf->p_sys->p_dialogs;
- pIntf->p_sys->p_dialogs = NULL;
- }
+ delete pIntf->p_sys->p_dialogs;
+ pIntf->p_sys->p_dialogs = NULL;
}
m_pProvider = (intf_thread_t *)vlc_object_create( getIntf(),
sizeof( intf_thread_t ) );
if( m_pProvider == NULL )
- {
- msg_Err( getIntf(), "out of memory" );
return false;
- }
- m_pModule = module_need( m_pProvider, "dialogs provider", NULL, 0 );
+ m_pModule = module_need( m_pProvider, "dialogs provider", NULL, false );
if( m_pModule == NULL )
{
msg_Err( getIntf(), "no suitable dialogs provider found (hint: compile the qt4 plugin, and make sure it is loaded properly)" );
}
/* Register callback for the intf-popupmenu variable */
- var_AddCallback( getIntf()->p_sys->p_playlist, "intf-popupmenu",
+ var_AddCallback( getIntf()->p_libvlc, "intf-popupmenu",
PopupMenuCB, this );
return true;
{
if( m_pProvider && m_pProvider->pf_show_dialog )
{
- intf_dialog_args_t *p_arg =
- (intf_dialog_args_t *)malloc( sizeof(intf_dialog_args_t) );
- memset( p_arg, 0, sizeof(intf_dialog_args_t) );
+ intf_dialog_args_t *p_arg = (intf_dialog_args_t*)
+ calloc( 1, sizeof( intf_dialog_args_t ) );
p_arg->psz_title = strdup( rTitle.c_str() );
p_arg->psz_extensions = strdup( rExtensions.c_str() );
void Dialogs::showChangeSkin()
{
showFileGeneric( _("Open a skin file"),
- _("Skin files (*.vlt;*.wsz)|*.vlt;*.wsz|Skin files (*.xml)|*.xml"),
+ _("Skin files |*.vlt;*.wsz;*.xml"),
showChangeSkinCB, kOPEN );
}
void Dialogs::showPlaylistLoad()
{
showFileGeneric( _("Open playlist"),
- _("All playlists|*.pls;*.m3u;*.asx;*.b4s;*.xspf|"
- "M3U files|*.m3u|"
- "XSPF playlist|*.xspf"),
+ _("Playlist Files|"EXTENSIONS_PLAYLIST"|"
+ "All Files|*"),
showPlaylistLoadCB, kOPEN );
}
void Dialogs::showPlaylistSave()
{
- showFileGeneric( _("Save playlist"), _("XSPF playlist|*.xspf|M3U file|*.m3u"),
+ showFileGeneric( _("Save playlist"), _("XSPF playlist|*.xspf|"
+ "M3U file|*.m3u|"
+ "HTML playlist|*.html"),
showPlaylistSaveCB, kSAVE );
}
if( m_pProvider && m_pProvider->pf_show_dialog )
{
m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_PLAYLIST,
- 0, 0 );
+ 0, NULL );
}
}
if( m_pProvider && m_pProvider->pf_show_dialog )
{
m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_FILE_SIMPLE,
- (int)play, 0 );
+ (int)play, NULL );
}
}
if( m_pProvider && m_pProvider->pf_show_dialog )
{
m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_FILE,
- (int)play, 0 );
+ (int)play, NULL );
}
}
if( m_pProvider && m_pProvider->pf_show_dialog )
{
m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_DIRECTORY,
- (int)play, 0 );
+ (int)play, NULL );
}
}
if( m_pProvider && m_pProvider->pf_show_dialog )
{
m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_DISC,
- (int)play, 0 );
+ (int)play, NULL );
}
}
if( m_pProvider && m_pProvider->pf_show_dialog )
{
m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_NET,
- (int)play, 0 );
+ (int)play, NULL );
}
}
{
if( m_pProvider && m_pProvider->pf_show_dialog )
{
- m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_MESSAGES, 0, 0 );
+ m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_MESSAGES, 0, NULL );
}
}
{
if( m_pProvider && m_pProvider->pf_show_dialog )
{
- m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_PREFS, 0, 0 );
+ m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_PREFS, 0, NULL );
}
}
{
if( m_pProvider && m_pProvider->pf_show_dialog )
{
- m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_FILEINFO, 0, 0 );
+ m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_FILEINFO, 0, NULL );
}
}
{
if( m_pProvider && m_pProvider->pf_show_dialog )
{
- m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_WIZARD, 0, 0 );
+ m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_WIZARD, 0, NULL );
}
}
if( m_pProvider && m_pProvider->pf_show_dialog )
{
m_pProvider->pf_show_dialog( m_pProvider, popupType,
- (int)bShow, 0 );
+ (int)bShow, NULL );
}
}
void Dialogs::showInteraction( interaction_dialog_t *p_dialog )
{
- intf_dialog_args_t *p_arg =
- (intf_dialog_args_t *)malloc( sizeof(intf_dialog_args_t) );
- memset( p_arg, 0, sizeof(intf_dialog_args_t) );
+ intf_dialog_args_t *p_arg = (intf_dialog_args_t *)
+ calloc( 1, sizeof(intf_dialog_args_t) );
p_arg->p_dialog = p_dialog;
p_arg->p_intf = getIntf();