For consistency, remove references to vlc from libvlc

[vlc] / src / audio_output / intf.c

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 8b11f496490316a5ee6626af264e3fb503e4f9ab..55fcec8711beb9d606e221a6931dd0adc13fa74e 100644 (file)
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -61,20 +61,27 @@
  *****************************************************************************/
 int __aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume )
 {
-    int i_volume, i_result = 0;
+    int i_result = 0;
     aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
                                                 FIND_ANYWHERE );
 
-    i_volume = config_GetInt( p_object, "volume" );
-    if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i_volume;
+    if ( pi_volume == NULL ) return -1;
 
-    if ( p_aout == NULL ) return 0;
+    if ( p_aout == NULL )
+    {
+        *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" );
+        return 0;
+    }
 
     vlc_mutex_lock( &p_aout->mixer_lock );
     if ( !p_aout->mixer.b_error )
     {
         i_result = p_aout->output.pf_volume_get( p_aout, pi_volume );
     }
+    else
+    {
+        *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" );
+    }
     vlc_mutex_unlock( &p_aout->mixer_lock );
 
     vlc_object_release( p_aout );
@@ -92,6 +99,9 @@ int __aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume )
 
     config_PutInt( p_object, "volume", i_volume );
 
+    val.b_bool = VLC_TRUE;
+    var_Set( p_object->p_libvlc, "volume-change", val );
+
     if ( p_aout == NULL ) return 0;
 
     vlc_mutex_lock( &p_aout->mixer_lock );
@@ -101,11 +111,7 @@ int __aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume )
     }
     vlc_mutex_unlock( &p_aout->mixer_lock );
 
-    vlc_object_release( p_aout );
-
-    val.b_bool = VLC_TRUE;
     var_Set( p_aout, "intf-change", val );
-    var_Set( p_aout->p_vlc, "volume-change", val );
     vlc_object_release( p_aout );
     return i_result;
 }
@@ -150,7 +156,7 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
                                                 FIND_ANYWHERE );
     int i_result = 0, i_volume = 0, i_volume_step = 0;
 
-    i_volume_step = config_GetInt( p_object->p_vlc, "volume-step" );
+    i_volume_step = config_GetInt( p_object->p_libvlc, "volume-step" );
     i_volume = config_GetInt( p_object, "volume" );
     i_volume += i_volume_step * i_nb_steps;
     if ( i_volume > AOUT_VOLUME_MAX )
@@ -158,8 +164,9 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
         i_volume = AOUT_VOLUME_MAX;
     }
     config_PutInt( p_object, "volume", i_volume );
-    var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
-    var_SetInteger( p_object->p_libvlc, "saved-volume" , (audio_volume_t) i_volume );
+    var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
+    var_SetInteger( p_object->p_libvlc_global, "saved-volume" ,
+                    (audio_volume_t) i_volume );
     if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
 
     if ( p_aout == NULL ) return 0;
@@ -167,7 +174,8 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
     vlc_mutex_lock( &p_aout->mixer_lock );
     if ( !p_aout->mixer.b_error )
     {
-        i_result = p_aout->output.pf_volume_set( p_aout, (audio_volume_t) i_volume );
+        i_result = p_aout->output.pf_volume_set( p_aout,
+                                                (audio_volume_t) i_volume );
     }
     vlc_mutex_unlock( &p_aout->mixer_lock );
 
@@ -188,7 +196,7 @@ int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps,
                                                 FIND_ANYWHERE );
     int i_result = 0, i_volume = 0, i_volume_step = 0;
 
-    i_volume_step = config_GetInt( p_object->p_vlc, "volume-step" );
+    i_volume_step = config_GetInt( p_object->p_libvlc, "volume-step" );
     i_volume = config_GetInt( p_object, "volume" );
     i_volume -= i_volume_step * i_nb_steps;
     if ( i_volume < AOUT_VOLUME_MIN )
@@ -196,8 +204,8 @@ int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps,
         i_volume = AOUT_VOLUME_MIN;
     }
     config_PutInt( p_object, "volume", i_volume );
-    var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
-    var_SetInteger( p_object->p_libvlc, "saved-volume", (audio_volume_t) i_volume );
+    var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
+    var_SetInteger( p_object->p_libvlc_global, "saved-volume", (audio_volume_t) i_volume );
     if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
 
     if ( p_aout == NULL ) return 0;
@@ -229,15 +237,15 @@ int __aout_VolumeMute( vlc_object_t * p_object, audio_volume_t * pi_volume )
     {
         /* Mute */
         i_result = aout_VolumeSet( p_object, AOUT_VOLUME_MIN );
-        var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
-        var_SetInteger( p_object->p_libvlc, "saved-volume", (int)i_volume );
+        var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
+        var_SetInteger( p_object->p_libvlc_global, "saved-volume", (int)i_volume );
         if ( pi_volume != NULL ) *pi_volume = AOUT_VOLUME_MIN;
     }
     else
     {
         /* Un-mute */
-        var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
-        i_volume = (audio_volume_t)var_GetInteger( p_object->p_libvlc,
+        var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
+        i_volume = (audio_volume_t)var_GetInteger( p_object->p_libvlc_global,
                                                    "saved-volume" );
         i_result = aout_VolumeSet( p_object, i_volume );
         if ( pi_volume != NULL ) *pi_volume = i_volume;
@@ -453,3 +461,71 @@ int aout_ChannelsRestart( vlc_object_t * p_this, const char * psz_variable,
     aout_Restart( p_aout );
     return 0;
 }
+
+/** Enable or disable an audio filter
+ * \param p_this a vlc object
+ * \param psz_name name of the filter
+ * \param b_add are we adding or removing the filter ?
+ */
+void aout_EnableFilter( vlc_object_t *p_this, const char *psz_name,
+                        vlc_bool_t b_add )
+{
+    char *psz_parser, *psz_string;
+    aout_instance_t * p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT,
+                                                FIND_ANYWHERE );
+
+    if( p_aout )
+        psz_string = var_GetString( p_aout, "audio-filter" );
+    else
+        psz_string = config_GetPsz( p_this, "audio-filter" );
+
+    if( !psz_string ) psz_string = strdup("");
+
+    psz_parser = strstr( psz_string, psz_name );
+
+    if( b_add )
+    {
+        if( !psz_parser )
+        {
+            psz_parser = psz_string;
+            asprintf( &psz_string, (*psz_string) ? "%s:%s" : "%s%s",
+                            psz_string, psz_name );
+            free( psz_parser );
+        }
+        else
+        {
+            vlc_object_release( p_aout );
+            return;
+        }
+    }
+    else
+    {
+        if( psz_parser )
+        {
+            memmove( psz_parser, psz_parser + strlen(psz_name) +
+                            (*(psz_parser + strlen(psz_name)) == ':' ? 1 : 0 ),
+                            strlen(psz_parser + strlen(psz_name)) + 1 );
+
+            if( *(psz_string+strlen(psz_string ) -1 ) == ':' )
+            {
+                *(psz_string+strlen(psz_string ) -1 ) = '\0';
+            }
+         }
+         else
+         {
+             free( psz_string );
+             return;
+         }
+    }
+
+    if( p_aout == NULL )
+        config_PutPsz( p_this, "audio-filter", psz_string );
+    else
+    {
+        var_SetString( p_aout, "audio-filter", psz_string );
+        for( int i = 0; i < p_aout->i_nb_inputs; i++ )
+            p_aout->pp_inputs[i]->b_restart = VLC_TRUE;
+        vlc_object_release( p_aout );
+    }
+    free( psz_string );
+}