compat: fix use of <ctype.h> functions

[vlc] / modules / audio_mixer / fixed32.c

diff --git a/modules/audio_mixer/fixed32.c b/modules/audio_mixer/fixed32.c
index a2edebad627b604ad5c0b51bfb8263d97724bc95..3827d2791300b6fa445f9e375b80e8ba2df1966d 100644 (file)
--- a/modules/audio_mixer/fixed32.c
+++ b/modules/audio_mixer/fixed32.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * fixed32.c : fixed-point software volume
  *****************************************************************************
- * Copyright (C) 2011 Rémi Denis-Courmnot
+ * Copyright (C) 2011 Rémi Denis-Courmont
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -37,14 +37,14 @@ vlc_module_begin ()
     set_callbacks (Activate, NULL)
 vlc_module_end ()
 
-static void FilterFI32 (aout_mixer_t *, block_t *, float);
-static void FilterS16N (aout_mixer_t *, block_t *, float);
+static void FilterFI32 (audio_mixer_t *, block_t *, float);
+static void FilterS16N (audio_mixer_t *, block_t *, float);
 
 static int Activate (vlc_object_t *obj)
 {
-    aout_mixer_t *mixer = (aout_mixer_t *)obj;
+    audio_mixer_t *mixer = (audio_mixer_t *)obj;
 
-    switch (mixer->fmt.i_format)
+    switch (mixer->format)
     {
         case VLC_CODEC_FI32:
             mixer->mix = FilterFI32;
@@ -58,9 +58,9 @@ static int Activate (vlc_object_t *obj)
     return 0;
 }
 
-static void FilterFI32 (aout_mixer_t *mixer, block_t *block, float volume)
+static void FilterFI32 (audio_mixer_t *mixer, block_t *block, float volume)
 {
-    const int64_t mult = volume * mixer->input->multiplier * FIXED32_ONE;
+    const int64_t mult = volume * FIXED32_ONE;
 
     if (mult == FIXED32_ONE)
         return;
@@ -69,14 +69,16 @@ static void FilterFI32 (aout_mixer_t *mixer, block_t *block, float volume)
 
     for (size_t n = block->i_buffer / sizeof (*p); n > 0; n--)
     {
-        *p = (*p * mult) >> 33; // FIXED32_FRACBITS;
+        *p = (*p * mult) >> FIXED32_FRACBITS;
         p++;
     }
+
+    (void) mixer;
 }
 
-static void FilterS16N (aout_mixer_t *mixer, block_t *block, float volume)
+static void FilterS16N (audio_mixer_t *mixer, block_t *block, float volume)
 {
-    const int32_t mult = volume * mixer->input->multiplier * 0x10000;
+    const int32_t mult = volume * 0x10000;
 
     if (mult == 0x10000)
         return;
@@ -88,4 +90,6 @@ static void FilterS16N (aout_mixer_t *mixer, block_t *block, float volume)
         *p = (*p * mult) >> 16;
         p++;
     }
+
+    (void) mixer;
 }