playlist: use playlist audio functions

And get rid of the horrible find-input-callback.

diff --git a/modules/control/dbus/dbus_player.c b/modules/control/dbus/dbus_player.c
index c3dc60433fdad05708b085a577a920dd47897d2a..5d24af114bae74d0d4a2ae64f7e317a6507b1d46 100644 (file)
--- a/modules/control/dbus/dbus_player.c
+++ b/modules/control/dbus/dbus_player.c
@@ -31,7 +31,6 @@
 #include <vlc_common.h>
 #include <vlc_playlist.h>
 #include <vlc_interface.h>
-#include <vlc_aout_intf.h>
 
 #include <math.h>
 
@@ -167,7 +166,7 @@ DBUS_METHOD( Seek )
 static void
 MarshalVolume( intf_thread_t *p_intf, DBusMessageIter *container )
 {
-    float f_vol = aout_VolumeGet( p_intf->p_sys->p_playlist );
+    float f_vol = playlist_VolumeGet( p_intf->p_sys->p_playlist );
     if( f_vol < 0.f )
         f_vol = 1.f; /* ? */
 
@@ -204,7 +203,7 @@ DBUS_METHOD( VolumeSet )
     d_dbus_vol *= AOUT_VOLUME_DEFAULT;
     if( d_dbus_vol < 0. )
         d_dbus_vol = 0.;
-    aout_VolumeSet( PL, d_dbus_vol );
+    playlist_VolumeSet( PL, d_dbus_vol );
 
     REPLY_SEND;
 }

diff --git a/modules/control/gestures.c b/modules/control/gestures.c
index 1bac5dcc4ee8970e6cf42f87e01179c2ed09d707..bc4740547c4ac3553bccfbdaf84b987b1145a76b 100644 (file)
--- a/modules/control/gestures.c
+++ b/modules/control/gestures.c
@@ -33,7 +33,6 @@
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_vout.h>
-#include <vlc_aout_intf.h>
 #include <vlc_playlist.h>
 #include <assert.h>
 
@@ -263,18 +262,18 @@ static void ProcessGesture( intf_thread_t *p_intf )
 
         case UP:
             msg_Dbg(p_intf, "Louder");
-            aout_VolumeUp( p_playlist, 1, NULL );
+            playlist_VolumeUp( p_playlist, 1, NULL );
             break;
 
         case DOWN:
             msg_Dbg(p_intf, "Quieter");
-            aout_VolumeDown( p_playlist, 1, NULL );
+            playlist_VolumeDown( p_playlist, 1, NULL );
             break;
 
         case GESTURE(UP,DOWN,NONE,NONE):
         case GESTURE(DOWN,UP,NONE,NONE):
             msg_Dbg( p_intf, "Mute sound" );
-            aout_MuteToggle( p_playlist );
+            playlist_MuteToggle( p_playlist );
             break;
 
         case GESTURE(UP,RIGHT,NONE,NONE):

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 9d39a8a6967c55c36e810450f725d8c06d138125..ccd1216c7c99f2e0ed10fec9b0e72233507945e5 100644 (file)
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -35,7 +35,6 @@
 #include <vlc_interface.h>
 #include <vlc_input.h>
 #include <vlc_vout.h>
-#include <vlc_aout_intf.h>
 #include <vlc_osd.h>
 #include <vlc_playlist.h>
 #include <vlc_keys.h>
@@ -187,7 +186,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
         case ACTIONID_VOL_UP:
         {
             float vol;
-            if( aout_VolumeUp( p_playlist, 1, &vol ) == 0 )
+            if( playlist_VolumeUp( p_playlist, 1, &vol ) == 0 )
                 DisplayVolume( p_intf, p_vout, vol );
             break;
         }
@@ -195,16 +194,16 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
         case ACTIONID_VOL_DOWN:
         {
             float vol;
-            if( aout_VolumeDown( p_playlist, 1, &vol ) == 0 )
+            if( playlist_VolumeDown( p_playlist, 1, &vol ) == 0 )
                 DisplayVolume( p_intf, p_vout, vol );
             break;
         }
 
         case ACTIONID_VOL_MUTE:
