vlc_threads_funcs.h and vlc_module_macros.h have been deleted

[vlc] / modules / video_filter / adjust.c

diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c
index d068fcd7ea211e93376e0ef5b97d9a9433872043..318e0a6807ec4a172815c84104919a30397573c9 100644 (file)
--- a/modules/video_filter/adjust.c
+++ b/modules/video_filter/adjust.c
@@ -28,7 +28,12 @@
 #include <errno.h>
 #include <math.h>
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>
 
@@ -80,24 +85,18 @@ vlc_module_begin();
     set_capability( "video filter2", 0 );
 
     add_float_with_range( "contrast", 1.0, 0.0, 2.0, NULL,
-                          CONT_TEXT, CONT_LONGTEXT, VLC_FALSE );
-        change_safe();
+                          CONT_TEXT, CONT_LONGTEXT, false );
     add_float_with_range( "brightness", 1.0, 0.0, 2.0, NULL,
-                           LUM_TEXT, LUM_LONGTEXT, VLC_FALSE );
-        change_safe();
+                           LUM_TEXT, LUM_LONGTEXT, false );
     add_integer_with_range( "hue", 0, 0, 360, NULL,
-                            HUE_TEXT, HUE_LONGTEXT, VLC_FALSE );
-        change_safe();
+                            HUE_TEXT, HUE_LONGTEXT, false );
     add_float_with_range( "saturation", 1.0, 0.0, 3.0, NULL,
-                          SAT_TEXT, SAT_LONGTEXT, VLC_FALSE );
-        change_safe();
+                          SAT_TEXT, SAT_LONGTEXT, false );
     add_float_with_range( "gamma", 1.0, 0.01, 10.0, NULL,
-                          GAMMA_TEXT, GAMMA_LONGTEXT, VLC_FALSE );
-        change_safe();
+                          GAMMA_TEXT, GAMMA_LONGTEXT, false );
 
     add_bool( "brightness-threshold", 0, NULL,
-              THRES_TEXT, THRES_LONGTEXT, VLC_FALSE );
-        change_safe();
+              THRES_TEXT, THRES_LONGTEXT, false );
 
     add_shortcut( "adjust" );
     set_callbacks( Create, Destroy );
@@ -118,7 +117,7 @@ struct filter_sys_t
     int        i_hue;
     double     f_saturation;
     double     f_gamma;
-    vlc_bool_t b_brightness_threshold;
+    bool b_brightness_threshold;
 };
 
 /*****************************************************************************
@@ -207,7 +206,7 @@ static picture_t *FilterPlanar( filter_t *p_filter, picture_t *p_pic )
     uint8_t *p_in, *p_in_v, *p_in_end, *p_line_end;
     uint8_t *p_out, *p_out_v;
 
-    vlc_bool_t b_thres;
+    bool b_thres;
     double  f_hue;
     double  f_gamma;
     int32_t i_cont, i_lum;
@@ -238,7 +237,7 @@ static picture_t *FilterPlanar( filter_t *p_filter, picture_t *p_pic )
     /*
      * Threshold mode drops out everything about luma, contrast and gamma.
      */
-    if( b_thres != VLC_TRUE )
+    if( b_thres != true )
     {
 
         /* Contrast is a fast but kludged function, so I put this gap to be
@@ -438,7 +437,7 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic )
 
     int i_lines, i_visible_lines, i_pitch, i_visible_pitch;
 
-    vlc_bool_t b_thres;
+    bool b_thres;
     double  f_hue;
     double  f_gamma;
     int32_t i_cont, i_lum;
@@ -484,7 +483,7 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic )
     /*
      * Threshold mode drops out everything about luma, contrast and gamma.
      */
-    if( b_thres != VLC_TRUE )
+    if( b_thres != true )
     {
 
         /* Contrast is a fast but kludged function, so I put this gap to be
@@ -669,6 +668,7 @@ static int AdjustCallback( vlc_object_t *p_this, char const *psz_var,
                            vlc_value_t oldval, vlc_value_t newval,
                            void *p_data )
 {
+    VLC_UNUSED(p_this); VLC_UNUSED(oldval);
     filter_sys_t *p_sys = (filter_sys_t *)p_data;
 
     if( !strcmp( psz_var, "contrast" ) )