core: move contents to mpvcore (2/2)

Followup commit. Fixes all the files references.

28 files changed, 46 insertions, 46 deletions

diff --git a/stream/ai_alsa1x.c b/stream/ai_alsa1x.c
index 12ffa133f2..82dec5669d 100644
--- a/stream/ai_alsa1x.c
+++ b/stream/ai_alsa1x.c
@@ -25,7 +25,7 @@
 
 #include <alsa/asoundlib.h>
 #include "audio_in.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 int ai_alsa_setup(audio_in_t *ai)
 {
diff --git a/stream/ai_oss.c b/stream/ai_oss.c
index be55358288..52cdb71b8d 100644
--- a/stream/ai_oss.c
+++ b/stream/ai_oss.c
@@ -37,7 +37,7 @@
 #endif
 
 #include "audio_in.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 int ai_oss_set_samplerate(audio_in_t *ai)
 {
diff --git a/stream/audio_in.c b/stream/audio_in.c
index 7f6a43fa2e..cc54e87800 100644
--- a/stream/audio_in.c
+++ b/stream/audio_in.c
@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include "audio_in.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include <string.h>
 #include <errno.h>
 
diff --git a/stream/cache.c b/stream/cache.c
index a60b8dd9ef..9b7b3a17be 100644
--- a/stream/cache.c
+++ b/stream/cache.c
@@ -51,10 +51,10 @@
 
 #include "osdep/timer.h"
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #include "stream.h"
-#include "core/mp_common.h"
+#include "mpvcore/mp_common.h"
 
 
 // Note: (struct priv*)(cache->priv)->cache == cache
diff --git a/stream/cdinfo.c b/stream/cdinfo.c
index 82ff6d4169..cf4e984a6b 100644
--- a/stream/cdinfo.c
+++ b/stream/cdinfo.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "cdd.h"
 
 /*******************************************************************************************************************
diff --git a/stream/cookies.c b/stream/cookies.c
index 4181458405..e0cfca7681 100644
--- a/stream/cookies.c
+++ b/stream/cookies.c
@@ -33,9 +33,9 @@
 
 #include "osdep/io.h"
 
-#include "core/options.h"
+#include "mpvcore/options.h"
 #include "cookies.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #define MAX_COOKIES 20
 
diff --git a/stream/dvb_tune.c b/stream/dvb_tune.c
index 8b24e88ede..ded2e28681 100644
--- a/stream/dvb_tune.c
+++ b/stream/dvb_tune.c
@@ -37,7 +37,7 @@
 #include "config.h"
 #include "dvbin.h"
 #include "dvb_tune.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 
 
diff --git a/stream/stream.c b/stream/stream.c
index 4160e7267e..45bc7997a1 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -37,14 +37,14 @@
 
 #include "config.h"
 
-#include "core/bstr.h"
-#include "core/mp_msg.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_msg.h"
 #include "osdep/timer.h"
 #include "stream.h"
 #include "demux/demux.h"
 
-#include "core/m_option.h"
-#include "core/m_config.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/m_config.h"
 
 // Includes additional padding in case sizes get rounded up by sector size.
 #define TOTAL_BUFFER_SIZE (STREAM_MAX_BUFFER_SIZE + STREAM_MAX_SECTOR_SIZE)
diff --git a/stream/stream.h b/stream/stream.h
index e928a258b6..7a9b6ab909 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -20,7 +20,7 @@
 #define MPLAYER_STREAM_H
 
 #include "config.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c
index 73b8ef61f8..4864931cd5 100644
--- a/stream/stream_bluray.c
+++ b/stream/stream_bluray.c
@@ -37,8 +37,8 @@
 
 #include "config.h"
 #include "talloc.h"
-#include "core/mp_msg.h"
-#include "core/m_option.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/m_option.h"
 #include "stream.h"
 #include "demux/stheader.h"
 
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index ff659b2d02..02ba28d54b 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -42,13 +42,13 @@
 #include "talloc.h"
 
 #include "stream.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 #include "libavutil/common.h"
 #include "compat/mpbswap.h"
 
 #include "cdd.h"
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 extern char *cdrom_device;
 
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 08f38cb23c..d96aea6905 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -42,8 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #include <errno.h>
 
 #include "stream.h"
-#include "core/m_option.h"
-#include "core/path.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/path.h"
 #include "libavutil/avstring.h"
 
 #include "dvbin.h"
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index c9473c4b67..0372e6c3c0 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -27,7 +27,7 @@
 
 #include "config.h"
 #include "talloc.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #include <libgen.h>
 #include <errno.h>
@@ -38,7 +38,7 @@
 #define FIRST_PCM_AID 160
 
 #include "stream.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 #include "stream_dvd.h"
 #include "stream_dvd_common.h"
diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h
index 97f2c83eeb..509e84801a 100644
--- a/stream/stream_dvd.h
+++ b/stream/stream_dvd.h
@@ -26,7 +26,7 @@
 #include <dvdread/ifo_read.h>
 #include <dvdread/nav_read.h>
 #include "stream.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 typedef struct {
   dvd_reader_t *dvd;
diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c
index bc4c600c36..3416eea094 100644
--- a/stream/stream_dvd_common.c
+++ b/stream/stream_dvd_common.c
@@ -39,7 +39,7 @@
 #include <sys/ioctl.h>
 #endif
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_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_file.c b/stream/stream_file.c
index 1e9f372ba4..90615ac51f 100644
--- a/stream/stream_file.c
+++ b/stream/stream_file.c
@@ -29,9 +29,9 @@
 
 #include "osdep/io.h"
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "stream.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 struct priv {
     int fd;
diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c
index a55b594495..0526d701f9 100644
--- a/stream/stream_lavf.c
+++ b/stream/stream_lavf.c
@@ -21,15 +21,15 @@
 #include <libavutil/opt.h>
 
 #include "config.h"
-#include "core/options.h"
-#include "core/mp_msg.h"
+#include "mpvcore/options.h"
+#include "mpvcore/mp_msg.h"
 #include "stream.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 #include "cookies.h"
 
-#include "core/bstr.h"
-#include "core/mp_talloc.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_talloc.h"
 
 static int open_f(stream_t *stream, int mode);
 static char **read_icy(stream_t *stream);
diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c
index 60517e0754..ded2751e11 100644
--- a/stream/stream_pvr.c
+++ b/stream/stream_pvr.c
@@ -43,7 +43,7 @@
 #include <libavutil/common.h>
 #include <libavutil/avstring.h>
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #include "stream.h"
 #include "pvr.h"
diff --git a/stream/stream_radio.c b/stream/stream_radio.c
index 5fdf22ba9e..643b304936 100644
--- a/stream/stream_radio.c
+++ b/stream/stream_radio.c
@@ -43,8 +43,8 @@
 
 #include "stream.h"
 #include "demux/demux.h"
-#include "core/m_option.h"
-#include "core/mp_msg.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/mp_msg.h"
 #include "stream_radio.h"
 #include "libavutil/avstring.h"
 
diff --git a/stream/stream_smb.c b/stream/stream_smb.c
index a37dc659dd..971c394051 100644
--- a/stream/stream_smb.c
+++ b/stream/stream_smb.c
@@ -23,9 +23,9 @@
 #include <libsmbclient.h>
 #include <unistd.h>
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "stream.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 struct priv {
     int fd;
diff --git a/stream/stream_tv.c b/stream/stream_tv.c
index 5a01d967e9..ef6f49b4b6 100644
--- a/stream/stream_tv.c
+++ b/stream/stream_tv.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "stream.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 #include "tv.h"
 
 #include <stdio.h>
diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c
index 453e69585e..f1c36545bf 100644
--- a/stream/stream_vcd.c
+++ b/stream/stream_vcd.c
@@ -24,9 +24,9 @@
 #include <windows.h>
 #endif
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "stream.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 #include <fcntl.h>
 #include <stdlib.h>
diff --git a/stream/tv.c b/stream/tv.c
index 79b70243fd..3a2064d247 100644
--- a/stream/tv.c
+++ b/stream/tv.c
@@ -35,7 +35,7 @@
 #include "config.h"
 
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #include "stream.h"
 #include "demux/demux.h"
diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c
index e23ad1ea73..e9092ca4e7 100644
--- a/stream/tvi_v4l2.c
+++ b/stream/tvi_v4l2.c
@@ -55,7 +55,7 @@ known issues:
 #include <linux/types.h>
 #include <linux/videodev2.h>
 #endif
-#include "core/mp_msg.h"
+#include "mpvcore/mp_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 fc396c22dc..9a1965e459 100644
--- a/stream/vcd_read.h
+++ b/stream/vcd_read.h
@@ -26,7 +26,7 @@
 
 #include <libavutil/intreadwrite.h>
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "stream.h"
 //=================== VideoCD ==========================
 
diff --git a/stream/vcd_read_darwin.h b/stream/vcd_read_darwin.h
index 2d8510617c..795e0567b5 100644
--- a/stream/vcd_read_darwin.h
+++ b/stream/vcd_read_darwin.h
@@ -33,7 +33,7 @@
 #include <IOKit/storage/IOCDMedia.h>
 #include <IOKit/storage/IOCDMediaBSDClient.h>
 #include "compat/mpbswap.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "stream.h"
 
 //=================== VideoCD ==========================
diff --git a/stream/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h
index c58aae1992..489c969505 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 "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 //=================== VideoCD ==========================
 #define	CDROM_LEADOUT	0xAA
diff --git a/stream/vcd_read_win32.h b/stream/vcd_read_win32.h
index cf587316af..10ca833574 100644
--- a/stream/vcd_read_win32.h
+++ b/stream/vcd_read_win32.h
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ntddcdrm.h>
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 typedef struct mp_vcd_priv_st mp_vcd_priv_t;