-            if( aout_MuteToggle( p_playlist ) == 0 )
+            if( playlist_MuteToggle( p_playlist ) == 0 )
             {
-                float vol = aout_VolumeGet( p_playlist );
-                if( aout_MuteGet( p_playlist ) > 0 || vol == 0.f )
+                float vol = playlist_VolumeGet( p_playlist );
+                if( playlist_MuteGet( p_playlist ) > 0 || vol == 0.f )
                 {
                     ClearChannels( p_intf, p_vout );
                     DisplayIcon( p_vout, OSD_MUTE_ICON );

diff --git a/modules/control/rc.c b/modules/control/rc.c
index c73127d3ff82ff48e007eb59d51b8923243035a8..3e6c96d794c67c50984f20912cfc7fe9aed8264b 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -39,7 +39,6 @@
 #include <math.h>
 
 #include <vlc_interface.h>
-#include <vlc_aout_intf.h>
 #include <vlc_vout.h>
 #include <vlc_osd.h>
 #include <vlc_playlist.h>
@@ -1422,7 +1421,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
             }
         }
 
-        float volume = aout_VolumeGet( p_playlist );
+        float volume = playlist_VolumeGet( p_playlist );
         if( volume >= 0.f )
             msg_rc( STATUS_CHANGE "( audio volume: %ld )",
                     lroundf(volume * AOUT_VOLUME_DEFAULT) );
@@ -1504,17 +1503,17 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd,
     {
         /* Set. */
         int i_volume = atoi( newval.psz_string );
-        if( !aout_VolumeSet( p_playlist,
+        if( !playlist_VolumeSet( p_playlist,
                              i_volume / (float)AOUT_VOLUME_DEFAULT ) )
             i_error = VLC_SUCCESS;
-        aout_MuteSet( p_playlist, i_volume == 0 );
+        playlist_MuteSet( p_playlist, i_volume == 0 );
         msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume );
     }
     else
     {
         /* Get. */
         msg_rc( STATUS_CHANGE "( audio volume: %ld )",
-               lroundf( aout_VolumeGet( p_playlist ) * AOUT_VOLUME_DEFAULT ) );
+               lroundf( playlist_VolumeGet( p_playlist ) * AOUT_VOLUME_DEFAULT ) );
         i_error = VLC_SUCCESS;
     }
 
@@ -1545,7 +1544,7 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd,
 
     if( !strcmp(psz_cmd, "voldown") )
         i_nb_steps *= -1;
-    if( aout_VolumeUp( p_intf->p_sys->p_playlist, i_nb_steps, &volume ) < 0 )
+    if( playlist_VolumeUp( p_intf->p_sys->p_playlist, i_nb_steps, &volume ) < 0 )
         i_error = VLC_EGENERIC;
 
     if ( !i_error )

diff --git a/modules/gui/macosx/AudioEffects.m b/modules/gui/macosx/AudioEffects.m
index 0e3df8c637966dfd8b0d41bfb7c35b3ed3eb6693..0b43fbb049e5a57c892ce57620b4044e528c273c 100644 (file)
--- a/modules/gui/macosx/AudioEffects.m
+++ b/modules/gui/macosx/AudioEffects.m
@@ -33,7 +33,6 @@
 #import "SharedDialogs.h"
 
 #import <vlc_common.h>
-#import <vlc_aout_intf.h>
 #import <vlc_strings.h>
 
 #import <math.h>
@@ -180,7 +179,7 @@ static VLCAudioEffects *_o_sharedInstance = nil;
     }
 
     if (p_aout) {
-        aout_EnableFilter(pl_Get(p_intf), psz_name, b_on);
+        playlist_EnableAudioFilter(pl_Get(p_intf), psz_name, b_on);
         vlc_object_release(p_aout);
     }
 }
@@ -228,13 +227,13 @@ static VLCAudioEffects *_o_sharedInstance = nil;
 
     if (p_aout) {
         /* disable existing filters */
-        aout_EnableFilter(p_playlist, "equalizer", false);
-        aout_EnableFilter(p_playlist, "compressor", false);
-        aout_EnableFilter(p_playlist, "spatializer", false);
-        aout_EnableFilter(p_playlist, "compressor", false);
-        aout_EnableFilter(p_playlist, "headphone", false);
-        aout_EnableFilter(p_playlist, "normvol", false);
-        aout_EnableFilter(p_playlist, "karaoke", false);
+        playlist_EnableAudioFilter(p_playlist, "equalizer", false);
+        playlist_EnableAudioFilter(p_playlist, "compressor", false);
+        playlist_EnableAudioFilter(p_playlist, "spatializer", false);
+        playlist_EnableAudioFilter(p_playlist, "compressor", false);
+        playlist_EnableAudioFilter(p_playlist, "headphone", false);
+        playlist_EnableAudioFilter(p_playlist, "normvol", false);
+        playlist_EnableAudioFilter(p_playlist, "karaoke", false);
     }
 
     /* fetch preset */
