skins2: update to latest change in core

[vlc] / modules / gui / skins2 / src / dialogs.cpp

diff --git a/modules/gui/skins2/src/dialogs.cpp b/modules/gui/skins2/src/dialogs.cpp
index a367f9d57d8fc01be85aec3ba48d7f6b5e34fa96..304172bcdcfdc1736480a20b99709fa30b1fce82 100644 (file)
--- a/modules/gui/skins2/src/dialogs.cpp
+++ b/modules/gui/skins2/src/dialogs.cpp
@@ -113,14 +113,12 @@ Dialogs::~Dialogs()
     if( m_pProvider && m_pModule )
     {
         // Detach the dialogs provider from its parent interface
-        vlc_object_detach( m_pProvider );
-
-        module_Unneed( m_pProvider, m_pModule );
+        module_unneed( m_pProvider, m_pModule );
         vlc_object_release( m_pProvider );
     }
 
     /* Unregister callbacks */
-    var_DelCallback( getIntf()->p_sys->p_playlist, "intf-popupmenu",
+    var_DelCallback( getIntf()->p_libvlc, "intf-popupmenu",
                      PopupMenuCB, this );
 }
 
@@ -147,11 +145,8 @@ Dialogs *Dialogs::instance( intf_thread_t *pIntf )
 
 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;
 }
 
 
@@ -161,12 +156,12 @@ bool Dialogs::init()
     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 );
+    // Attach the dialogs provider to its parent interface
+    vlc_object_attach( m_pProvider, getIntf() );
+
+    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)" );
@@ -175,18 +170,8 @@ bool Dialogs::init()
         return false;
     }
 
-    // Attach the dialogs provider to its parent interface
-    vlc_object_attach( m_pProvider, getIntf() );
-
-    // Initialize dialogs provider
-    // (returns as soon as initialization is done)
-    if( m_pProvider->pf_run )
-    {
-        m_pProvider->pf_run( m_pProvider );
-    }
-
     /* 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;
@@ -198,9 +183,8 @@ void Dialogs::showFileGeneric( const string &rTitle, const string &rExtensions,
 {
     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() );
@@ -220,7 +204,7 @@ void Dialogs::showFileGeneric( const string &rTitle, const string &rExtensions,
 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 );
 }
 
@@ -228,16 +212,17 @@ void Dialogs::showChangeSkin()
 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"), _("M3U file|*.m3u|XSPF playlist|*.xspf"),
+    showFileGeneric( _("Save playlist"), _("XSPF playlist|*.xspf|"
+                                           "M3U file|*.m3u|"
+                                           "HTML playlist|*.html"),
                      showPlaylistSaveCB, kSAVE );
 }
 
@@ -246,7 +231,7 @@ void Dialogs::showPlaylist()
     if( m_pProvider && m_pProvider->pf_show_dialog )
     {
         m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_PLAYLIST,
-                                     0, 0 );
+                                     0, NULL );
     }
 }
 
@@ -255,7 +240,7 @@ void Dialogs::showFileSimple( bool play )
     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 );
     }
 }
 
@@ -265,7 +250,7 @@ void Dialogs::showFile( bool play )
     if( m_pProvider && m_pProvider->pf_show_dialog )
     {
         m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_FILE,
-                                     (int)play, 0 );
+                                     (int)play, NULL );
     }
 }
 
@@ -275,7 +260,7 @@ void Dialogs::showDirectory( bool play )
     if( m_pProvider && m_pProvider->pf_show_dialog )
     {
         m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_DIRECTORY,
-                                     (int)play, 0 );
+                                     (int)play, NULL );
     }
 }
 
@@ -285,7 +270,7 @@ void Dialogs::showDisc( bool play )
     if( m_pProvider && m_pProvider->pf_show_dialog )
     {
         m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_DISC,
-                                     (int)play, 0 );
+                                     (int)play, NULL );
     }
 }
 
@@ -295,7 +280,7 @@ void Dialogs::showNet( bool play )
     if( m_pProvider && m_pProvider->pf_show_dialog )
     {
         m_pProvider->pf_show_dialog( m_pProvider, INTF_DIALOG_NET,
-                                     (int)play, 0 );
+                                     (int)play, NULL );
     }
 }
 
@@ -304,7 +289,7 @@ void Dialogs::showMessages()
 {
     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 );
     }
 }
 
@@ -313,7 +298,7 @@ void Dialogs::showPrefs()
 {
     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 );
     }
 }
 
@@ -322,7 +307,7 @@ void Dialogs::showFileInfo()
 {
     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 );
     }
 }
 
@@ -331,7 +316,7 @@ void Dialogs::showStreamingWizard()
 {
     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 );
     }
 }
 
@@ -341,15 +326,14 @@ void Dialogs::showPopupMenu( bool bShow, int popupType = INTF_DIALOG_POPUPMENU )
     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();