mft: Link to mfplat when building with msvc

[vlc] / modules / video_filter / audiobargraph_v.c

diff --git a/modules/video_filter/audiobargraph_v.c b/modules/video_filter/audiobargraph_v.c
index 282cdd7d7548b853b46f3f7d79079823e448b27f..bde9b083dd4f392d57fb8b7e8b163a5c1e60c03f 100644 (file)
--- a/modules/video_filter/audiobargraph_v.c
+++ b/modules/video_filter/audiobargraph_v.c
@@ -162,7 +162,7 @@ static float iec_scale(float dB)
         return (dB + 70.0f) * 0.0025f;
     if (dB < -50.0f)
         return (dB + 60.0f) * 0.005f + 0.025f;
-    if (dB < -40.0)
+    if (dB < -40.0f)
         return (dB + 50.0f) * 0.0075f + 0.075f;
     if (dB < -30.0f)
         return (dB + 40.0f) * 0.015f + 0.15f;
@@ -236,12 +236,9 @@ static void DrawNumber(plane_t *p, int h, const uint8_t data[5], int l)
     }
 }
 /*****************************************************************************
- * LoadImage: creates and returns the bar graph image
+ * Draw: creates and returns the bar graph image
  *****************************************************************************/
-#ifdef LoadImage
-#   undef LoadImage
-#endif
-static void LoadImage(BarGraph_t *b)
+static void Draw(BarGraph_t *b)
 {
     int nbChannels = b->nbChannels;
     int scale      = b->scale;
@@ -327,15 +324,15 @@ static int BarGraphCallback(vlc_object_t *p_this, char const *psz_var,
     char* res = NULL;
 
     vlc_mutex_lock(&p_sys->lock);
-    if (!strcmp(psz_var, "audiobargraph_v-x"))
+    if (!strcmp(psz_var, CFG_PREFIX "x"))
         p_sys->i_pos_x = newval.i_int;
-    else if (!strcmp(psz_var, "audiobargraph_v-y"))
+    else if (!strcmp(psz_var, CFG_PREFIX "y"))
         p_sys->i_pos_y = newval.i_int;
-    else if (!strcmp(psz_var, "audiobargraph_v-position"))
+    else if (!strcmp(psz_var, CFG_PREFIX "position"))
         p_sys->i_pos = newval.i_int;
-    else if (!strcmp(psz_var, "audiobargraph_v-transparency"))
+    else if (!strcmp(psz_var, CFG_PREFIX "transparency"))
         p_BarGraph->i_alpha = VLC_CLIP(newval.i_int, 0, 255);
-    else if (!strcmp(psz_var, "audiobargraph_v-i_values")) {
+    else if (!strcmp(psz_var, CFG_PREFIX "i_values")) {
         char *psz = xstrdup(newval.psz_string ? newval.psz_string : "");
         // in case many answer are received at the same time, only keep one
         res = strchr(psz, '@');
@@ -343,13 +340,13 @@ static int BarGraphCallback(vlc_object_t *p_this, char const *psz_var,
             *res = '\0';
         parse_i_values(p_BarGraph, psz);
         free(psz);
-        LoadImage(p_BarGraph);
-    } else if (!strcmp(psz_var, "audiobargraph_v-alarm")) {
+        Draw(p_BarGraph);
+    } else if (!strcmp(psz_var, CFG_PREFIX "alarm")) {
         p_BarGraph->alarm = newval.b_bool;
-        LoadImage(p_BarGraph);
-    } else if (!strcmp(psz_var, "audiobargraph_v-barWidth")) {
+        Draw(p_BarGraph);
+    } else if (!strcmp(psz_var, CFG_PREFIX "barWidth")) {
         p_BarGraph->barWidth = newval.i_int;
-        LoadImage(p_BarGraph);
+        Draw(p_BarGraph);
     }
     p_sys->b_spu_update = true;
     vlc_mutex_unlock(&p_sys->lock);
@@ -403,7 +400,7 @@ static subpicture_t *FilterSub(filter_t *p_filter, mtime_t date)
     p_region = subpicture_region_New(&fmt);
     if (!p_region) {
         msg_Err(p_filter, "cannot allocate SPU region");
-        p_filter->pf_sub_buffer_del(p_filter, p_spu);
+        subpicture_Delete(p_spu);
         p_spu = NULL;
         goto exit;
     }
@@ -527,19 +524,18 @@ static int OpenCommon(vlc_object_t *p_this, bool b_sub)
                        p_filter->p_cfg);
 
     /* create and initialize variables */
-    p_sys->i_pos = var_CreateGetIntegerCommand(p_filter, "audiobargraph_v-position");
-    p_sys->i_pos_x = var_CreateGetIntegerCommand(p_filter, "audiobargraph_v-x");
-    p_sys->i_pos_y = var_CreateGetIntegerCommand(p_filter, "audiobargraph_v-y");
+    p_sys->i_pos = var_CreateGetInteger(p_filter, CFG_PREFIX "position");
+    p_sys->i_pos_x = var_CreateGetInteger(p_filter, CFG_PREFIX "x");
+    p_sys->i_pos_y = var_CreateGetInteger(p_filter, CFG_PREFIX "y");
     BarGraph_t *p_BarGraph = &p_sys->p_BarGraph;
     p_BarGraph->p_pic = NULL;
-    p_BarGraph->i_alpha = var_CreateGetIntegerCommand(p_filter,
-                                                        "audiobargraph_v-transparency");
+    p_BarGraph->i_alpha = var_CreateGetInteger(p_filter, CFG_PREFIX "transparency");
     p_BarGraph->i_alpha = VLC_CLIP(p_BarGraph->i_alpha, 0, 255);
     p_BarGraph->i_values = NULL;
     parse_i_values(p_BarGraph, &(char){ 0 });
     p_BarGraph->alarm = false;
 
-    p_BarGraph->barWidth = var_CreateGetIntegerCommand(p_filter, "audiobargraph_v-barWidth");
+    p_BarGraph->barWidth = var_CreateGetInteger(p_filter, CFG_PREFIX "barWidth");
     p_BarGraph->scale = 400;
 
     /* Ignore aligment if a position is given for video filter */
@@ -548,16 +544,16 @@ static int OpenCommon(vlc_object_t *p_this, bool b_sub)
 
     vlc_mutex_init(&p_sys->lock);
 
-    var_Create(p_filter->p_libvlc, "audiobargraph_v-alarm", VLC_VAR_BOOL);
-    var_Create(p_filter->p_libvlc, "audiobargraph_v-i_values", VLC_VAR_STRING);
+    var_Create(p_filter->p_libvlc, CFG_PREFIX "alarm", VLC_VAR_BOOL);
+    var_Create(p_filter->p_libvlc, CFG_PREFIX "i_values", VLC_VAR_STRING);
 
-    var_AddCallback(p_filter->p_libvlc, "audiobargraph_v-alarm",
+    var_AddCallback(p_filter->p_libvlc, CFG_PREFIX "alarm",
                     BarGraphCallback, p_sys);
-    var_AddCallback(p_filter->p_libvlc, "audiobargraph_v-i_values",
+    var_AddCallback(p_filter->p_libvlc, CFG_PREFIX "i_values",
                     BarGraphCallback, p_sys);
 
-    var_TriggerCallback(p_filter->p_libvlc, "audiobargraph_v-alarm");
-    var_TriggerCallback(p_filter->p_libvlc, "audiobargraph_v-i_values");
+    var_TriggerCallback(p_filter->p_libvlc, CFG_PREFIX "alarm");
+    var_TriggerCallback(p_filter->p_libvlc, CFG_PREFIX "i_values");
 
     for (int i = 0; ppsz_filter_callbacks[i]; i++)
         var_AddCallback(p_filter, ppsz_filter_callbacks[i],
@@ -599,12 +595,12 @@ static void Close(vlc_object_t *p_this)
         var_DelCallback(p_filter, ppsz_filter_callbacks[i],
                          BarGraphCallback, p_sys);
 
-    var_DelCallback(p_filter->p_libvlc, "audiobargraph_v-i_values",
+    var_DelCallback(p_filter->p_libvlc, CFG_PREFIX "i_values",
                     BarGraphCallback, p_sys);
-    var_DelCallback(p_filter->p_libvlc, "audiobargraph_v-alarm",
+    var_DelCallback(p_filter->p_libvlc, CFG_PREFIX "alarm",
                     BarGraphCallback, p_sys);
-    var_Destroy(p_filter->p_libvlc, "audiobargraph_v-i_values");
-    var_Destroy(p_filter->p_libvlc, "audiobargraph_v-alarm");
+    var_Destroy(p_filter->p_libvlc, CFG_PREFIX "i_values");
+    var_Destroy(p_filter->p_libvlc, CFG_PREFIX "alarm");
 
     if (p_sys->p_blend)
         filter_DeleteBlend(p_sys->p_blend);