@@ -257,7 +256,7 @@ static VLCAudioEffects *_o_sharedInstance = nil;
             tempArray = [tempString componentsSeparatedByString:@":"];
             count = [tempArray count];
             for (NSUInteger x = 0; x < count; x++)
-                aout_EnableFilter(p_playlist, (char *)[[tempArray objectAtIndex:x] UTF8String], true);
+                playlist_AudioEnableFilter(p_playlist, (char *)[[tempArray objectAtIndex:x] UTF8String], true);
         }
     }
     config_PutPsz(p_intf,"audio-filter",[tempString UTF8String]);

diff --git a/modules/gui/macosx/ControlsBar.m b/modules/gui/macosx/ControlsBar.m
index 8a93cbf072b94be2f8ac5a1ef3126c87db332ec2..de848018172c9efd6741e85141251b89638a173a 100644 (file)
--- a/modules/gui/macosx/ControlsBar.m
+++ b/modules/gui/macosx/ControlsBar.m
@@ -28,8 +28,6 @@
 #import "MainMenu.h"
 #import "fspanel.h"
 
-#import <vlc_aout_intf.h>
-
 /*****************************************************************************
  * VLCControlsBarCommon
  *
@@ -968,4 +966,4 @@ else \
     [o_fspanel setStreamPos:[o_time_sld floatValue] andTime: [o_time_fld stringValue]];
 }
 
-@end
\ No newline at end of file
+@end

diff --git a/modules/gui/macosx/CoreInteraction.m b/modules/gui/macosx/CoreInteraction.m
index aff14a4a13259ef540d6ef62c6b39543197ab198..334e076aa76c4cf609ea2fb00cd2d5b0f56f0d0e 100644 (file)
--- a/modules/gui/macosx/CoreInteraction.m
+++ b/modules/gui/macosx/CoreInteraction.m
@@ -30,7 +30,6 @@
 #import <vlc_input.h>
 #import <vlc_keys.h>
 #import <vlc_osd.h>
-#import <vlc_aout_intf.h>
 #import <vlc/vlc.h>
 #import <vlc_strings.h>
 #import <vlc_url.h>
@@ -424,7 +423,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
     if (!p_intf)
         return;
 
-    aout_VolumeUp(pl_Get(p_intf), 1, NULL);
+    playlist_VolumeUp(pl_Get(p_intf), 1, NULL);
 }
 
 - (void)volumeDown
@@ -433,7 +432,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
     if (!p_intf)
         return;
 
-    aout_VolumeDown(pl_Get(p_intf), 1, NULL);
+    playlist_VolumeDown(pl_Get(p_intf), 1, NULL);
 }
 
 - (void)toggleMute
@@ -442,7 +441,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
     if (!p_intf)
         return;
 
-    aout_MuteToggle(pl_Get(p_intf));
+    playlist_MuteToggle(pl_Get(p_intf));
 }
 
 - (void)setMute:(BOOL)b_value
@@ -451,7 +450,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
     if (!p_intf)
         return;
 
-    aout_MuteSet(pl_Get(p_intf), b_value);
+    playlist_MuteSet(pl_Get(p_intf), b_value);
 }
 
 - (BOOL)mute
@@ -461,7 +460,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
         return NO;
 
     BOOL b_is_muted = NO;
-    b_is_muted = aout_MuteGet(pl_Get(p_intf)) > 0;
+    b_is_muted = playlist_MuteGet(pl_Get(p_intf)) > 0;
 
     return b_is_muted;
 }
@@ -472,7 +471,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
     if (!p_intf)
         return 0;
 
-    float volume = aout_VolumeGet(pl_Get(p_intf));
+    float volume = playlist_VolumeGet(pl_Get(p_intf));
 
     return lroundf(volume * AOUT_VOLUME_DEFAULT);
 }
@@ -483,7 +482,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
     if (!p_intf)
         return;
 
-    aout_VolumeSet(pl_Get(p_intf), i_value / (float)AOUT_VOLUME_DEFAULT);
+    playlist_VolumeSet(pl_Get(p_intf), i_value / (float)AOUT_VOLUME_DEFAULT);
 }
 
 #pragma mark -

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 94dd5cf0387f8004828fc1b05dcea06247648c00..438b352eb948210b1c9b28b9a0b68a9f46fa13c8 100644 (file)
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -36,11 +36,9 @@
 #import "SideBarItem.h"
 #import <math.h>
 #import <vlc_playlist.h>
-#import <vlc_aout_intf.h>
 #import <vlc_url.h>
 #import <vlc_strings.h>
 #import <vlc_services_discovery.h>
-#import <vlc_aout_intf.h>
 
 #import "ControlsBar.h"
 #import "VideoView.h"

diff --git a/modules/gui/macosx/applescript.m b/modules/gui/macosx/applescript.m
index fd67c3aea24b4b6cdd12286026cca7d765350e67..4806edfeadc966b6bb469e8c3a0e84f1ee048584 100644 (file)
--- a/modules/gui/macosx/applescript.m
+++ b/modules/gui/macosx/applescript.m
@@ -28,7 +28,6 @@
 #include "intf.h"
 #include "applescript.h"
 #include "CoreInteraction.h"
-#include "vlc_aout_intf.h"
 
 /*****************************************************************************
  * VLGetURLScriptCommand implementation

diff --git a/modules/gui/macosx/fspanel.m b/modules/gui/macosx/fspanel.m
index 78c6c2388f3e87ed1cd72b4eb3b0d2ae31af7172..1a0c9e418a8c60a5fd636958d2eded6b4e6c1e50 100644 (file)
--- a/modules/gui/macosx/fspanel.m
+++ b/modules/gui/macosx/fspanel.m
@@ -31,7 +31,6 @@
 #import "misc.h"
 #import "fspanel.h"
 #import "CompatibilityFixes.h"
-#import <vlc_aout_intf.h>
 
 @interface VLCFSPanel ()
 - (void)hideMouse;

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 0da7f13c81a30ff1a4ed71c4b2746453b3185915..97326d70750ffe74bb531ed1a483e6cac3d0e50a 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -40,7 +40,6 @@
 #include <vlc_url.h>
 #include <vlc_modules.h>
 #include <vlc_plugin.h>
-#include <vlc_aout_intf.h>
 #include <vlc_vout_display.h>
 #include <unistd.h> /* execl() */
 

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 26b76258bbcb00f4e9ebdd6f2c10a5229425db3e..6994a3dc9a73bba006fcebb94a31c93007fff7fd 100644 (file)
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -29,7 +29,6 @@
 #import "prefs.h"
 #import <vlc_keys.h>
 #import <vlc_interface.h>
