[vlc-commits] lib/video: use a vlc_object_t to enable vout filters
Thomas Guillem
git at videolan.org
Tue Mar 14 14:42:35 CET 2017
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Mar 14 14:08:47 2017 +0100| [39ed50a2e12b77b2c977f8afe60213310709c5bb] | committer: Thomas Guillem
lib/video: use a vlc_object_t to enable vout filters
Ref #17761
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=39ed50a2e12b77b2c977f8afe60213310709c5bb
---
lib/video.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/video.c b/lib/video.c
index 3968e71..1b684c6 100644
--- a/lib/video.c
+++ b/lib/video.c
@@ -658,7 +658,7 @@ void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi,
/* module helpers */
/* ************** */
-static void vout_EnableFilter( vout_thread_t *p_vout, const char *psz_name,
+static void vout_EnableFilter( vlc_object_t *p_parent, const char *psz_name,
bool b_add )
{
char *psz_parser;
@@ -668,7 +668,7 @@ static void vout_EnableFilter( vout_thread_t *p_vout, const char *psz_name,
module_t *p_obj = module_find( psz_name );
if( !p_obj )
{
- msg_Err( p_vout, "Unable to find filter module \"%s\".", psz_name );
+ msg_Err( p_parent, "Unable to find filter module \"%s\".", psz_name );
return;
}
@@ -686,11 +686,11 @@ static void vout_EnableFilter( vout_thread_t *p_vout, const char *psz_name,
}
else
{
- msg_Err( p_vout, "Unknown video filter type." );
+ msg_Err( p_parent, "Unknown video filter type." );
return;
}
- psz_string = var_GetString( p_vout, psz_filter_type );
+ psz_string = var_GetString( p_parent, psz_filter_type );
/* Todo : Use some generic chain manipulation functions */
if( !psz_string ) psz_string = strdup("");
@@ -736,7 +736,7 @@ static void vout_EnableFilter( vout_thread_t *p_vout, const char *psz_name,
}
}
- var_SetString( p_vout, psz_filter_type, psz_string );
+ var_SetString( p_parent, psz_filter_type, psz_string );
free( psz_string );
}
@@ -780,7 +780,7 @@ set_int( libvlc_media_player_t *p_mi, const char *restrict name,
vout_thread_t *vout = GetVout( p_mi, 0 );
if (vout != NULL)
{ /* Fill sub-source */
- vout_EnableFilter( vout, opt->name, value );
+ vout_EnableFilter( VLC_OBJECT( vout ), opt->name, value );
var_TriggerCallback( vout, "sub-source" );
vlc_object_release( vout );
}
More information about the vlc-commits
mailing list