Drain audio output before we claim the buffers are empty

[vlc] / src / audio_output / common.c

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index 2ca195f1d387cb668fc09c010da5bacb6a4a9d47..6dd6e9ed51d23572e9ba1db0ee3e5e4b6062903a 100644 (file)
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -33,6 +33,7 @@
 
 #include <vlc_common.h>
 #include <vlc_aout.h>
+#include <vlc_modules.h>
 #include "aout_internal.h"
 #include "libvlc.h"
 
@@ -64,13 +65,119 @@ audio_output_t *aout_New( vlc_object_t * p_parent )
     owner->volume.multiplier = 1.0;
     owner->volume.mixer = NULL;
 
+    aout->pf_play = aout_DecDeleteBuffer;
     aout_VolumeNoneInit (aout);
     vlc_object_set_destructor (aout, aout_Destructor);
+
+    /*
+     * Persistent audio output variables
+     */
+    vlc_value_t val, text;
+    char *str;
+
     var_Create (aout, "intf-change", VLC_VAR_VOID);
 
+    /* Visualizations */
+    var_Create (aout, "visual", VLC_VAR_STRING | VLC_VAR_HASCHOICE);
+    text.psz_string = _("Visualizations");
+    var_Change (aout, "visual", VLC_VAR_SETTEXT, &text, NULL);
+    val.psz_string = (char *)"";
+    text.psz_string = _("Disable");
+    var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text);
+    val.psz_string = (char *)"spectrometer";
+    text.psz_string = _("Spectrometer");
+    var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text);
+    val.psz_string = (char *)"scope";
+    text.psz_string = _("Scope");
+    var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text);
+    val.psz_string = (char *)"spectrum";
+    text.psz_string = _("Spectrum");
+    var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text);
+    val.psz_string = (char *)"vuMeter";
+    text.psz_string = _("Vu meter");
+    var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text);
+    /* Look for goom plugin */
+    if (module_exists ("goom"))
+    {
+        val.psz_string = (char *)"goom";
+        text.psz_string = (char *)"Goom";
+        var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text);
+    }
+    /* Look for libprojectM plugin */
+    if (module_exists ("projectm"))
+    {
+        val.psz_string = (char *)"projectm";
+        text.psz_string = (char*)"projectM";
+        var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text);
+    }
+    str = var_GetNonEmptyString (aout, "effect-list");
+    if (str != NULL)
+    {
+        var_SetString (aout, "visual", str);
+        free (str);
+    }
+
+    /* Equalizer */
+    var_Create (aout, "equalizer", VLC_VAR_STRING | VLC_VAR_HASCHOICE);
+    text.psz_string = _("Equalizer");
+    var_Change (aout, "equalizer", VLC_VAR_SETTEXT, &text, NULL);
+    val.psz_string = (char*)"";
+    text.psz_string = _("Disable");
+    var_Change (aout, "equalizer", VLC_VAR_ADDCHOICE, &val, &text);
+    {
+        module_config_t *cfg = config_FindConfig (VLC_OBJECT(aout),
+                                                  "equalizer-preset");
+        if (cfg != NULL)
+            for (int i = 0; i < cfg->i_list; i++)
+            {
+                val.psz_string = (char *)cfg->ppsz_list[i];
+                text.psz_string = (char *)cfg->ppsz_list_text[i];
+                var_Change (aout, "equalizer", VLC_VAR_ADDCHOICE, &val, &text);
+            }
+    }
+
+
+    var_Create (aout, "audio-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
+    text.psz_string = _("Audio filters");
+    var_Change (aout, "audio-filter", VLC_VAR_SETTEXT, &text, NULL);
+
+
+    var_Create (aout, "audio-visual", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
+    text.psz_string = _("Audio visualizations");
+    var_Change (aout, "audio-visual", VLC_VAR_SETTEXT, &text, NULL);
+
+
+    /* Replay gain */
+    var_Create (aout, "audio-replay-gain-mode",
+                VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+    text.psz_string = _("Replay gain");
+    var_Change (aout, "audio-replay-gain-mode", VLC_VAR_SETTEXT, &text, NULL);
+    {
+        module_config_t *cfg = config_FindConfig (VLC_OBJECT(aout),
+                                                  "audio-replay-gain-mode");
+        if( cfg != NULL )
+            for (int i = 0; i < cfg->i_list; i++)
+            {
+                val.psz_string = (char *)cfg->ppsz_list[i];
+                text.psz_string = (char *)cfg->ppsz_list_text[i];
+                var_Change (aout, "audio-replay-gain-mode", VLC_VAR_ADDCHOICE,
+                            &val, &text);
+            }
+    }
+
+
     return aout;
 }
 
+void aout_Destroy (audio_output_t *aout)
+{
+    aout_owner_t *owner = aout_owner (aout);
+
+    if (owner->module != NULL)
+        aout_Shutdown (aout);
+    vlc_object_release (aout);
+}
+
 /*****************************************************************************
  * aout_Destructor: destroy aout structure
  *****************************************************************************/
@@ -132,6 +239,8 @@ unsigned int aout_BitsPerSample( vlc_fourcc_t i_format )
     {
     case VLC_CODEC_U8:
     case VLC_CODEC_S8:
+    case VLC_CODEC_ALAW:
+    case VLC_CODEC_MULAW:
         return 8;
 
     case VLC_CODEC_U16L:
@@ -664,7 +773,7 @@ static int FilterOrder( const char *psz_name )
 /* This function will add or remove a a module from a string list (colon
  * separated). It will return true if there is a modification
  * In case p_aout is NULL, we will use configuration instead of variable */
-bool aout_ChangeFilterString( vlc_object_t *p_obj, audio_output_t *p_aout,
+bool aout_ChangeFilterString( vlc_object_t *p_obj, vlc_object_t *p_aout,
                               const char *psz_variable,
                               const char *psz_name, bool b_add )
 {