<html><head></head><body>Hi,<br><br>Items are played to get the sub-items, undernthe assumption that the item is a playlist file. This change most likely breaks the functionality.<br><br><div class="gmail_quote">Le 23 mai 2019 11:21:52 GMT+03:00, Thomas Guillem <git@videolan.org> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">vlc | branch: master | Thomas Guillem <thomas@gllm.fr> | Fri May 10 14:41:40 2019 +0200| [1a7e583dc6b31bddd390f59db72e3cc5e588efb3] | committer: Thomas Guillem<br><br>sd: podcast: don't auto play discorered items<br><br>I don't understand why discoverted items are played here. Only the owner of the<br>service discovery should make this call.<br><br><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;"><a href="http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1a7e583dc6b31bddd390f59db72e3cc5e588efb3">http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1a7e583dc6b31bddd390f59db72e3cc5e588efb3</a><br></blockquote><hr> modules/services_discovery/podcast.c | 52 ------------------------------------<br> 1 file changed, 52 deletions(-)<br><br>diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c<br>index 0113d21731..a29996d59b 100644<br>--- a/modules/services_discovery/podcast.c<br>+++ b/modules/services_discovery/podcast.c<br>@@ -84,10 +84,6 @@ enum {<br> <br> typedef struct<br> {<br>- /* playlist node */<br>- input_thread_t **pp_input;<br>- int i_input;<br>-<br> char **ppsz_urls;<br> int i_urls;<br> <br>@@ -130,8 +126,6 @@ static int Open( vlc_object_t *p_this )<br> <br> p_sys->i_urls = 0;<br> p_sys->ppsz_urls = NULL;<br>- p_sys->i_input = 0;<br>- p_sys->pp_input = NULL;<br> p_sys->pp_items = NULL;<br> p_sys->i_items = 0;<br> vlc_mutex_init( &p_sys->lock );<br>@@ -181,19 +175,6 @@ static void Close( vlc_object_t *p_this )<br> vlc_cond_destroy( &p_sys->wait );<br> vlc_mutex_destroy( &p_sys->lock );<br> <br>- for( int i = 0; i < p_sys->i_input; i++ )<br>- {<br>- input_thread_t *p_input = p_sys->pp_input[i];<br>- if( !p_input )<br>- continue;<br>-<br>- input_Stop( p_input );<br>- input_Close( p_input );<br>-<br>- p_sys->pp_input[i] = NULL;<br>- }<br>- free( p_sys->pp_input );<br>-<br> for( int i = 0; i < p_sys->i_urls; i++ )<br> free( p_sys->ppsz_urls[i] );<br> free( p_sys->ppsz_urls );<br>@@ -209,19 +190,6 @@ static void Close( vlc_object_t *p_this )<br> /*****************************************************************************<br> * Run: main thread<br> *****************************************************************************/<br>-static input_thread_t *InputCreateAndStart( services_discovery_t *sd,<br>- input_item_t *item )<br>-{<br>- input_thread_t *input = input_Create( sd, input_LegacyEvents, NULL, item, NULL, NULL );<br>- if( input != NULL && input_Start( input ) )<br>- {<br>- input_LegacyVarInit( input );<br>- input_Close(input);<br>- input = NULL;<br>- }<br>- return input;<br>-}<br>-<br> noreturn static void *Run( void *data )<br> {<br> services_discovery_t *p_sd = data;<br>@@ -249,21 +217,6 @@ noreturn static void *Run( void *data )<br> <br> p_sys->b_update = false;<br> <br>- for( int i = 0; i < p_sys->i_input; i++ )<br>- {<br>- input_thread_t *p_input = p_sys->pp_input[i];<br>- int state = var_GetInteger( p_input, "state" );<br>-<br>- if( state == END_S || state == ERROR_S )<br>- {<br>- input_Stop( p_input );<br>- input_Close( p_input );<br>-<br>- p_sys->pp_input[i] = NULL;<br>- TAB_ERASE(p_sys->i_input, p_sys->pp_input, i);<br>- i--;<br>- }<br>- }<br> vlc_restorecancel (canc);<br> }<br> vlc_cleanup_pop();<br>@@ -339,9 +292,6 @@ static void ParseUrls( services_discovery_t *p_sd, char *psz_urls )<br> <br> TAB_APPEND( i_new_items, pp_new_items, p_input );<br> services_discovery_AddItem( p_sd, p_input );<br>-<br>- TAB_APPEND( p_sys->i_input, p_sys->pp_input,<br>- InputCreateAndStart( p_sd, p_input ) );<br> }<br> else<br> {<br>@@ -417,8 +367,6 @@ static void ParseRequest( services_discovery_t *p_sd )<br> TAB_APPEND( p_sys->i_items, p_sys->pp_items, p_input );<br> services_discovery_AddItem( p_sd, p_input );<br> <br>- TAB_APPEND( p_sys->i_input, p_sys->pp_input,<br>- InputCreateAndStart( p_sd, p_input ) );<br> SaveUrls( p_sd );<br> }<br> }<hr>vlc-commits mailing list<br>vlc-commits@videolan.org<br><a href="https://mailman.videolan.org/listinfo/vlc-commits">https://mailman.videolan.org/listinfo/vlc-commits</a><br></pre></blockquote></div><br>-- <br>Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.</body></html>