-#import <vlc_aout_intf.h>
 #import <vlc_dialog.h>
 #import <vlc_modules.h>
 #import <vlc_plugin.h>

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index f266415c38ef4ed575b05d171db9bc161f6e2c2d..e981dae2dd74654a09870710437645dcec0e89ed 100644 (file)
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -48,7 +48,6 @@
 
 #include <vlc_interface.h>
 #include <vlc_vout.h>
-#include <vlc_aout_intf.h>
 #include <vlc_charset.h>
 #include <vlc_input.h>
 #include <vlc_es.h>
@@ -1090,7 +1089,7 @@ static int DrawStatus(intf_thread_t *intf)
 
             mvnprintw(y++, 0, COLS, _(" Position : %s/%s"), buf1, buf2);
 
-            volume = aout_VolumeGet(p_playlist);
+            volume =playlist_VolumeGet(p_playlist);
             if (volume >= 0.f)
                 mvnprintw(y++, 0, COLS, _(" Volume   : %3ld%%"),
                           lroundf(volume * 100.f));
@@ -1608,8 +1607,8 @@ static void HandleCommonKey(intf_thread_t *intf, int key)
 
     case 'p': playlist_Prev(p_playlist);            break;
     case 'n': playlist_Next(p_playlist);            break;
-    case 'a': aout_VolumeUp(p_playlist, 1, NULL);   break;
-    case 'z': aout_VolumeDown(p_playlist, 1, NULL); break;
+    case 'a': playlist_VolumeUp(p_playlist, 1, NULL);   break;
+    case 'z': playlist_VolumeDown(p_playlist, 1, NULL); break;
 
     case 0x0c:  /* ^l */
     case KEY_CLEAR:

diff --git a/modules/gui/qt4/actions_manager.cpp b/modules/gui/qt4/actions_manager.cpp
index cd92fe960b662db124504c4ec0bb547d2cfaa17c..fa3703ba9a135a7d9daeb7c1af3378ec4f376e32 100644 (file)
--- a/modules/gui/qt4/actions_manager.cpp
+++ b/modules/gui/qt4/actions_manager.cpp
@@ -27,7 +27,6 @@
 #endif
 
 #include <vlc_vout.h>
-#include <vlc_aout_intf.h>
 #include <vlc_keys.h>
 
 #include "actions_manager.hpp"
