Restore SD human-readable names

[vlc] / modules / services_discovery / shout.c

diff --git a/modules/services_discovery/shout.c b/modules/services_discovery/shout.c
index bab1f0204b8370572e9e95697daa8f13f792cf25..2e4191bc37cc5287d69041628c341306b1dc9612 100644 (file)
--- a/modules/services_discovery/shout.c
+++ b/modules/services_discovery/shout.c
@@ -100,48 +100,52 @@ OPEN( ShoutTV )
 OPEN( Freebox )
 OPEN( FrenchTV )
 
-vlc_module_begin();
-    set_category( CAT_PLAYLIST );
-    set_subcategory( SUBCAT_PLAYLIST_SD );
-
-    add_obsolete_integer( "shoutcast-limit" );
-
-        set_shortname( "Shoutcast");
-        set_description( N_("Shoutcast radio listings") );
-        set_capability( "services_discovery", 0 );
-        set_callbacks( OpenShoutRadio, Close );
-        add_shortcut( "shoutcast" );
-
-    add_submodule();
-        set_shortname( "ShoutcastTV" );
-        set_description( N_("Shoutcast TV listings") );
-        set_capability( "services_discovery", 0 );
-        set_callbacks( OpenShoutTV, Close );
-        add_shortcut( "shoutcasttv" );
-
-    add_submodule();
-        set_shortname( "frenchtv");
-        set_description( N_("French TV") );
-        set_capability( "services_discovery", 0 );
-        set_callbacks( OpenFrenchTV, Close );
-        add_shortcut( "frenchtv" );
-
-    add_submodule();
-        set_shortname( "Freebox");
-        set_description( N_("Freebox TV listing (French ISP free.fr services)") );
-        set_capability( "services_discovery", 0 );
-        set_callbacks( OpenFreebox, Close );
-        add_shortcut( "freebox" );
-
-vlc_module_end();
+vlc_module_begin ()
+    set_category( CAT_PLAYLIST )
+    set_subcategory( SUBCAT_PLAYLIST_SD )
+
+    add_obsolete_integer( "shoutcast-limit" )
+
+        set_shortname( "Shoutcast")
+        set_description( N_("Shoutcast radio listings") )
+        set_capability( "services_discovery", 0 )
+        set_callbacks( OpenShoutRadio, Close )
+        add_shortcut( "shoutcast" )
+
+    add_submodule ()
+        set_shortname( "ShoutcastTV" )
+        set_description( N_("Shoutcast TV listings") )
+        set_capability( "services_discovery", 0 )
+        set_callbacks( OpenShoutTV, Close )
+        add_shortcut( "shoutcasttv" )
+
+    add_submodule ()
+        set_shortname( "frenchtv")
+        set_description( N_("French TV") )
+        set_capability( "services_discovery", 0 )
+        set_callbacks( OpenFrenchTV, Close )
+        add_shortcut( "frenchtv" )
+
+    add_submodule ()
+        set_shortname( "Freebox")
+        set_description( N_("Freebox TV listing (French ISP free.fr services)") )
+        set_capability( "services_discovery", 0 )
+        set_callbacks( OpenFreebox, Close )
+        add_shortcut( "freebox" )
+
+vlc_module_end ()
 
 
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
 
-static void Run( services_discovery_t *p_sd );
-
+static void *Run( void * );
+struct services_discovery_sys_t
+{
+    vlc_thread_t thread;
+    enum type_e i_type;
+};
 
 /*****************************************************************************
  * Open: initialize and create stuff
@@ -149,9 +153,17 @@ static void Run( services_discovery_t *p_sd );
 static int Open( vlc_object_t *p_this, enum type_e i_type )
 {
     services_discovery_t *p_sd = ( services_discovery_t* )p_this;
-    services_discovery_SetLocalizedName( p_sd, _(p_items[i_type].psz_name) );
-    p_sd->pf_run = Run;
-    p_sd->p_sys = (void *)i_type;
+
+    p_sd->p_sys = malloc (sizeof (*(p_sd->p_sys)));
+    if (p_sd->p_sys == NULL)
+        return VLC_ENOMEM;
+
+    p_sd->p_sys->i_type = i_type;
+    if (vlc_clone (&p_sd->p_sys->thread, Run, p_sd, VLC_THREAD_PRIORITY_LOW))
+    {
+        free (p_sd->p_sys);
+        return VLC_EGENERIC;
+    }
     return VLC_SUCCESS;
 }
 
@@ -211,15 +223,19 @@ static void AddSubitemsOfShoutItemURL( services_discovery_t *p_sd,
 /*****************************************************************************
  * Run:
  *****************************************************************************/
-static void Run( services_discovery_t *p_sd )
+static void *Run( void *data )
 {
-    enum type_e i_type = (enum type_e)p_sd->p_sys;
+    services_discovery_t *p_sd = data;
+    services_discovery_sys_t *p_sys = p_sd->p_sys;
+    enum type_e i_type = p_sys->i_type;
     int i, j;
+    int canc = vlc_savecancel();
     
     if( !p_items[i_type].p_children )
     {
         AddSubitemsOfShoutItemURL( p_sd, &p_items[i_type], NULL );
-        return;
+        vlc_restorecancel(canc);
+        return NULL;
     }
     for( i = 0; p_items[i_type].p_children[i].psz_name; i++ )
     {
@@ -238,6 +254,8 @@ static void Run( services_discovery_t *p_sd )
             vlc_gc_decref( p_input );
         }
     }
+    vlc_restorecancel(canc);
+    return NULL;
 }
 
 /*****************************************************************************
@@ -245,5 +263,9 @@ static void Run( services_discovery_t *p_sd )
  *****************************************************************************/
 static void Close( vlc_object_t *p_this )
 {
-    VLC_UNUSED(p_this);
+    services_discovery_t *p_sd = (services_discovery_t *)p_this;
+    services_discovery_sys_t *p_sys = p_sd->p_sys;
+
+    vlc_join (p_sys->thread, NULL);
+    free (p_sys);
 }