From 0112143fdaae0a6264d9e02355e9dc0ca4f7741c Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 17 Dec 2013 02:39:45 +0100 Subject: Split mpvcore/ into common/, misc/, bstr/ --- stream/ai_alsa1x.c | 2 +- stream/ai_oss.c | 2 +- stream/ai_sndio.c | 2 +- stream/audio_in.c | 2 +- stream/cache.c | 4 ++-- stream/cdinfo.c | 2 +- stream/cookies.c | 2 +- stream/dvb_tune.c | 2 +- stream/rar.c | 2 +- stream/resolve/resolve_quvi.c | 2 +- stream/resolve/resolve_quvi9.c | 4 ++-- stream/stream.c | 6 +++--- stream/stream.h | 4 ++-- stream/stream_bluray.c | 2 +- stream/stream_cdda.c | 2 +- stream/stream_dvd.c | 2 +- stream/stream_dvd_common.c | 2 +- stream/stream_dvdnav.c | 2 +- stream/stream_file.c | 2 +- stream/stream_lavf.c | 4 ++-- stream/stream_pvr.c | 2 +- stream/stream_radio.c | 2 +- stream/stream_rar.c | 2 +- stream/stream_smb.c | 2 +- stream/stream_vcd.c | 2 +- stream/tv.c | 2 +- stream/tvi_v4l2.c | 2 +- stream/vcd_read.h | 2 +- stream/vcd_read_darwin.h | 2 +- stream/vcd_read_fbsd.h | 2 +- stream/vcd_read_win32.h | 2 +- 31 files changed, 37 insertions(+), 37 deletions(-) (limited to 'stream') diff --git a/stream/ai_alsa1x.c b/stream/ai_alsa1x.c index 2cf0382150..880817a94e 100644 --- a/stream/ai_alsa1x.c +++ b/stream/ai_alsa1x.c @@ -24,7 +24,7 @@ #include #include "audio_in.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" int ai_alsa_setup(audio_in_t *ai) { diff --git a/stream/ai_oss.c b/stream/ai_oss.c index b5829ea07a..bf57ec4198 100644 --- a/stream/ai_oss.c +++ b/stream/ai_oss.c @@ -39,7 +39,7 @@ #include "osdep/io.h" #include "audio_in.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" int ai_oss_set_samplerate(audio_in_t *ai) { diff --git a/stream/ai_sndio.c b/stream/ai_sndio.c index b486bb9210..08ddac1e03 100644 --- a/stream/ai_sndio.c +++ b/stream/ai_sndio.c @@ -5,7 +5,7 @@ #include #include "audio_in.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" int ai_sndio_setup(audio_in_t *ai) { diff --git a/stream/audio_in.c b/stream/audio_in.c index 605e144f71..1d80ab762b 100644 --- a/stream/audio_in.c +++ b/stream/audio_in.c @@ -23,7 +23,7 @@ #include "config.h" #include "audio_in.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include #include diff --git a/stream/cache.c b/stream/cache.c index 1884dcfb18..5f01275674 100644 --- a/stream/cache.c +++ b/stream/cache.c @@ -52,10 +52,10 @@ #include "osdep/timer.h" #include "osdep/threads.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "stream.h" -#include "mpvcore/mp_common.h" +#include "common/common.h" // Note: (struct priv*)(cache->priv)->cache == cache diff --git a/stream/cdinfo.c b/stream/cdinfo.c index 43180448a3..6398809a0a 100644 --- a/stream/cdinfo.c +++ b/stream/cdinfo.c @@ -25,7 +25,7 @@ #include #include #include -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "cdd.h" /******************************************************************************************************************* diff --git a/stream/cookies.c b/stream/cookies.c index f4d5b863f4..3fcf11b68f 100644 --- a/stream/cookies.c +++ b/stream/cookies.c @@ -35,7 +35,7 @@ #include "options/options.h" #include "cookies.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #define MAX_COOKIES 20 diff --git a/stream/dvb_tune.c b/stream/dvb_tune.c index ddeabd2385..0e40ea088f 100644 --- a/stream/dvb_tune.c +++ b/stream/dvb_tune.c @@ -39,7 +39,7 @@ #include "osdep/io.h" #include "dvbin.h" #include "dvb_tune.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" diff --git a/stream/rar.c b/stream/rar.c index 00c5c16725..cb54c6ebbb 100644 --- a/stream/rar.c +++ b/stream/rar.c @@ -32,7 +32,7 @@ #include #include "talloc.h" -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "stream.h" #include "rar.h" diff --git a/stream/resolve/resolve_quvi.c b/stream/resolve/resolve_quvi.c index b45995dad8..4baaca2528 100644 --- a/stream/resolve/resolve_quvi.c +++ b/stream/resolve/resolve_quvi.c @@ -19,7 +19,7 @@ #include #include "talloc.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" #include "resolve.h" diff --git a/stream/resolve/resolve_quvi9.c b/stream/resolve/resolve_quvi9.c index 62464be0b5..ed8a95502c 100644 --- a/stream/resolve/resolve_quvi9.c +++ b/stream/resolve/resolve_quvi9.c @@ -22,9 +22,9 @@ #include #include "talloc.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" -#include "mpvcore/playlist.h" +#include "common/playlist.h" #include "resolve.h" static bool mp_quvi_ok(quvi_t q) diff --git a/stream/stream.c b/stream/stream.c index 7ceecf390e..e0694d8f3c 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -37,9 +37,9 @@ #include "config.h" -#include "mpvcore/mp_common.h" -#include "mpvcore/bstr.h" -#include "mpvcore/mp_msg.h" +#include "common/common.h" +#include "bstr/bstr.h" +#include "common/msg.h" #include "options/path.h" #include "osdep/timer.h" #include "stream.h" diff --git a/stream/stream.h b/stream/stream.h index cea45c5285..e1dc2a91d0 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -20,7 +20,7 @@ #define MPLAYER_STREAM_H #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include #include #include @@ -28,7 +28,7 @@ #include #include -#include "mpvcore/bstr.h" +#include "bstr/bstr.h" #ifndef O_BINARY #define O_BINARY 0 diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c index 9f11a917d2..be7a846e56 100644 --- a/stream/stream_bluray.c +++ b/stream/stream_bluray.c @@ -37,7 +37,7 @@ #include "config.h" #include "talloc.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/m_option.h" #include "stream.h" diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index 48f5a7b465..bc026843c8 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -48,7 +48,7 @@ #include "cdd.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" typedef struct { cdrom_drive_t *cd; diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index b3be35fd27..b57e4d9e7e 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -27,7 +27,7 @@ #include "config.h" #include "talloc.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include #include diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c index 8cf3f5e4b1..31d045ae5b 100644 --- a/stream/stream_dvd_common.c +++ b/stream/stream_dvd_common.c @@ -41,7 +41,7 @@ #include "osdep/io.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "stream_dvd_common.h" const char * const dvd_audio_stream_types[8] = { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" }; diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index 168091155d..b9339e70e0 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -29,7 +29,7 @@ #include #include "options/options.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "input/input.h" #include "options/m_option.h" #include "osdep/timer.h" diff --git a/stream/stream_file.c b/stream/stream_file.c index 73de4c266d..9f88e5bf6e 100644 --- a/stream/stream_file.c +++ b/stream/stream_file.c @@ -29,7 +29,7 @@ #include "osdep/io.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "stream.h" #include "options/m_option.h" diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c index d3aaf52d85..5a14cbdeb5 100644 --- a/stream/stream_lavf.c +++ b/stream/stream_lavf.c @@ -22,13 +22,13 @@ #include "config.h" #include "options/options.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "stream.h" #include "options/m_option.h" #include "cookies.h" -#include "mpvcore/bstr.h" +#include "bstr/bstr.h" #include "talloc.h" static int open_f(stream_t *stream, int mode); diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c index a89e70b2c6..29ea354293 100644 --- a/stream/stream_pvr.c +++ b/stream/stream_pvr.c @@ -44,7 +44,7 @@ #include "osdep/io.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "stream.h" #include "pvr.h" diff --git a/stream/stream_radio.c b/stream/stream_radio.c index b3fd501e33..754b217720 100644 --- a/stream/stream_radio.c +++ b/stream/stream_radio.c @@ -43,7 +43,7 @@ #include "stream.h" #include "options/m_option.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "stream_radio.h" #include "osdep/io.h" diff --git a/stream/stream_rar.c b/stream/stream_rar.c index 1cab4a8f48..5b6880fbe1 100644 --- a/stream/stream_rar.c +++ b/stream/stream_rar.c @@ -33,7 +33,7 @@ #include "osdep/io.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "stream.h" #include "options/m_option.h" #include "rar.h" diff --git a/stream/stream_smb.c b/stream/stream_smb.c index 2ec3c83d8d..804c5e9df4 100644 --- a/stream/stream_smb.c +++ b/stream/stream_smb.c @@ -23,7 +23,7 @@ #include #include -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "stream.h" #include "options/m_option.h" diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c index 4b591aba46..2460bc65b6 100644 --- a/stream/stream_vcd.c +++ b/stream/stream_vcd.c @@ -24,7 +24,7 @@ #include #endif -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "stream.h" #include "options/m_option.h" diff --git a/stream/tv.c b/stream/tv.c index 49d69b7865..594af4fd30 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -35,7 +35,7 @@ #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "stream.h" #include "demux/demux.h" diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index 88c78b7965..6132ad7708 100644 --- a/stream/tvi_v4l2.c +++ b/stream/tvi_v4l2.c @@ -57,7 +57,7 @@ known issues: #if HAVE_LIBV4L2 #include #endif -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "video/img_fourcc.h" #include "audio/format.h" #include "tv.h" diff --git a/stream/vcd_read.h b/stream/vcd_read.h index 9a1965e459..85a58fcf61 100644 --- a/stream/vcd_read.h +++ b/stream/vcd_read.h @@ -26,7 +26,7 @@ #include -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "stream.h" //=================== VideoCD ========================== diff --git a/stream/vcd_read_darwin.h b/stream/vcd_read_darwin.h index 795e0567b5..a81d9c481d 100644 --- a/stream/vcd_read_darwin.h +++ b/stream/vcd_read_darwin.h @@ -33,7 +33,7 @@ #include #include #include "compat/mpbswap.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "stream.h" //=================== VideoCD ========================== diff --git a/stream/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h index 489c969505..0765163b35 100644 --- a/stream/vcd_read_fbsd.h +++ b/stream/vcd_read_fbsd.h @@ -41,7 +41,7 @@ #define TOCADDR(te) ((te).entry.addr) #define READ_TOC CDIOREADTOCENTRY #endif -#include "mpvcore/mp_msg.h" +#include "common/msg.h" //=================== VideoCD ========================== #define CDROM_LEADOUT 0xAA diff --git a/stream/vcd_read_win32.h b/stream/vcd_read_win32.h index 10ca833574..d5d4032050 100644 --- a/stream/vcd_read_win32.h +++ b/stream/vcd_read_win32.h @@ -23,7 +23,7 @@ #include #include #include -#include "mpvcore/mp_msg.h" +#include "common/msg.h" typedef struct mp_vcd_priv_st mp_vcd_priv_t; -- cgit v1.2.3