summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-17 01:08:53 +0100
committerwm4 <wm4@nowhere>2013-12-17 01:08:53 +0100
commit56eafe33448780231cd2626239cac443e1cdbab4 (patch)
tree42014aef4168709fd220897ab956b7340740c66e
parente44911142914783c9ec717f329bd9b6a8bb9b70e (diff)
downloadmpv-56eafe33448780231cd2626239cac443e1cdbab4.tar.bz2
mpv-56eafe33448780231cd2626239cac443e1cdbab4.tar.xz
Rename mp_core.h to core.h
Get rid of the mp_ prefix.
-rw-r--r--mpvcore/options.c2
-rw-r--r--player/audio.c2
-rw-r--r--player/command.c2
-rw-r--r--player/configfiles.c2
-rw-r--r--player/core.h (renamed from player/mp_core.h)0
-rw-r--r--player/dvdnav.c2
-rw-r--r--player/loadfile.c2
-rw-r--r--player/main.c2
-rw-r--r--player/misc.c2
-rw-r--r--player/mp_lua.c2
-rw-r--r--player/osd.c2
-rw-r--r--player/playloop.c2
-rw-r--r--player/screenshot.c2
-rw-r--r--player/sub.c2
-rw-r--r--player/timeline/tl_cue.c2
-rw-r--r--player/timeline/tl_matroska.c2
-rw-r--r--player/timeline/tl_mpv_edl.c2
-rw-r--r--player/video.c2
18 files changed, 17 insertions, 17 deletions
diff --git a/mpvcore/options.c b/mpvcore/options.c
index 493c968243..e98009efab 100644
--- a/mpvcore/options.c
+++ b/mpvcore/options.c
@@ -39,7 +39,7 @@
#include "audio/mixer.h"
#include "audio/filter/af.h"
#include "audio/decode/dec_audio.h"
-#include "player/mp_core.h"
+#include "player/core.h"
#include "osdep/priority.h"
int network_bandwidth=0;
diff --git a/player/audio.c b/player/audio.c
index ec2f039531..8be2f9cddc 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -38,7 +38,7 @@
#include "demux/demux.h"
#include "video/decode/dec_video.h"
-#include "mp_core.h"
+#include "core.h"
static int build_afilter_chain(struct MPContext *mpctx)
{
diff --git a/player/command.c b/player/command.c
index 10dfb4c261..35a6ed31bc 100644
--- a/player/command.c
+++ b/player/command.c
@@ -72,7 +72,7 @@
#include "osdep/io.h"
-#include "mp_core.h"
+#include "core.h"
#include "mp_lua.h"
struct command_ctx {
diff --git a/player/configfiles.c b/player/configfiles.c
index ac95f6fdf4..eb72de08ed 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -41,7 +41,7 @@
#include "stream/stream.h"
-#include "mp_core.h"
+#include "core.h"
#include "command.h"
#define DEF_CONFIG "# Write your default config options here!\n\n\n"
diff --git a/player/mp_core.h b/player/core.h
index e1c7997907..e1c7997907 100644
--- a/player/mp_core.h
+++ b/player/core.h
diff --git a/player/dvdnav.c b/player/dvdnav.c
index 7fe1be3392..f00274a7d0 100644
--- a/player/dvdnav.c
+++ b/player/dvdnav.c
@@ -18,7 +18,7 @@
#include <limits.h>
#include <assert.h>
-#include "mp_core.h"
+#include "core.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/mp_common.h"
diff --git a/player/loadfile.c b/player/loadfile.c
index 08b245a0ff..b1d4555269 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -55,7 +55,7 @@
#include "video/decode/dec_video.h"
#include "video/out/vo.h"
-#include "mp_core.h"
+#include "core.h"
#include "command.h"
#if HAVE_DVBIN
diff --git a/player/main.c b/player/main.c
index 685ae16792..bef1f69351 100644
--- a/player/main.c
+++ b/player/main.c
@@ -60,7 +60,7 @@
#include "video/decode/dec_video.h"
#include "video/out/vo.h"
-#include "mp_core.h"
+#include "core.h"
#include "mp_lua.h"
#include "command.h"
#include "screenshot.h"
diff --git a/player/misc.c b/player/misc.c
index e54381d2e2..5f7d252551 100644
--- a/player/misc.c
+++ b/player/misc.c
@@ -40,7 +40,7 @@
#include "stream/stream.h"
#include "video/out/vo.h"
-#include "mp_core.h"
+#include "core.h"
#include "command.h"
double get_relative_time(struct MPContext *mpctx)
diff --git a/player/mp_lua.c b/player/mp_lua.c
index 38dc8b2af5..9bae3379ce 100644
--- a/player/mp_lua.c
+++ b/player/mp_lua.c
@@ -16,7 +16,7 @@
#include "mpvcore/bstr.h"
#include "osdep/timer.h"
#include "sub/osd.h"
-#include "mp_core.h"
+#include "core.h"
#include "command.h"
#include "mp_lua.h"
diff --git a/player/osd.c b/player/osd.c
index 42409b555f..f2a81b961b 100644
--- a/player/osd.c
+++ b/player/osd.c
@@ -38,7 +38,7 @@
#include "demux/demux.h"
#include "sub/osd.h"
-#include "mp_core.h"
+#include "core.h"
#include "command.h"
#define saddf(var, ...) (*(var) = talloc_asprintf_append((*var), __VA_ARGS__))
diff --git a/player/playloop.c b/player/playloop.c
index dbc87a7ec6..a2a577ced9 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -46,7 +46,7 @@
#include "video/decode/dec_video.h"
#include "video/out/vo.h"
-#include "mp_core.h"
+#include "core.h"
#include "screenshot.h"
#include "command.h"
diff --git a/player/screenshot.c b/player/screenshot.c
index 7aaba5f05a..f501a073b7 100644
--- a/player/screenshot.c
+++ b/player/screenshot.c
@@ -26,7 +26,7 @@
#include "talloc.h"
#include "screenshot.h"
-#include "mp_core.h"
+#include "core.h"
#include "command.h"
#include "mpvcore/bstr.h"
#include "mpvcore/mp_msg.h"
diff --git a/player/sub.c b/player/sub.c
index 26c8eebdb9..6270d3e69d 100644
--- a/player/sub.c
+++ b/player/sub.c
@@ -35,7 +35,7 @@
#include "video/mp_image.h"
#include "video/decode/dec_video.h"
-#include "mp_core.h"
+#include "core.h"
void uninit_subs(struct demuxer *demuxer)
{
diff --git a/player/timeline/tl_cue.c b/player/timeline/tl_cue.c
index 1a0a547dda..3a6eb379fc 100644
--- a/player/timeline/tl_cue.c
+++ b/player/timeline/tl_cue.c
@@ -24,7 +24,7 @@
#include "talloc.h"
-#include "player/mp_core.h"
+#include "player/core.h"
#include "mpvcore/mp_msg.h"
#include "demux/demux.h"
#include "mpvcore/path.h"
diff --git a/player/timeline/tl_matroska.c b/player/timeline/tl_matroska.c
index c7cc09f2b5..85bdf4e57e 100644
--- a/player/timeline/tl_matroska.c
+++ b/player/timeline/tl_matroska.c
@@ -30,7 +30,7 @@
#include "talloc.h"
-#include "player/mp_core.h"
+#include "player/core.h"
#include "mpvcore/mp_msg.h"
#include "demux/demux.h"
#include "mpvcore/path.h"
diff --git a/player/timeline/tl_mpv_edl.c b/player/timeline/tl_mpv_edl.c
index 321a855f47..aa343a3f47 100644
--- a/player/timeline/tl_mpv_edl.c
+++ b/player/timeline/tl_mpv_edl.c
@@ -24,7 +24,7 @@
#include "talloc.h"
-#include "player/mp_core.h"
+#include "player/core.h"
#include "mpvcore/mp_msg.h"
#include "demux/demux.h"
#include "mpvcore/path.h"
diff --git a/player/video.c b/player/video.c
index e98055d2a9..e94a0db71b 100644
--- a/player/video.c
+++ b/player/video.c
@@ -41,7 +41,7 @@
#include "video/decode/vd.h"
#include "video/out/vo.h"
-#include "mp_core.h"
+#include "core.h"
#include "command.h"
void update_fps(struct MPContext *mpctx)