@@ -179,17 +178,17 @@ void ActionsManager::frame()
 
 void ActionsManager::toggleMuteAudio()
 {
-     aout_MuteToggle( THEPL );
+     playlist_MuteToggle( THEPL );
 }
 
 void ActionsManager::AudioUp()
 {
-    aout_VolumeUp( THEPL, 1, NULL );
+    playlist_VolumeUp( THEPL, 1, NULL );
 }
 
 void ActionsManager::AudioDown()
 {
-    aout_VolumeDown( THEPL, 1, NULL );
+    playlist_VolumeDown( THEPL, 1, NULL );
 }
 
 void ActionsManager::skipForward()

diff --git a/modules/gui/qt4/components/controller_widget.cpp b/modules/gui/qt4/components/controller_widget.cpp
index 61f94356cfda8fd709ddf79cdbd296517c7b1179..49254424f9a98d2267d20362495a69fba2f0c846 100644 (file)
--- a/modules/gui/qt4/components/controller_widget.cpp
+++ b/modules/gui/qt4/components/controller_widget.cpp
@@ -32,7 +32,6 @@
 #include "util/input_slider.hpp"     /* SoundSlider */
 
 #include <math.h>
-#include <vlc_aout_intf.h>           /* Volume functions */
 
 #include <QLabel>
 #include <QHBoxLayout>
