Fixed a (probable) typo in aout_ChangeFilterString().

[vlc] / src / audio_output / common.c

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index 0c9cda76bc3128136a2c858450ae66c5bf2f82fb..52b240f923fe568a894b4e60a9967381bdc57ea0 100644 (file)
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -79,7 +79,8 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent )
     aout_instance_t * p_aout;
 
     /* Allocate descriptor. */
-    p_aout = vlc_object_create( p_parent, VLC_OBJECT_AOUT );
+    p_aout = vlc_custom_create( p_parent, sizeof( *p_aout ), VLC_OBJECT_AOUT,
+                                "audio output" );
     if( p_aout == NULL )
     {
         return NULL;
@@ -88,6 +89,7 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent )
     /* Initialize members. */
     vlc_mutex_init( &p_aout->input_fifos_lock );
     vlc_mutex_init( &p_aout->mixer_lock );
+    vlc_mutex_init( &p_aout->volume_vars_lock );
     vlc_mutex_init( &p_aout->output_fifo_lock );
     p_aout->i_nb_inputs = 0;
     p_aout->mixer_multiplier = 1.0;
@@ -100,6 +102,8 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent )
 
     vlc_object_set_destructor( p_aout, aout_Destructor );
 
+    vlc_object_attach( p_aout, p_parent );
+
     return p_aout;
 }
 
@@ -111,16 +115,18 @@ static void aout_Destructor( vlc_object_t * p_this )
     aout_instance_t * p_aout = (aout_instance_t *)p_this;
     vlc_mutex_destroy( &p_aout->input_fifos_lock );
     vlc_mutex_destroy( &p_aout->mixer_lock );
+    vlc_mutex_destroy( &p_aout->volume_vars_lock );
     vlc_mutex_destroy( &p_aout->output_fifo_lock );
 }
 
 /* Lock ordering rules:
  *
- *            Mixer Input IFIFO OFIFO (< Inner lock)
- * Mixer       No!   N/A   Yes   Yes
- * Input       N/A   No!   Yes   N/A
- * In FIFOs    No!   No!   No!   No!
- * Out FIFOs   No!   N/A   Yes   No!
+ *            Vars Mixer Input IFIFO OFIFO (< Inner lock)
+ * Vars        No!   Yes   Yes   Yes   Yes
+ * Mixer       No!   No!   Yes   Yes   Yes
+ * Input       No!   No!   No!   Yes   Yes
+ * In FIFOs    No!   No!   No!   No!   Yes
+ * Out FIFOs   No!   No!   No!   No!   No!
  * (^ Outer lock)
  */
 #ifdef AOUT_DEBUG
@@ -132,18 +138,23 @@ void aout_lock (unsigned i)
     unsigned allowed;
     switch (i)
     {
-        case MIXER_LOCK:
+        case VOLUME_VARS_LOCK:
             allowed = 0;
             break;
-        case INPUT_LOCK:
-            allowed = 0;
+        case MIXER_LOCK:
+            allowed = VOLUME_VARS_LOCK;
             break;
-        case OUTPUT_FIFO_LOCK:
-            allowed = MIXER_LOCK;
+        case INPUT_LOCK:
+            allowed = VOLUME_VARS_LOCK|MIXER_LOCK;
             break;
         case INPUT_FIFO_LOCK:
-            allowed = MIXER_LOCK|INPUT_LOCK|OUTPUT_FIFO_LOCK;
+            allowed = VOLUME_VARS_LOCK|MIXER_LOCK|INPUT_LOCK;
             break;
+        case OUTPUT_FIFO_LOCK:
+            allowed = VOLUME_VARS_LOCK|MIXER_LOCK|INPUT_LOCK|INPUT_FIFO_LOCK;
+            break;
+        default:
+            abort ();
     }
 
     if (aout_locks & ~allowed)
@@ -151,7 +162,7 @@ void aout_lock (unsigned i)
         fprintf (stderr, "Illegal audio lock transition (%x -> %x)\n",
                  aout_locks, aout_locks|i);
         vlc_backtrace ();
-        //abort ();
+        abort ();
     }
     aout_locks |= i;
 }
@@ -191,7 +202,7 @@ unsigned int aout_FormatNbChannels( const audio_sample_format_t * p_format )
  *****************************************************************************/
 unsigned int aout_BitsPerSample( vlc_fourcc_t i_format )
 {
-    switch( i_format )
+    switch( vlc_fourcc_GetCodec( AUDIO_ES, i_format ) )
     {
     case VLC_CODEC_U8:
     case VLC_CODEC_S8:
@@ -211,11 +222,13 @@ unsigned int aout_BitsPerSample( vlc_fourcc_t i_format )
 
     case VLC_CODEC_S32L:
     case VLC_CODEC_S32B:
-    case VLC_CODEC_FL32:
+    case VLC_CODEC_F32L:
+    case VLC_CODEC_F32B:
     case VLC_CODEC_FI32:
         return 32;
 
-    case VLC_CODEC_FL64:
+    case VLC_CODEC_F64L:
+    case VLC_CODEC_F64B:
         return 64;
 
     default:
@@ -230,6 +243,7 @@ unsigned int aout_BitsPerSample( vlc_fourcc_t i_format )
  *****************************************************************************/
 void aout_FormatPrepare( audio_sample_format_t * p_format )
 {
+    p_format->i_channels = aout_FormatNbChannels( p_format );
     p_format->i_bitspersample = aout_BitsPerSample( p_format->i_format );
     if( p_format->i_bitspersample > 0 )
     {
@@ -760,3 +774,69 @@ aout_buffer_t *aout_BufferAlloc(aout_alloc_t *allocation, mtime_t microseconds,
 
     return block_Alloc( i_alloc_size );
 }
+
+
+/* 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, aout_instance_t *p_aout,
+                              const char *psz_variable,
+                              const char *psz_name, bool b_add )
+{
+    char *psz_val;
+    char *psz_parser;
+
+    if( *psz_name == '\0' )
+        return false;
+
+    if( p_aout )
+        psz_val = var_GetString( p_aout, psz_variable );
+    else
+    {
+        psz_val = var_CreateGetString( p_obj->p_libvlc, psz_variable );
+        var_Destroy( p_obj->p_libvlc, psz_variable );
+    }
+
+    if( !psz_val )
+        psz_val = strdup( "" );
+
+    psz_parser = strstr( psz_val, psz_name );
+
+    if( ( b_add && psz_parser ) || ( !b_add && !psz_parser ) )
+    {
+        /* Nothing to do */
+        free( psz_val );
+        return false;
+    }
+
+    if( b_add )
+    {
+        char *psz_old = psz_val;
+        if( *psz_old )
+        {
+            if( asprintf( &psz_val, "%s:%s", psz_old, psz_name ) == -1 )
+                psz_val = NULL;
+        }
+        else
+            psz_val = strdup( psz_name );
+        free( psz_old );
+    }
+    else
+    {
+        const int i_name = strlen( psz_name );
+        const char *psz_next;
+
+        psz_next = &psz_parser[i_name];
+        if( *psz_next == ':' )
+            psz_next++;
+
+        memmove( psz_parser, psz_next, strlen(psz_next)+1 );
+    }
+
+    if( p_aout )
+        var_SetString( p_aout, psz_variable, psz_val );
+    else
+        config_PutPsz( p_obj, psz_variable, psz_val );
+    free( psz_val );
+    return true;
+}