Commit b481254c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Use var_TriggerCallback as appropriate

parent 5df06313
...@@ -1411,7 +1411,7 @@ static OSStatus HardwareListener( AudioHardwarePropertyID inPropertyID, ...@@ -1411,7 +1411,7 @@ static OSStatus HardwareListener( AudioHardwarePropertyID inPropertyID,
{ {
/* something changed in the list of devices */ /* something changed in the list of devices */
/* We trigger the audio-device's aout_ChannelsRestart callback */ /* We trigger the audio-device's aout_ChannelsRestart callback */
var_Change( p_aout, "audio-device", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL ); var_TriggerCallback( p_aout, "audio-device" );
var_Destroy( p_aout, "audio-device" ); var_Destroy( p_aout, "audio-device" );
} }
break; break;
......
...@@ -228,7 +228,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) ...@@ -228,7 +228,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
} }
if (faces && (faces->total > 0)) //raise the video filter event if (faces && (faces->total > 0)) //raise the video filter event
var_Change( p_filter->p_libvlc, VIDEO_FILTER_EVENT_VARIABLE, VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL ); var_TriggerCallback( p_filter->p_libvlc, VIDEO_FILTER_EVENT_VARIABLE );
} }
else else
msg_Err( p_filter, "No cascade - is opencv-haarcascade-file valid?" ); msg_Err( p_filter, "No cascade - is opencv-haarcascade-file valid?" );
......
...@@ -736,7 +736,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -736,7 +736,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
var_Set( p_libvlc, "verbose", val ); var_Set( p_libvlc, "verbose", val );
} }
var_AddCallback( p_libvlc, "verbose", VerboseCallback, NULL ); var_AddCallback( p_libvlc, "verbose", VerboseCallback, NULL );
var_Change( p_libvlc, "verbose", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL ); var_TriggerCallback( p_libvlc, "verbose" );
if( priv->b_color ) if( priv->b_color )
priv->b_color = config_GetInt( p_libvlc, "color" ) > 0; priv->b_color = config_GetInt( p_libvlc, "color" ) > 0;
......
...@@ -330,7 +330,7 @@ void vout_IntfInit( vout_thread_t *p_vout ) ...@@ -330,7 +330,7 @@ void vout_IntfInit( vout_thread_t *p_vout )
var_AddCallback( p_vout, "crop", CropCallback, NULL ); var_AddCallback( p_vout, "crop", CropCallback, NULL );
var_Get( p_vout, "crop", &old_val ); var_Get( p_vout, "crop", &old_val );
if( old_val.psz_string && *old_val.psz_string ) if( old_val.psz_string && *old_val.psz_string )
var_Change( p_vout, "crop", VLC_VAR_TRIGGER_CALLBACKS, 0, 0 ); var_TriggerCallback( p_vout, "crop" );
free( old_val.psz_string ); free( old_val.psz_string );
/* Monitor pixel aspect-ratio */ /* Monitor pixel aspect-ratio */
...@@ -391,7 +391,7 @@ void vout_IntfInit( vout_thread_t *p_vout ) ...@@ -391,7 +391,7 @@ void vout_IntfInit( vout_thread_t *p_vout )
var_AddCallback( p_vout, "aspect-ratio", AspectCallback, NULL ); var_AddCallback( p_vout, "aspect-ratio", AspectCallback, NULL );
var_Get( p_vout, "aspect-ratio", &old_val ); var_Get( p_vout, "aspect-ratio", &old_val );
if( (old_val.psz_string && *old_val.psz_string) || b_force_par ) if( (old_val.psz_string && *old_val.psz_string) || b_force_par )
var_Change( p_vout, "aspect-ratio", VLC_VAR_TRIGGER_CALLBACKS, 0, 0 ); var_TriggerCallback( p_vout, "aspect-ratio" );
free( old_val.psz_string ); free( old_val.psz_string );
/* Initialize the dimensions of the video window */ /* Initialize the dimensions of the video window */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment