playlist: remove no-op pf_deactivate functions

modules/demux/playlist/b4s.c

@@ -51,20 +51,16 @@ static bool IsWhitespace( const char *psz_string );
  *****************************************************************************/
 int Import_B4S( vlc_object_t *p_this )
 {
-    DEMUX_BY_EXTENSION_OR_FORCED_MSG( ".b4s", "b4s-open",
-                                      "using B4S playlist reader" );
-    return VLC_SUCCESS;
-}
+    demux_t *demux = (demux_t *)p_this;
 
-/*****************************************************************************
- * Deactivate: frees unused data
- *****************************************************************************/
-void Close_B4S( vlc_object_t *p_this )
-{
-    demux_t *p_demux = (demux_t *)p_this;
-    demux_sys_t *p_sys = p_demux->p_sys;
+    if( !demux_IsPathExtension( demux, ".b4s" )
+     && !demux_IsForced( demux, "b4s-open" ) )
+        return VLC_EGENERIC;
 
-    free( p_sys );
+    demux->pf_demux = Demux;
+    demux->pf_control = Control;
+
+    return VLC_SUCCESS;
 }
 
 static int Demux( demux_t *p_demux )

modules/demux/playlist/dvb.c

@@ -85,14 +85,6 @@ int Import_DVB( vlc_object_t *p_this )
     return VLC_SUCCESS;
 }
 
-/*****************************************************************************
- * Deactivate: frees unused data
- *****************************************************************************/
-void Close_DVB( vlc_object_t *p_this )
-{
-    VLC_UNUSED(p_this);
-}
-
 /*****************************************************************************
  * Demux: The important stuff
  *****************************************************************************/

modules/demux/playlist/ifo.c

@@ -93,14 +93,6 @@ int Import_IFO( vlc_object_t *p_this )
     return VLC_SUCCESS;
 }
 
-/*****************************************************************************
- * Deactivate: frees unused data
- *****************************************************************************/
-void Close_IFO( vlc_object_t *p_this )
-{
-    VLC_UNUSED(p_this);
-}
-
 static int Demux( demux_t *p_demux )
 {
     char *psz_url, *psz_dir;

modules/demux/playlist/playlist.c

@@ -81,17 +81,17 @@ vlc_module_begin ()
         set_description( N_("B4S playlist import") )
         add_shortcut( "playlist", "b4s-open", "shout-b4s" )
         set_capability( "demux", 10 )
-        set_callbacks( Import_B4S, Close_B4S )
+        set_callbacks( Import_B4S, NULL )
     add_submodule ()
         set_description( N_("DVB playlist import") )
         add_shortcut( "playlist", "dvb-open" )
         set_capability( "demux", 10 )
-        set_callbacks( Import_DVB, Close_DVB )
+        set_callbacks( Import_DVB, NULL )
     add_submodule ()
         set_description( N_("Podcast parser") )
         add_shortcut( "playlist", "podcast" )
         set_capability( "demux", 10 )
-        set_callbacks( Import_podcast, Close_podcast )
+        set_callbacks( Import_podcast, NULL )
     add_submodule ()
         set_description( N_("XSPF playlist import") )
         add_shortcut( "playlist", "xspf-open" )
@@ -101,7 +101,7 @@ vlc_module_begin ()
         set_description( N_("New winamp 5.2 shoutcast import") )
         add_shortcut( "playlist", "shout-winamp" )
         set_capability( "demux", 10 )
-        set_callbacks( Import_Shoutcast, Close_Shoutcast )
+        set_callbacks( Import_Shoutcast, NULL )
         add_bool( "shoutcast-show-adult", false,
                    SHOW_ADULT_TEXT, SHOW_ADULT_LONGTEXT, false )
     add_submodule ()
@@ -118,17 +118,17 @@ vlc_module_begin ()
         set_description( N_("QuickTime Media Link importer") )
         add_shortcut( "playlist", "qtl" )
         set_capability( "demux", 10 )
-        set_callbacks( Import_QTL, Close_QTL )
+        set_callbacks( Import_QTL, NULL )
     add_submodule ()
         set_description( N_("Google Video Playlist importer") )
         add_shortcut( "playlist", "gvp" )
         set_capability( "demux", 10 )
         set_callbacks( Import_GVP, Close_GVP )
     add_submodule ()
-        set_description( N_("Dummy ifo demux") )
+        set_description( N_("Dummy IFO demux") )
         add_shortcut( "playlist" )
         set_capability( "demux", 12 )
-        set_callbacks( Import_IFO, Close_IFO )
+        set_callbacks( Import_IFO, NULL )
     add_submodule ()
         set_description( N_("iTunes Music Library importer") )
         add_shortcut( "playlist", "itml" )

modules/demux/playlist/playlist.h

@@ -42,19 +42,15 @@ int Import_PLS ( vlc_object_t * );
 void Close_PLS ( vlc_object_t * );
 
 int Import_B4S ( vlc_object_t * );
-void Close_B4S ( vlc_object_t * );
 
 int Import_DVB ( vlc_object_t * );
-void Close_DVB ( vlc_object_t * );
 
 int Import_podcast ( vlc_object_t * );
-void Close_podcast ( vlc_object_t * );
 
 int Import_xspf ( vlc_object_t * );
 void Close_xspf ( vlc_object_t * );
 
 int Import_Shoutcast ( vlc_object_t * );
-void Close_Shoutcast ( vlc_object_t * );
 
 int Import_ASX ( vlc_object_t * );
 void Close_ASX ( vlc_object_t * );
@@ -63,7 +59,6 @@ int Import_SGIMB ( vlc_object_t * );
 void Close_SGIMB ( vlc_object_t * );
 
 int Import_QTL ( vlc_object_t * );
-void Close_QTL ( vlc_object_t * );
 
 int Import_GVP ( vlc_object_t * );
 void Close_GVP ( vlc_object_t * );

modules/demux/playlist/podcast.c

@@ -58,14 +58,6 @@ int Import_podcast( vlc_object_t *p_this )
     return VLC_SUCCESS;
 }
 
-/*****************************************************************************
- * Deactivate: frees unused data
- *****************************************************************************/
-void Close_podcast( vlc_object_t *p_this )
-{
-    (void)p_this;
-}
-
 /* "specs" : http://phobos.apple.com/static/iTunesRSS.html */
 static int Demux( demux_t *p_demux )
 {

modules/demux/playlist/qtl.c

@@ -92,14 +92,6 @@ int Import_QTL( vlc_object_t *p_this )
     return VLC_SUCCESS;
 }
 
-/*****************************************************************************
- * Deactivate: frees unused data
- *****************************************************************************/
-void Close_QTL( vlc_object_t *p_this )
-{
-    (void)p_this;
-}
-
 static int Demux( demux_t *p_demux )
 {
     xml_reader_t *p_xml_reader;

modules/demux/playlist/shoutcast.c

@@ -69,14 +69,6 @@ int Import_Shoutcast( vlc_object_t *p_this )
     return VLC_SUCCESS;
 }
 
-/*****************************************************************************
- * Deactivate: frees unused data
- *****************************************************************************/
-void Close_Shoutcast( vlc_object_t *p_this )
-{
-    (void)p_this;
-}
-
 static int Demux( demux_t *p_demux )
 {
     xml_reader_t *p_xml_reader = NULL;