@@ -108,10 +107,10 @@ SoundWidget::SoundWidget( QWidget *_parent, intf_thread_t * _p_intf,
         layout->addWidget( volumeSlider, 0, Qt::AlignBottom  );
 
     /* Set the volume from the config */
-    float volume = aout_VolumeGet( THEPL );
+    float volume = playlist_VolumeGet( THEPL );
     libUpdateVolume( (volume >= 0.f) ? volume : 1.f );
     /* Sync mute status */
-    if( aout_MuteGet( THEPL ) > 0 )
+    if( playlist_MuteGet( THEPL ) > 0 )
         updateMuteStatus( true );
 
     /* Volume control connection */
@@ -152,7 +151,7 @@ void SoundWidget::userUpdateVolume( int i_sliderVolume )
 {
     /* Only if volume is set by user action on slider */
     setMuted( false );
-    aout_VolumeSet( THEPL, i_sliderVolume / 100.f );
+    playlist_VolumeSet( THEPL, i_sliderVolume / 100.f );
     refreshLabels();
 }
 
@@ -197,7 +196,7 @@ void SoundWidget::setMuted( bool mute )
 {
     b_is_muted = mute;
     playlist_t *p_playlist = pl_Get( p_intf );
-    aout_MuteSet( VLC_OBJECT(p_playlist), mute );
+    playlist_MuteSet( p_playlist, mute );
 }
 
 bool SoundWidget::eventFilter( QObject *obj, QEvent *e )

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 6dda355b62870ff1ee5354b244f145c9b57fd005..bbf44453a58c3863d753e08429cc7b1dac1ca28b 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -45,7 +45,6 @@
 #include "util/qt_dirs.hpp"
 
 #include "../../audio_filter/equalizer_presets.h"
-#include <vlc_aout_intf.h>
 #include <vlc_intf_strings.h>
 #include <vlc_vout.h>
 #include <vlc_osd.h>
@@ -1054,9 +1053,9 @@ void Equalizer::changeFreqLabels( bool b_useVlcBands )
 void Equalizer::enable()
 {
     bool en = ui.enableCheck->isChecked();
-    aout_EnableFilter( THEPL, "equalizer", en );
-//    aout_EnableFilter( THEPL, "upmixer", en );
-//     aout_EnableFilter( THEPL, "vsurround", en );
+    playlist_EnableAudioFilter( THEPL, "equalizer", en );
+    //playlist_EnableAudioFilter( THEPL, "upmixer", en );
+    //playlist_EnableAudioFilter( THEPL, "vsurround", en );
     enable( en );
 
     if( presetsComboBox->currentIndex() < 0 )
@@ -1334,7 +1333,7 @@ Compressor::Compressor( intf_thread_t *_p_intf, QWidget *_parent )
 void Compressor::enable()
 {
     bool en = enableCheck->isChecked();
-    aout_EnableFilter( THEPL, "compressor", en );
+    playlist_EnableAudioFilter( THEPL, "compressor", en );
     enable( en );
 }
 
@@ -1474,7 +1473,7 @@ Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent )
 void Spatializer::enable()
 {
     bool en = enableCheck->isChecked();
-    aout_EnableFilter( THEPL, "spatializer", en );
+    playlist_EnableAudioFilter( THEPL, "spatializer", en );
     enable( en );
 }
 

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 7e77fad17f12ca40316fed98f4cb2aa7d4f61254..9e2ff61a072ddf7d604496ba7894854eaf32b629 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -33,7 +33,6 @@
 
 #include <vlc_config_cat.h>
 #include <vlc_configuration.h>
-#include <vlc_aout_intf.h>
 
 #include <QString>
 #include <QFont>

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 5107f5a791dda0afc19d8f1626a124de439ab590..c9cf47ce1d90414c32f4c9a76d6a9adab61dfca0 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -35,7 +35,6 @@
 #include <vlc_url.h>
 #include <vlc_strings.h>
 #include <vlc_aout.h>
-#include <vlc_aout_intf.h>
 
 #include <QApplication>
 #include <QFile>

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 13511079d237b951903b44ae9326bc8493050cd7..377d105e880e598f3ae2ef5289a9e57ce6967317 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -39,7 +39,6 @@
 #include "recents.hpp"          /* Recents Item destruction */
 #include "util/qvlcapp.hpp"     /* QVLCApplication definition */
 #include "components/playlist/playlist_model.hpp" /* for ~PLModel() */
-#include <vlc_aout_intf.h>
 
 #ifdef Q_WS_X11
  #include <vlc_xlib.h>

diff --git a/modules/gui/qt4/util/input_slider.cpp b/modules/gui/qt4/util/input_slider.cpp
index 58819ba9d3e0b39762d0a360a9d683b178691caf..2afc3d9ca46614c7a2d2d89ebc7080d579e694cc 100644 (file)
--- a/modules/gui/qt4/util/input_slider.cpp
+++ b/modules/gui/qt4/util/input_slider.cpp
@@ -31,7 +31,6 @@
 
 #include "util/input_slider.hpp"
 #include "adapters/seekpoints.hpp"
-#include <vlc_aout_intf.h>
 
 #include <QPaintEvent>
 #include <QPainter>

diff --git a/modules/gui/skins2/commands/cmd_audio.cpp b/modules/gui/skins2/commands/cmd_audio.cpp
index f83de1a1452a0f2a7f8657b45425b47c4fd5ffd5..3c547427062cdf9bab55b4716c601fcd3ef53a27 100644 (file)
--- a/modules/gui/skins2/commands/cmd_audio.cpp
+++ b/modules/gui/skins2/commands/cmd_audio.cpp
@@ -25,14 +25,13 @@
 #include "../src/vlcproc.hpp"
 #include <vlc_playlist.h>
 #include <vlc_input.h>
-#include <vlc_aout_intf.h>
 #include <string>
 
 void CmdSetEqualizer::execute()
 {
     playlist_t* pPlaylist = getIntf()->p_sys->p_playlist;
 
-    aout_EnableFilter( pPlaylist, "equalizer", m_enable );
+    playlist_EnableAudioFilter( pPlaylist, "equalizer", m_enable );
     VlcProc::instance( getIntf() )->update_equalizer();
 }
 

diff --git a/modules/gui/skins2/commands/cmd_input.cpp b/modules/gui/skins2/commands/cmd_input.cpp
index e83ba029ee60b0a14e91608781e5cb199be397a6..fc391641e88bb2877a67595e34b6a9e1ae685103 100644 (file)
--- a/modules/gui/skins2/commands/cmd_input.cpp
+++ b/modules/gui/skins2/commands/cmd_input.cpp
@@ -24,7 +24,6 @@
 
 #include "cmd_input.hpp"
 #include "cmd_dialogs.hpp"
-#include <vlc_aout_intf.h>
 #include <vlc_input.h>
 #include <vlc_playlist.h>
 
@@ -102,18 +101,18 @@ void CmdFaster::execute()
 
 void CmdMute::execute()
 {
-    aout_MuteToggle( getIntf()->p_sys->p_playlist );
+    playlist_MuteToggle( getIntf()->p_sys->p_playlist );
 }
 
 
 void CmdVolumeUp::execute()
 {
-    aout_VolumeUp( getIntf()->p_sys->p_playlist, 1, NULL );
+    playlist_VolumeUp( getIntf()->p_sys->p_playlist, 1, NULL );
 }
 
 
 void CmdVolumeDown::execute()
 {
-    aout_VolumeDown( getIntf()->p_sys->p_playlist, 1, NULL );
+    playlist_VolumeDown( getIntf()->p_sys->p_playlist, 1, NULL );
 }
 

diff --git a/modules/gui/skins2/src/vlcproc.cpp b/modules/gui/skins2/src/vlcproc.cpp
index 7867a9a1180b4fa401fb4d53abee5e34a3191b9c..3fbcc2bcf2bc9b498211db825192e7e00ffb4b0b 100644 (file)
--- a/modules/gui/skins2/src/vlcproc.cpp
+++ b/modules/gui/skins2/src/vlcproc.cpp
@@ -29,7 +29,6 @@
 
 #include <vlc_common.h>
 #include <vlc_aout.h>
-#include <vlc_aout_intf.h>
 #include <vlc_vout.h>
 #include <vlc_playlist.h>
 #include <vlc_url.h>
@@ -694,7 +693,7 @@ void VlcProc::on_volume_changed( vlc_object_t* p_obj, vlc_value_t newVal )
     playlist_t* pPlaylist = getIntf()->p_sys->p_playlist;
 
     SET_VOLUME( m_cVarVolume, var_GetFloat( pPlaylist, "volume" ), false );
-    bool b_is_muted = aout_MuteGet( pPlaylist ) > 0;
+    bool b_is_muted = playlist_MuteGet( pPlaylist ) > 0;
     SET_BOOL( m_cVarMute, b_is_muted );
 }
 
