Mark unreachable code on GCC even if NDEBUG

[vlc] / modules / services_discovery / podcast.c

diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c
index 07afe5bc2ca0bdca4cf170f6c3b87d57af64872c..58089ac0e13ba468d8707d06bee8ca17c73b7d6f 100644 (file)
--- a/modules/services_discovery/podcast.c
+++ b/modules/services_discovery/podcast.c
@@ -31,15 +31,11 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_playlist.h>
 #include <vlc_services_discovery.h>
-
 #include <vlc_network.h>
-#include <assert.h>
 
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
+#include <assert.h>
+#include <unistd.h>
 
 /************************************************************************
  * Macros and definitions
@@ -53,7 +49,7 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-VLC_SD_PROBE_HELPER("podcast", N_("Podcasts"))
+VLC_SD_PROBE_HELPER("podcast", "Podcasts", SD_CAT_INTERNET)
 
 #define URLS_TEXT N_("Podcast URLs list")
 #define URLS_LONGTEXT N_("Enter the list of podcasts to retrieve, " \
@@ -65,9 +61,8 @@ vlc_module_begin ()
     set_category( CAT_PLAYLIST )
     set_subcategory( SUBCAT_PLAYLIST_SD )
 
-    add_string( "podcast-urls", NULL, NULL,
+    add_string( "podcast-urls", NULL,
                 URLS_TEXT, URLS_LONGTEXT, false )
-        change_autosave ()
 
     set_capability( "services_discovery", 0 )
     set_callbacks( Open, Close )
@@ -102,6 +97,7 @@ struct services_discovery_sys_t
     vlc_mutex_t lock;
     vlc_cond_t  wait;
     bool b_update;
+    bool b_savedurls_loaded;
     char *psz_request;
     int update_type;
 };
@@ -123,9 +119,11 @@ static void SaveUrls( services_discovery_t *p_sd );
  *****************************************************************************/
 static int Open( vlc_object_t *p_this )
 {
+    if( strcmp( p_this->p_parent->psz_object_type, "playlist" ) )
+        return VLC_EGENERIC; /* FIXME: support LibVLC SD too! */
+
     services_discovery_t *p_sd = ( services_discovery_t* )p_this;
-    services_discovery_sys_t *p_sys  = malloc(
-                                    sizeof( services_discovery_sys_t ) );
+    services_discovery_sys_t *p_sys = malloc( sizeof( *p_sys ) );
     if( !p_sys )
         return VLC_ENOMEM;
 
@@ -138,22 +136,24 @@ static int Open( vlc_object_t *p_this )
     vlc_mutex_init( &p_sys->lock );
     vlc_cond_init( &p_sys->wait );
     p_sys->b_update = true;
+    p_sys->b_savedurls_loaded = false;
     p_sys->psz_request = NULL;
     p_sys->update_type = UPDATE_URLS;
 
     p_sd->p_sys  = p_sys;
 
     /* Launch the callback associated with this variable */
-    var_Create( p_sd, "podcast-urls", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_AddCallback( p_sd, "podcast-urls", UrlsChange, p_sys );
+    vlc_object_t *pl = p_sd->p_parent;
+    var_Create( pl, "podcast-urls", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+    var_AddCallback( pl, "podcast-urls", UrlsChange, p_sys );
 
-    var_Create( p_sd, "podcast-request", VLC_VAR_STRING );
-    var_AddCallback( p_sd, "podcast-request", Request, p_sys );
+    var_Create( pl, "podcast-request", VLC_VAR_STRING );
+    var_AddCallback( pl, "podcast-request", Request, p_sys );
 
     if (vlc_clone (&p_sys->thread, Run, p_sd, VLC_THREAD_PRIORITY_LOW))
     {
-        var_DelCallback( p_sd, "podcast-request", Request, p_sys );
-        var_DelCallback( p_sd, "podcast-urls", UrlsChange, p_sys );
+        var_DelCallback( pl, "podcast-request", Request, p_sys );
+        var_DelCallback( pl, "podcast-urls", UrlsChange, p_sys );
         vlc_cond_destroy( &p_sys->wait );
         vlc_mutex_destroy( &p_sys->lock );
         free (p_sys);
@@ -168,14 +168,15 @@ static int Open( vlc_object_t *p_this )
 static void Close( vlc_object_t *p_this )
 {
     services_discovery_t *p_sd = ( services_discovery_t* )p_this;
-    services_discovery_sys_t *p_sys  = p_sd->p_sys;
+    services_discovery_sys_t *p_sys = p_sd->p_sys;
+    vlc_object_t *pl = p_sd->p_parent;
     int i;
 
     vlc_cancel (p_sys->thread);
     vlc_join (p_sys->thread, NULL);
 
-    var_DelCallback( p_sd, "podcast-urls", UrlsChange, p_sys );
-    var_DelCallback( p_sd, "podcast-request", Request, p_sys );
+    var_DelCallback( pl, "podcast-urls", UrlsChange, p_sys );
+    var_DelCallback( pl, "podcast-request", Request, p_sys );
     vlc_cond_destroy( &p_sys->wait );
     vlc_mutex_destroy( &p_sys->lock );
 
@@ -185,9 +186,8 @@ static void Close( vlc_object_t *p_this )
         if( !p_input )
             continue;
 
-        input_Stop( p_input, true );
-        vlc_thread_join( p_input );
-        vlc_object_release( p_input );
+        input_Stop( p_input );
+        input_Close( p_input );
 
         p_sd->p_sys->pp_input[i] = NULL;
     }
@@ -203,6 +203,7 @@ static void Close( vlc_object_t *p_this )
 /*****************************************************************************
  * Run: main thread
  *****************************************************************************/
+VLC_NORETURN
 static void *Run( void *data )
 {
     services_discovery_t *p_sd = data;
@@ -220,14 +221,13 @@ static void *Run( void *data )
 
         if( p_sys->update_type == UPDATE_URLS )
         {
-          char* psz_urls = var_GetNonEmptyString( p_sd, "podcast-urls" );
-          ParseUrls( p_sd, psz_urls );
-          free( psz_urls );
+            char *psz_urls = var_GetNonEmptyString( p_sd->p_parent,
+                                                    "podcast-urls" );
+            ParseUrls( p_sd, psz_urls );
+            free( psz_urls );
         }
         else if( p_sys->update_type == UPDATE_REQUEST )
-        {
-          ParseRequest( p_sd );
-        }
+            ParseRequest( p_sd );
 
         p_sys->b_update = false;
 
@@ -237,9 +237,8 @@ static void *Run( void *data )
 
             if( p_input->b_eof || p_input->b_error )
             {
-                input_Stop( p_input, false );
-                vlc_thread_join( p_input );
-                vlc_object_release( p_input );
+                input_Stop( p_input );
+                input_Close( p_input );
 
                 p_sd->p_sys->pp_input[i] = NULL;
                 REMOVE_ELEM( p_sys->pp_input, p_sys->i_input, i );
@@ -249,7 +248,7 @@ static void *Run( void *data )
         vlc_restorecancel (canc);
     }
     vlc_cleanup_pop();
-    assert(0); /* dead code */
+    vlc_assert_unreachable(); /* dead code */
 }
 
 static int UrlsChange( vlc_object_t *p_this, char const *psz_var,
@@ -296,12 +295,14 @@ static void ParseUrls( services_discovery_t *p_sd, char *psz_urls )
 
     int i_new_urls = 0;
     char **ppsz_new_urls = NULL;
+    p_sys->b_savedurls_loaded = true;
 
     int i, j;
 
     for( ;; )
     {
-        if( !psz_urls ) break;
+        if( !psz_urls )
+            break;
 
         char *psz_tok = strchr( psz_urls, '|' );
         if( psz_tok ) *psz_tok = '\0';
@@ -315,7 +316,7 @@ static void ParseUrls( services_discovery_t *p_sd, char *psz_urls )
                          strdup( psz_urls ) );
 
             input_item_t *p_input;
-            p_input = input_item_New( p_sd, psz_urls, psz_urls );
+            p_input = input_item_New( psz_urls, psz_urls );
             input_item_AddOption( p_input, "demux=podcast", VLC_INPUT_OPTION_TRUSTED );
 
             INSERT_ELEM( pp_new_items, i_new_items, i_new_items, p_input );
@@ -330,8 +331,10 @@ static void ParseUrls( services_discovery_t *p_sd, char *psz_urls )
                          strdup( p_sys->ppsz_urls[i]) );
             INSERT_ELEM( pp_new_items, i_new_items, i_new_items, p_sys->pp_items[i] );
         }
-        if( psz_tok )  psz_urls = psz_tok+1;
-        else break;
+        if( psz_tok )
+            psz_urls = psz_tok+1;
+        else
+            break;
     }
 
     /* delete removed items and signal the removal */
@@ -341,12 +344,13 @@ static void ParseUrls( services_discovery_t *p_sd, char *psz_urls )
             if( pp_new_items[j] == p_sys->pp_items[i] ) break;
         if( j == i_new_items )
         {
-          services_discovery_RemoveItem( p_sd, p_sys->pp_items[i] );
-          vlc_gc_decref( p_sys->pp_items[i] );
+            services_discovery_RemoveItem( p_sd, p_sys->pp_items[i] );
+            vlc_gc_decref( p_sys->pp_items[i] );
         }
     }
     free( p_sys->pp_items );
-    for( int i = 0; i < p_sys->i_urls; i++ ) free( p_sys->ppsz_urls[i] );
+    for( int i = 0; i < p_sys->i_urls; i++ )
+        free( p_sys->ppsz_urls[i] );
     free( p_sys->ppsz_urls );
 
     p_sys->ppsz_urls = ppsz_new_urls;
@@ -366,6 +370,15 @@ static void ParseRequest( services_discovery_t *p_sd )
     char *psz_tok = strchr( psz_request, ':' );
     if( !psz_tok ) return;
     *psz_tok = '\0';
+
+    if ( ! p_sys->b_savedurls_loaded )
+    {
+        char *psz_urls = var_GetNonEmptyString( p_sd->p_parent,
+                                                "podcast-urls" );
+        ParseUrls( p_sd, psz_urls );
+        free( psz_urls );
+    }
+
     if( !strcmp( psz_request, "ADD" ) )
     {
         psz_request = psz_tok + 1;
@@ -378,7 +391,7 @@ static void ParseRequest( services_discovery_t *p_sd )
               strdup( psz_request ) );
 
             input_item_t *p_input;
-            p_input = input_item_New( p_sd, psz_request, psz_request );
+            p_input = input_item_New( psz_request, psz_request );
             input_item_AddOption( p_input, "demux=podcast", VLC_INPUT_OPTION_TRUSTED );
 
             INSERT_ELEM( p_sys->pp_items, p_sys->i_items, p_sys->i_items, p_input );
@@ -428,7 +441,6 @@ static void SaveUrls( services_discovery_t *p_sd )
     }
 
     config_PutPsz( p_sd, "podcast-urls", psz_urls );
-    config_SaveConfigFile( p_sd, "podcast" );
 
     free( psz_urls );
 }