[vlc-commits] input: remove log parameter to input_Create()
Rémi Denis-Courmont
git at videolan.org
Wed Feb 20 16:36:16 CET 2019
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Feb 19 22:13:07 2019 +0200| [3b265720478c5359e28cb6921f641101487396b3] | committer: Rémi Denis-Courmont
input: remove log parameter to input_Create()
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3b265720478c5359e28cb6921f641101487396b3
---
include/vlc_input.h | 4 ++--
lib/media_player.c | 2 +-
modules/misc/fingerprinter.c | 2 +-
modules/services_discovery/podcast.c | 2 +-
src/input/input.c | 5 ++---
src/input/player.c | 2 +-
src/input/vlm.c | 4 ++--
src/playlist_legacy/thread.c | 2 +-
8 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/include/vlc_input.h b/include/vlc_input.h
index 9aa0bb4f0f..289b1e7b55 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -597,9 +597,9 @@ enum input_query_e
*****************************************************************************/
VLC_API input_thread_t * input_Create( vlc_object_t *p_parent,
input_thread_events_cb event_cb, void *events_data,
- input_item_t *, const char *psz_log, input_resource_t *,
+ input_item_t *, input_resource_t *,
vlc_renderer_item_t* p_renderer ) VLC_USED;
-#define input_Create(a,b,c,d,e,f,g) input_Create(VLC_OBJECT(a),b,c,d,e,f,g)
+#define input_Create(a,b,c,d,e,f) input_Create(VLC_OBJECT(a),b,c,d,e,f)
/**
diff --git a/lib/media_player.c b/lib/media_player.c
index 8bc7a9636f..c6658270ae 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -1011,7 +1011,7 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
media_attach_preparsed_event( p_mi->p_md );
p_input_thread = input_Create( p_mi, on_input_event, p_mi,
- p_mi->p_md->p_input_item, NULL,
+ p_mi->p_md->p_input_item,
p_mi->input.p_resource,
p_mi->input.p_renderer );
unlock(p_mi);
diff --git a/modules/misc/fingerprinter.c b/modules/misc/fingerprinter.c
index 5dd1e979d0..1ba89f31b3 100644
--- a/modules/misc/fingerprinter.c
+++ b/modules/misc/fingerprinter.c
@@ -183,7 +183,7 @@ static void DoFingerprint( fingerprinter_thread_t *p_fingerprinter,
input_thread_t *p_input = input_Create( p_fingerprinter, InputEvent,
p_fingerprinter->p_sys,
- p_item, "fingerprinter", NULL, NULL );
+ p_item, NULL, NULL );
input_item_Release( p_item );
if( p_input == NULL )
diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c
index b9a31a1e18..ad17ac125b 100644
--- a/modules/services_discovery/podcast.c
+++ b/modules/services_discovery/podcast.c
@@ -212,7 +212,7 @@ static void Close( vlc_object_t *p_this )
static input_thread_t *InputCreateAndStart( services_discovery_t *sd,
input_item_t *item )
{
- input_thread_t *input = input_Create( sd, input_LegacyEvents, NULL, item, NULL, NULL, NULL );
+ input_thread_t *input = input_Create( sd, input_LegacyEvents, NULL, item, NULL, NULL );
if( input != NULL && input_Start( input ) )
{
input_LegacyVarInit( input );
diff --git a/src/input/input.c b/src/input/input.c
index 3b8f1e3ca0..d97ecf176d 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -119,17 +119,16 @@ static void input_ChangeState( input_thread_t *p_input, int i_state ); /* TODO f
*
* \param p_parent a vlc_object
* \param p_item an input item
- * \param psz_log an optional prefix for this input logs
* \param p_resource an optional input ressource
* \return a pointer to the spawned input thread
*/
input_thread_t *input_Create( vlc_object_t *p_parent,
input_thread_events_cb events_cb, void *events_data,
input_item_t *p_item,
- const char *psz_log, input_resource_t *p_resource,
+ input_resource_t *p_resource,
vlc_renderer_item_t *p_renderer )
{
- return Create( p_parent, events_cb, events_data, p_item, psz_log, false,
+ return Create( p_parent, events_cb, events_data, p_item, NULL, false,
false, p_resource, p_renderer );
}
diff --git a/src/input/player.c b/src/input/player.c
index a309a6ab5f..6a9ec6bd22 100644
--- a/src/input/player.c
+++ b/src/input/player.c
@@ -671,7 +671,7 @@ vlc_player_input_New(vlc_player_t *player, input_item_t *item)
input->abloop_state[0].set = input->abloop_state[1].set = false;
input->thread = input_Create(player, input_thread_Events, input, item,
- NULL, player->resource, player->renderer);
+ player->resource, player->renderer);
if (!input->thread)
{
free(input);
diff --git a/src/input/vlm.c b/src/input/vlm.c
index 0ca6829345..934215851a 100644
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -618,7 +618,7 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media )
TAB_INIT(data.i_es, data.es);
p_input = input_Create( p_media, input_LegacyEvents, NULL,
- p_media->vod.p_item, NULL, NULL, NULL );
+ p_media->vod.p_item, NULL, NULL );
if( p_input )
{
vlc_sem_t sem_preparse;
@@ -999,7 +999,7 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
p_instance->p_input = input_Create( p_instance->p_parent,
input_LegacyEvents, NULL,
- p_instance->p_item, NULL,
+ p_instance->p_item,
p_instance->p_input_resource, NULL );
if( p_instance->p_input )
{
diff --git a/src/playlist_legacy/thread.c b/src/playlist_legacy/thread.c
index 6c8ba11bf0..ceb87c0015 100644
--- a/src/playlist_legacy/thread.c
+++ b/src/playlist_legacy/thread.c
@@ -229,7 +229,7 @@ static bool PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
input_thread_t *p_input_thread = input_Create( p_playlist,
on_input_event, p_playlist,
- p_input, NULL,
+ p_input,
p_sys->p_input_resource,
p_renderer );
if( p_renderer )
More information about the vlc-commits
mailing list