[vlc-devel] commit: Use var_TriggerCallback as appropriate ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Mon Jan  5 19:36:26 2009 +0200| [b481254cc8ecc3464270101a2a16fb7e4f37fe3f] | committer: Rémi Denis-Courmont 

Use var_TriggerCallback as appropriate

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b481254cc8ecc3464270101a2a16fb7e4f37fe3f
---

 modules/audio_output/auhal.c            |    2 +-
 modules/video_filter/opencv_example.cpp |    2 +-
 src/libvlc.c                            |    2 +-
 src/video_output/vout_intf.c            |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index 0e29526..22f671d 100644
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -1411,7 +1411,7 @@ static OSStatus HardwareListener( AudioHardwarePropertyID inPropertyID,
         {
             /* something changed in the list of devices */
             /* 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" );
         }
         break;
diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
index 457fad6..aa6ed84 100644
--- a/modules/video_filter/opencv_example.cpp
+++ b/modules/video_filter/opencv_example.cpp
@@ -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
-            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
         msg_Err( p_filter, "No cascade - is opencv-haarcascade-file valid?" );
diff --git a/src/libvlc.c b/src/libvlc.c
index f8b31a9..b9af56d 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -736,7 +736,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
         var_Set( p_libvlc, "verbose", val );
     }
     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 )
         priv->b_color = config_GetInt( p_libvlc, "color" ) > 0;
diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 04256de..78e5649 100644
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -330,7 +330,7 @@ void vout_IntfInit( vout_thread_t *p_vout )
     var_AddCallback( p_vout, "crop", CropCallback, NULL );
     var_Get( p_vout, "crop", &old_val );
     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 );
 
     /* Monitor pixel aspect-ratio */
@@ -391,7 +391,7 @@ void vout_IntfInit( vout_thread_t *p_vout )
     var_AddCallback( p_vout, "aspect-ratio", AspectCallback, NULL );
     var_Get( p_vout, "aspect-ratio", &old_val );
     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 );
 
     /* Initialize the dimensions of the video window */