diff options
| author | wm4 <wm4@nowhere> | 2013-09-20 13:48:36 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-09-20 13:48:36 +0200 |
| commit | 3e5b632559a9198c0ede739622529d8df7909ca7 (patch) | |
| tree | 0b66c871c6b670313da1dcedb9582db2a856cf51 /mpvcore/mp_core.h | |
| parent | ed2d67b6d7585a5db5411f230fc8dcd27f9e85fc (diff) | |
| parent | 542086dd4537b852b61974f9bee4eabebde8505f (diff) | |
| download | mpv-3e5b632559a9198c0ede739622529d8df7909ca7.tar.bz2 mpv-3e5b632559a9198c0ede739622529d8df7909ca7.tar.xz | |
Merge branch 'volume_restore'
Diffstat (limited to 'mpvcore/mp_core.h')
| -rw-r--r-- | mpvcore/mp_core.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mpvcore/mp_core.h b/mpvcore/mp_core.h index 9f3e095110..98096aa5fe 100644 --- a/mpvcore/mp_core.h +++ b/mpvcore/mp_core.h @@ -22,14 +22,12 @@ #include <stdbool.h> #include "mpvcore/options.h" -#include "audio/mixer.h" #include "demux/demux.h" // definitions used internally by the core player code #define INITIALIZED_VO 1 #define INITIALIZED_AO 2 -#define INITIALIZED_VOL 4 #define INITIALIZED_GETCH2 8 #define INITIALIZED_PLAYBACK 16 #define INITIALIZED_STREAM 64 @@ -180,7 +178,7 @@ typedef struct MPContext { // demuxer defines metadata), or special purpose demuxers like TV. struct demuxer *master_demuxer; - mixer_t mixer; + struct mixer *mixer; struct ao *ao; struct vo *video_out; |