@@ -798,7 +797,7 @@ void VlcProc::init_variables()
     SET_BOOL( m_cVarRepeat, var_GetBool( pPlaylist, "repeat" ) );
 
     SET_VOLUME( m_cVarVolume, var_GetFloat( pPlaylist, "volume" ), false );
-    bool b_is_muted = aout_MuteGet( pPlaylist ) > 0;
+    bool b_is_muted = playlist_MuteGet( pPlaylist ) > 0;
     SET_BOOL( m_cVarMute, b_is_muted );
 
     update_equalizer();

diff --git a/modules/gui/skins2/vars/volume.cpp b/modules/gui/skins2/vars/volume.cpp
index e3910ac91143896740a76d4fd339e571ffd2af85..ed734c4d3d07d512964dce606999780ac895087b 100644 (file)
--- a/modules/gui/skins2/vars/volume.cpp
+++ b/modules/gui/skins2/vars/volume.cpp
@@ -28,7 +28,6 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_aout_intf.h>
 #include <vlc_playlist.h>
 #include "volume.hpp"
 #include <math.h>
@@ -51,7 +50,7 @@ void Volume::set( float percentage, bool updateVLC )
     if( updateVLC )
     {
         playlist_t* pPlaylist = getIntf()->p_sys->p_playlist;
-        aout_VolumeSet( pPlaylist, getVolume() );
+        playlist_VolumeSet( pPlaylist, getVolume() );
     }
 }
 

diff --git a/modules/lua/libs/equalizer.c b/modules/lua/libs/equalizer.c
index f158bee0b83d2e7fe0fc6f3b459d1af1b1b77e1d..98f4344fe1335954733fab2850e4cf447213888d 100644 (file)
--- a/modules/lua/libs/equalizer.c
+++ b/modules/lua/libs/equalizer.c
@@ -34,7 +34,6 @@
 
 #include <vlc_common.h>
 #include <vlc_aout.h>
-#include <vlc_aout_intf.h>
 #include <vlc_input.h>
 #include <vlc_charset.h>
 
