From f99aff1b31a7b23e7761a6da4fc4550d698e06fe Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 23 Nov 2013 22:08:42 +0100
Subject: [PATCH] Reduce stheader.h includes, move stream types to mp_common.h

---
 demux/stheader.h         | 8 +-------
 mpvcore/mp_common.h      | 7 +++++++
 mpvcore/player/main.c    | 1 +
 mpvcore/player/misc.c    | 1 +
 mpvcore/player/mp_core.h | 3 +--
 mpvcore/player/osd.c     | 1 +
 stream/stream.c          | 1 -
 stream/stream_bluray.c   | 1 -
 stream/stream_dvd.c      | 1 -
 stream/stream_radio.c    | 1 -
 sub/sd_lavc.c            | 1 -
 sub/sd_spu.c             | 1 -
 12 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/demux/stheader.h b/demux/stheader.h
index 17090fc8e9..3c36631f0d 100644
--- a/demux/stheader.h
+++ b/demux/stheader.h
@@ -21,18 +21,12 @@
 
 #include <stdbool.h>
 
+#include "mpvcore/mp_common.h"
 #include "audio/chmap.h"
 #include "ms_hdr.h"
 struct MPOpts;
 struct demuxer;
 
-enum stream_type {
-    STREAM_VIDEO,
-    STREAM_AUDIO,
-    STREAM_SUB,
-    STREAM_TYPE_COUNT,
-};
-
 // Stream headers:
 
 struct sh_stream {
diff --git a/mpvcore/mp_common.h b/mpvcore/mp_common.h
index ecd84e33b6..ab1ccb9451 100644
--- a/mpvcore/mp_common.h
+++ b/mpvcore/mp_common.h
@@ -52,6 +52,13 @@
 #define CONTROL_ERROR -2
 #define CONTROL_NA -3
 
+enum stream_type {
+    STREAM_VIDEO,
+    STREAM_AUDIO,
+    STREAM_SUB,
+    STREAM_TYPE_COUNT,
+};
+
 extern const char *mplayer_version;
 extern const char *mplayer_builddate;
 
diff --git a/mpvcore/player/main.c b/mpvcore/player/main.c
index 84b5aa2651..1e56cf3084 100644
--- a/mpvcore/player/main.c
+++ b/mpvcore/player/main.c
@@ -53,6 +53,7 @@
 #include "audio/decode/dec_audio.h"
 #include "audio/out/ao.h"
 #include "audio/mixer.h"
+#include "demux/demux.h"
 #include "stream/stream.h"
 #include "sub/ass_mp.h"
 #include "sub/sub.h"
diff --git a/mpvcore/player/misc.c b/mpvcore/player/misc.c
index 5f15ca7124..e54381d2e2 100644
--- a/mpvcore/player/misc.c
+++ b/mpvcore/player/misc.c
@@ -36,6 +36,7 @@
 #include "mpvcore/input/input.h"
 
 #include "audio/out/ao.h"
+#include "demux/demux.h"
 #include "stream/stream.h"
 #include "video/out/vo.h"
 
diff --git a/mpvcore/player/mp_core.h b/mpvcore/player/mp_core.h
index 0be7e1df1f..c1fbf737f3 100644
--- a/mpvcore/player/mp_core.h
+++ b/mpvcore/player/mp_core.h
@@ -21,9 +21,8 @@
 
 #include <stdbool.h>
 
-#include "compat/compiler.h"
+#include "mpvcore/mp_common.h"
 #include "mpvcore/options.h"
-#include "demux/demux.h"
 
 // definitions used internally by the core player code
 
diff --git a/mpvcore/player/osd.c b/mpvcore/player/osd.c
index 6f81deae2e..afb04c837a 100644
--- a/mpvcore/player/osd.c
+++ b/mpvcore/player/osd.c
@@ -35,6 +35,7 @@
 #include "osdep/getch2.h"
 #include "osdep/timer.h"
 
+#include "demux/demux.h"
 #include "sub/sub.h"
 
 #include "mp_core.h"
diff --git a/stream/stream.c b/stream/stream.c
index 3febfa4189..94db8d8ab5 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -43,7 +43,6 @@
 #include "mpvcore/path.h"
 #include "osdep/timer.h"
 #include "stream.h"
-#include "demux/demux.h"
 
 #include "mpvcore/m_option.h"
 #include "mpvcore/m_config.h"
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c
index cde7267713..bcc299735f 100644
--- a/stream/stream_bluray.c
+++ b/stream/stream_bluray.c
@@ -40,7 +40,6 @@
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/m_option.h"
 #include "stream.h"
-#include "demux/stheader.h"
 
 #define BLURAY_SECTOR_SIZE     6144
 
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index 4e5f9ea5e7..a05bb856b4 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -42,7 +42,6 @@
 
 #include "stream_dvd.h"
 #include "stream_dvd_common.h"
-#include "demux/demux.h"
 
 static char* dvd_device_current;
 int dvd_angle=1;
diff --git a/stream/stream_radio.c b/stream/stream_radio.c
index 4189dd469b..6d07d9738f 100644
--- a/stream/stream_radio.c
+++ b/stream/stream_radio.c
@@ -40,7 +40,6 @@
 #endif
 
 #include "stream.h"
-#include "demux/demux.h"
 #include "mpvcore/m_option.h"
 #include "mpvcore/mp_msg.h"
 #include "stream_radio.h"
diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c
index 40039314a1..683436eb2a 100644
--- a/sub/sd_lavc.c
+++ b/sub/sd_lavc.c
@@ -25,7 +25,6 @@
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/av_common.h"
 #include "mpvcore/options.h"
-#include "demux/stheader.h"
 #include "video/mp_image.h"
 #include "sd.h"
 #include "dec_sub.h"
diff --git a/sub/sd_spu.c b/sub/sd_spu.c
index 717e4652b9..0061ec81e3 100644
--- a/sub/sd_spu.c
+++ b/sub/sd_spu.c
@@ -20,7 +20,6 @@
 
 #include "talloc.h"
 #include "mpvcore/options.h"
-#include "demux/stheader.h"
 #include "video/mp_image.h"
 #include "sd.h"
 #include "sub.h"