vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri May 4 20:37:48 2018 +0300| [119776dc4013039718e9945fb941c1cd1b2609d5] | committer: Rémi Denis-Courmont
include: remove <vlc_aout.h> from <vlc_playlist.h> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=119776dc4013039718e9945fb941c1cd1b2609d5 --- include/vlc_playlist.h | 3 +-- modules/gui/macosx/VLCCoreInteraction.m | 1 + modules/gui/macosx/VLCFSPanelController.m | 1 + modules/gui/macosx/VLCMainWindowControlsBar.m | 1 + modules/gui/qt/util/input_slider.cpp | 2 ++ modules/gui/skins2/vars/volume.cpp | 1 + modules/lua/libs/volume.c | 1 + 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h index 7884aa7bbd..d18751f627 100644 --- a/include/vlc_playlist.h +++ b/include/vlc_playlist.h @@ -29,7 +29,6 @@ extern "C" { # endif #include <vlc_events.h> -#include <vlc_aout.h> TYPEDEF_ARRAY(playlist_item_t*, playlist_item_array_t) @@ -400,7 +399,7 @@ VLC_API void playlist_NodeDelete( playlist_t *, playlist_item_t * ); * Audio output management **************************/ -VLC_API audio_output_t *playlist_GetAout( playlist_t * ); +VLC_API struct audio_output *playlist_GetAout( playlist_t * ); VLC_API float playlist_VolumeGet( playlist_t * ); VLC_API int playlist_VolumeSet( playlist_t *, float ); diff --git a/modules/gui/macosx/VLCCoreInteraction.m b/modules/gui/macosx/VLCCoreInteraction.m index 0b3e83eb5b..976dfa799c 100644 --- a/modules/gui/macosx/VLCCoreInteraction.m +++ b/modules/gui/macosx/VLCCoreInteraction.m @@ -29,6 +29,7 @@ #import <vlc_playlist.h> #import <vlc_input.h> #import <vlc_actions.h> +#import <vlc_aout.h> #import <vlc_vout.h> #import <vlc_vout_osd.h> #import <vlc/vlc.h> diff --git a/modules/gui/macosx/VLCFSPanelController.m b/modules/gui/macosx/VLCFSPanelController.m index a721074679..b16f47fafe 100644 --- a/modules/gui/macosx/VLCFSPanelController.m +++ b/modules/gui/macosx/VLCFSPanelController.m @@ -28,6 +28,7 @@ #import "VLCCoreInteraction.h" #import "CompatibilityFixes.h" #import "VLCMain.h" +#import <vlc_aout.h> @interface VLCFSPanelController () { BOOL _isCounting; diff --git a/modules/gui/macosx/VLCMainWindowControlsBar.m b/modules/gui/macosx/VLCMainWindowControlsBar.m index 6b79bc5ee5..57ba22a422 100644 --- a/modules/gui/macosx/VLCMainWindowControlsBar.m +++ b/modules/gui/macosx/VLCMainWindowControlsBar.m @@ -29,6 +29,7 @@ #import "VLCMainMenu.h" #import "VLCPlaylist.h" #import "CompatibilityFixes.h" +#import <vlc_aout.h> /***************************************************************************** * VLCMainWindowControlsBar diff --git a/modules/gui/qt/util/input_slider.cpp b/modules/gui/qt/util/input_slider.cpp index a2fee13c18..5a75e8d7f6 100644 --- a/modules/gui/qt/util/input_slider.cpp +++ b/modules/gui/qt/util/input_slider.cpp @@ -53,6 +53,8 @@ #include <QScreen> #include <QSequentialAnimationGroup> +#include <vlc_aout.h> + namespace { int const MIN_SLIDER_VALUE = 0; int const MAX_SLIDER_VALUE = 10000; diff --git a/modules/gui/skins2/vars/volume.cpp b/modules/gui/skins2/vars/volume.cpp index d1c7b9d22b..b242d021c8 100644 --- a/modules/gui/skins2/vars/volume.cpp +++ b/modules/gui/skins2/vars/volume.cpp @@ -29,6 +29,7 @@ #include <vlc_common.h> #include <vlc_playlist.h> +#include <vlc_aout.h> #include "volume.hpp" #include <math.h> diff --git a/modules/lua/libs/volume.c b/modules/lua/libs/volume.c index 81a6156c2a..a060b883e7 100644 --- a/modules/lua/libs/volume.c +++ b/modules/lua/libs/volume.c @@ -38,6 +38,7 @@ #include <vlc_plugin.h> #include <vlc_meta.h> #include <vlc_playlist.h> +#include <vlc_aout.h> #include "../vlc.h" #include "../libs.h" _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