@@ -293,7 +292,7 @@ static int vlclua_equalizer_enable ( lua_State *L )
 {
     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
     bool state = luaL_checkboolean ( L , 1 );
-    aout_EnableFilter( p_playlist, "equalizer", state );
+    playlist_EnableAudioFilter( p_playlist, "equalizer", state );
     return 0;
 }
 /*****************************************************************************

diff --git a/modules/lua/libs/volume.c b/modules/lua/libs/volume.c
index 36c2859a4ab1f94a1dbc992dfe70253e53f55bb2..6b9409ff8c9568a926ae1d209e7821d5da405cca 100644 (file)
--- a/modules/lua/libs/volume.c
+++ b/modules/lua/libs/volume.c
@@ -37,7 +37,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_meta.h>
-#include <vlc_aout_intf.h>
+#include <vlc_playlist.h>
 
 #include "../vlc.h"
 #include "../libs.h"
@@ -52,14 +52,14 @@ static int vlclua_volume_set( lua_State *L )
     int i_volume = luaL_checkint( L, 1 );
     if( i_volume < 0 )
         i_volume = 0;
-    int i_ret = aout_VolumeSet( p_this, i_volume/(float)AOUT_VOLUME_DEFAULT );
+    int i_ret = playlist_VolumeSet( p_this, i_volume/(float)AOUT_VOLUME_DEFAULT );
     return vlclua_push_ret( L, i_ret );
 }
 
 static int vlclua_volume_get( lua_State *L )
 {
     playlist_t *p_this = vlclua_get_playlist_internal( L );
-    long i_volume = lroundf(aout_VolumeGet( p_this ) * AOUT_VOLUME_DEFAULT);
+    long i_volume = lroundf(playlist_VolumeGet( p_this ) * AOUT_VOLUME_DEFAULT);
     lua_pushnumber( L, i_volume );
     return 1;
 }
@@ -69,7 +69,7 @@ static int vlclua_volume_up( lua_State *L )
     playlist_t *p_this = vlclua_get_playlist_internal( L );
     float volume;
 
-    aout_VolumeUp( p_this, luaL_optint( L, 1, 1 ), &volume );
+    playlist_VolumeUp( p_this, luaL_optint( L, 1, 1 ), &volume );
     lua_pushnumber( L, lroundf(volume * AOUT_VOLUME_DEFAULT) );
     return 1;
 }
@@ -79,7 +79,7 @@ static int vlclua_volume_down( lua_State *L )
     playlist_t *p_this = vlclua_get_playlist_internal( L );
     float volume;
 
-    aout_VolumeDown( p_this, luaL_optint( L, 1, 1 ), &volume );
+    playlist_VolumeDown( p_this, luaL_optint( L, 1, 1 ), &volume );
     lua_pushnumber( L, lroundf(volume * AOUT_VOLUME_DEFAULT) );
     return 1;
 }

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index fe1e539677c418bb2ff8f79d907f013cd1f03618..dcaf9a88d9cdf87afc117fbe4f3a85d76d73c525 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -36,7 +36,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_cpu.h>
-#include <vlc_aout_intf.h>
+#include <vlc_playlist.h>
 #include "libvlc.h"
 #include "modules/modules.h"
 

diff --git a/src/osd/osd.c b/src/osd/osd.c
index fc56dd08774b952ca5f54ed7ee0b9d744e890530..e685e90c00704f376011323f38f7fa538b6cabfb 100644 (file)
--- a/src/osd/osd.c
+++ b/src/osd/osd.c
@@ -35,7 +35,7 @@
 #include <vlc_osd.h>
 #include <vlc_image.h>
 #include <vlc_modules.h>
-#include <vlc_aout_intf.h>
+#include <vlc_playlist.h>
 
 #include "libvlc.h"
 
@@ -171,7 +171,7 @@ osd_menu_t *osd_MenuCreate( vlc_object_t *p_this, const char *psz_file )
         if( p_osd->p_state->p_volume )
         {
             /* Update the volume state images to match the current volume */
-            float vol = aout_VolumeGet( p_this );
+            float vol = playlist_VolumeGet( pl_Get(p_this) );
             if( vol >= 0.f )
             {
                 vol *= (float)AOUT_VOLUME_DEFAULT;

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 326f1a78c59b84c20a54f99455b7c79c85d819dc..63c22f1cf94ea2f5cfbe5c0d782ddcd0a3b991be 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -409,11 +409,6 @@ void set_current_status_node( playlist_t * p_playlist,
     pl_priv(p_playlist)->status.p_node = p_node;
 }
 
-static input_thread_t *playlist_FindInput( vlc_object_t *object )
-{
-    return playlist_CurrentInput( (playlist_t *)object );
-}
-
 static void VariablesInit( playlist_t *p_playlist )
 {
     /* These variables control updates */
@@ -466,9 +461,6 @@ static void VariablesInit( playlist_t *p_playlist )
     var_Create( p_playlist, "mute", VLC_VAR_BOOL );
     var_Create( p_playlist, "volume", VLC_VAR_FLOAT );
     var_SetFloat( p_playlist, "volume", -1.f );
-    /* FIXME: horrible hack for audio output interface code */
-    var_Create( p_playlist, "find-input-callback", VLC_VAR_ADDRESS );
-    var_SetAddress( p_playlist, "find-input-callback", playlist_FindInput );
 }
 
 playlist_item_t * playlist_CurrentPlayingItem( playlist_t * p_playlist )

diff --git a/src/text/strings.c b/src/text/strings.c
index f557726b2a4976dd5298ebcee7d13a9796db553c..d5d02f45218e22cf020f40c815e67fed7de9c266 100644 (file)
--- a/src/text/strings.c
+++ b/src/text/strings.c
@@ -43,7 +43,6 @@
 #include <vlc_input.h>
 #include <vlc_meta.h>
 #include <vlc_playlist.h>
-#include <vlc_aout_intf.h>
 
 #include <vlc_strings.h>
 #include <vlc_charset.h>
@@ -776,7 +775,7 @@ char *str_format_meta( playlist_t *p_object, const char *string )
                     break;
                 case 'V':
                 {
-                    float vol = aout_VolumeGet( p_object );
+                    float vol = playlist_VolumeGet( p_object );
                     if( vol >= 0. )
                     {
                         snprintf( buf, 10, "%ld",