<!DOCTYPE html><html><head><title></title><style type="text/css">p.MsoNormal,p.MsoNoSpacing{margin:0}</style></head><body><div><br></div><div>On Thu, May 23, 2019, at 15:03, Rémi Denis-Courmont wrote:<br></div><blockquote type="cite" id="qt"><div>Hi,<br></div><div><br></div><div>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></div></blockquote><div><br></div><div>There are other way to get sub items now. I'll need to fix it then.<br></div><div><br></div><div>PS: I proposed this patch 2 weeks ago.<br></div><div><br></div><blockquote type="cite" id="qt"><div><br></div><div class="qt-gmail_quote"><div>Le 23 mai 2019 11:21:52 GMT+03:00, Thomas Guillem <git@videolan.org> a écrit :<br></div><blockquote style="margin-top:0pt;margin-right:0pt;margin-bottom:0pt;margin-left:0.8ex;border-left-color:rgb(204, 204, 204);border-left-style:solid;border-left-width:1px;padding-left:1ex;" class="qt-gmail_quote"><pre class="qt-k9mail"><div>vlc | branch: master | Thomas Guillem <thomas@gllm.fr> | Fri May 10 14:41:40 2019 +0200| [1a7e583dc6b31bddd390f59db72e3cc5e588efb3] | committer: Thomas Guillem<br></div><div><br></div><div>sd: podcast: don't auto play discorered items<br></div><div><br></div><div>I don't understand why discoverted items are played here. Only the owner of the<br></div><div>service discovery should make this call.<br></div><div><br></div><blockquote style="margin-top:0pt;margin-right:0pt;margin-bottom:1ex;margin-left:0.8ex;border-left-color:rgb(114, 159, 207);border-left-style:solid;border-left-width:1px;padding-left:1ex;" class="qt-gmail_quote"><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><div><hr> modules/services_discovery/podcast.c | 52 ------------------------------------<br></div><div> 1 file changed, 52 deletions(-)<br></div><div><br></div><div>diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c<br></div><div>index 0113d21731..a29996d59b 100644<br></div><div>--- a/modules/services_discovery/podcast.c<br></div><div>+++ b/modules/services_discovery/podcast.c<br></div><div>@@ -84,10 +84,6 @@ enum {<br></div><div> <br></div><div> typedef struct<br></div><div> {<br></div><div>- /* playlist node */<br></div><div>- input_thread_t **pp_input;<br></div><div>- int i_input;<br></div><div>-<br></div><div> char **ppsz_urls;<br></div><div> int i_urls;<br></div><div> <br></div><div>@@ -130,8 +126,6 @@ static int Open( vlc_object_t *p_this )<br></div><div> <br></div><div> p_sys->i_urls = 0;<br></div><div> p_sys->ppsz_urls = NULL;<br></div><div>- p_sys->i_input = 0;<br></div><div>- p_sys->pp_input = NULL;<br></div><div> p_sys->pp_items = NULL;<br></div><div> p_sys->i_items = 0;<br></div><div> vlc_mutex_init( &p_sys->lock );<br></div><div>@@ -181,19 +175,6 @@ static void Close( vlc_object_t *p_this )<br></div><div> vlc_cond_destroy( &p_sys->wait );<br></div><div> vlc_mutex_destroy( &p_sys->lock );<br></div><div> <br></div><div>- for( int i = 0; i < p_sys->i_input; i++ )<br></div><div>- {<br></div><div>- input_thread_t *p_input = p_sys->pp_input[i];<br></div><div>- if( !p_input )<br></div><div>- continue;<br></div><div>-<br></div><div>- input_Stop( p_input );<br></div><div>- input_Close( p_input );<br></div><div>-<br></div><div>- p_sys->pp_input[i] = NULL;<br></div><div>- }<br></div><div>- free( p_sys->pp_input );<br></div><div>-<br></div><div> for( int i = 0; i < p_sys->i_urls; i++ )<br></div><div> free( p_sys->ppsz_urls[i] );<br></div><div> free( p_sys->ppsz_urls );<br></div><div>@@ -209,19 +190,6 @@ static void Close( vlc_object_t *p_this )<br></div><div> /*****************************************************************************<br></div><div> * Run: main thread<br></div><div> *****************************************************************************/<br></div><div>-static input_thread_t *InputCreateAndStart( services_discovery_t *sd,<br></div><div>- input_item_t *item )<br></div><div>-{<br></div><div>- input_thread_t *input = input_Create( sd, input_LegacyEvents, NULL, item, NULL, NULL );<br></div><div>- if( input != NULL && input_Start( input ) )<br></div><div>- {<br></div><div>- input_LegacyVarInit( input );<br></div><div>- input_Close(input);<br></div><div>- input = NULL;<br></div><div>- }<br></div><div>- return input;<br></div><div>-}<br></div><div>-<br></div><div> noreturn static void *Run( void *data )<br></div><div> {<br></div><div> services_discovery_t *p_sd = data;<br></div><div>@@ -249,21 +217,6 @@ noreturn static void *Run( void *data )<br></div><div> <br></div><div> p_sys->b_update = false;<br></div><div> <br></div><div>- for( int i = 0; i < p_sys->i_input; i++ )<br></div><div>- {<br></div><div>- input_thread_t *p_input = p_sys->pp_input[i];<br></div><div>- int state = var_GetInteger( p_input, "state" );<br></div><div>-<br></div><div>- if( state == END_S || state == ERROR_S )<br></div><div>- {<br></div><div>- input_Stop( p_input );<br></div><div>- input_Close( p_input );<br></div><div>-<br></div><div>- p_sys->pp_input[i] = NULL;<br></div><div>- TAB_ERASE(p_sys->i_input, p_sys->pp_input, i);<br></div><div>- i--;<br></div><div>- }<br></div><div>- }<br></div><div> vlc_restorecancel (canc);<br></div><div> }<br></div><div> vlc_cleanup_pop();<br></div><div>@@ -339,9 +292,6 @@ static void ParseUrls( services_discovery_t *p_sd, char *psz_urls )<br></div><div> <br></div><div> TAB_APPEND( i_new_items, pp_new_items, p_input );<br></div><div> services_discovery_AddItem( p_sd, p_input );<br></div><div>-<br></div><div>- TAB_APPEND( p_sys->i_input, p_sys->pp_input,<br></div><div>- InputCreateAndStart( p_sd, p_input ) );<br></div><div> }<br></div><div> else<br></div><div> {<br></div><div>@@ -417,8 +367,6 @@ static void ParseRequest( services_discovery_t *p_sd )<br></div><div> TAB_APPEND( p_sys->i_items, p_sys->pp_items, p_input );<br></div><div> services_discovery_AddItem( p_sd, p_input );<br></div><div> <br></div><div>- TAB_APPEND( p_sys->i_input, p_sys->pp_input,<br></div><div>- InputCreateAndStart( p_sd, p_input ) );<br></div><div> SaveUrls( p_sd );<br></div><div> }<br></div><div> }<hr>vlc-commits mailing list<br></div><div>vlc-commits@videolan.org<br></div><div><a href="https://mailman.videolan.org/listinfo/vlc-commits">https://mailman.videolan.org/listinfo/vlc-commits</a><br></div></pre></blockquote></div><div><br></div><div>-- <br></div><div>Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté. <br></div><div>_______________________________________________<br></div><div>vlc-devel mailing list<br></div><div>To unsubscribe or modify your subscription options:<br></div><div>https://mailman.videolan.org/listinfo/vlc-devel<br></div></blockquote><div><br></div></body></html>