#include <vlc_common.h>
#include <vlc_aout.h>
+#include <vlc_modules.h>
#include "aout_internal.h"
#include "libvlc.h"
aout_owner_t *owner = aout_owner (aout);
+ vlc_mutex_init (&owner->lock);
owner->module = NULL;
owner->input = NULL;
vlc_mutex_init (&owner->volume.lock);
owner->volume.multiplier = 1.0;
owner->volume.mixer = NULL;
- vlc_mutex_init (&aout->lock);
-
+ 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
*****************************************************************************/
aout_owner_t *owner = aout_owner (aout);
vlc_mutex_destroy (&owner->volume.lock);
- vlc_mutex_destroy (&aout->lock);
+ vlc_mutex_destroy (&owner->lock);
}
#ifdef AOUT_DEBUG
{
case VLC_CODEC_U8:
case VLC_CODEC_S8:
+ case VLC_CODEC_ALAW:
+ case VLC_CODEC_MULAW:
return 8;
case VLC_CODEC_U16L:
return "ERROR";
}
-/*****************************************************************************
- * aout_FormatPrint : print a format in a human-readable form
- *****************************************************************************/
-void aout_FormatPrint( audio_output_t * p_aout, const char * psz_text,
- const audio_sample_format_t * p_format )
+#undef aout_FormatPrint
+/**
+ * Prints an audio sample format in a human-readable form.
+ */
+void aout_FormatPrint( vlc_object_t *obj, const char *psz_text,
+ const audio_sample_format_t *p_format )
{
- msg_Dbg( p_aout, "%s '%4.4s' %d Hz %s frame=%d samples/%d bytes", psz_text,
+ msg_Dbg( obj, "%s '%4.4s' %d Hz %s frame=%d samples/%d bytes", psz_text,
(char *)&p_format->i_format, p_format->i_rate,
aout_FormatPrintChannels( p_format ),
p_format->i_frame_length, p_format->i_bytes_per_frame );
}
-/*****************************************************************************
- * aout_FormatsPrint : print two formats in a human-readable form
- *****************************************************************************/
-void aout_FormatsPrint( audio_output_t * p_aout, const char * psz_text,
+#undef aout_FormatsPrint
+/**
+ * Prints two formats in a human-readable form
+ */
+void aout_FormatsPrint( vlc_object_t *obj, const char * psz_text,
const audio_sample_format_t * p_format1,
const audio_sample_format_t * p_format2 )
{
- msg_Dbg( p_aout, "%s '%4.4s'->'%4.4s' %d Hz->%d Hz %s->%s",
+ msg_Dbg( obj, "%s '%4.4s'->'%4.4s' %d Hz->%d Hz %s->%s",
psz_text,
(char *)&p_format1->i_format, (char *)&p_format2->i_format,
p_format1->i_rate, p_format2->i_rate,
/* 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 )
{