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/ --- player/audio.c | 4 ++-- player/command.c | 6 +++--- player/configfiles.c | 4 ++-- player/core.h | 2 +- player/dvdnav.c | 4 ++-- player/loadfile.c | 8 ++++---- player/lua.c | 6 +++--- player/main.c | 18 +++++++++--------- player/misc.c | 8 ++++---- player/osd.c | 6 +++--- player/playloop.c | 8 ++++---- player/screenshot.c | 4 ++-- player/sub.c | 4 ++-- player/timeline/tl_cue.c | 6 +++--- player/timeline/tl_matroska.c | 10 +++++----- player/timeline/tl_mpv_edl.c | 6 +++--- player/video.c | 6 +++--- 17 files changed, 55 insertions(+), 55 deletions(-) (limited to 'player') diff --git a/player/audio.c b/player/audio.c index 32f93d869a..ab91834aa8 100644 --- a/player/audio.c +++ b/player/audio.c @@ -25,9 +25,9 @@ #include "config.h" #include "talloc.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "audio/mixer.h" #include "audio/audio.h" diff --git a/player/command.c b/player/command.c index 532372e3ca..3199bd4137 100644 --- a/player/command.c +++ b/player/command.c @@ -32,14 +32,14 @@ #include "talloc.h" #include "command.h" #include "osdep/timer.h" -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "input/input.h" #include "stream/stream.h" #include "demux/demux.h" #include "demux/stheader.h" #include "stream/resolve/resolve.h" -#include "mpvcore/playlist.h" -#include "mpvcore/playlist_parser.h" +#include "common/playlist.h" +#include "common/playlist_parser.h" #include "sub/osd.h" #include "sub/dec_sub.h" #include "options/m_option.h" diff --git a/player/configfiles.c b/player/configfiles.c index 01b05ec6bc..37d081b953 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -31,11 +31,11 @@ #include "osdep/io.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/path.h" #include "options/m_config.h" #include "options/parse_configfile.h" -#include "mpvcore/playlist.h" +#include "common/playlist.h" #include "options/options.h" #include "options/m_property.h" diff --git a/player/core.h b/player/core.h index 551b902f9d..a344b92ac3 100644 --- a/player/core.h +++ b/player/core.h @@ -21,7 +21,7 @@ #include -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "options/options.h" // definitions used internally by the core player code diff --git a/player/dvdnav.c b/player/dvdnav.c index 6aad6f77ac..e90a65e035 100644 --- a/player/dvdnav.c +++ b/player/dvdnav.c @@ -20,8 +20,8 @@ #include "core.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/mp_common.h" +#include "common/msg.h" +#include "common/common.h" #include "input/input.h" #include "stream/stream_dvdnav.h" diff --git a/player/loadfile.c b/player/loadfile.c index 7132ca972e..12a8568973 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -30,15 +30,15 @@ #include "osdep/io.h" #include "osdep/timer.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/path.h" #include "options/m_config.h" #include "options/parse_configfile.h" -#include "mpvcore/playlist.h" +#include "common/playlist.h" #include "options/options.h" #include "options/m_property.h" -#include "mpvcore/mp_common.h" -#include "mpvcore/encode.h" +#include "common/common.h" +#include "common/encode.h" #include "input/input.h" #include "audio/mixer.h" diff --git a/player/lua.c b/player/lua.c index 56a9d74332..f75bc96531 100644 --- a/player/lua.c +++ b/player/lua.c @@ -7,13 +7,13 @@ #include "talloc.h" -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "options/m_property.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/m_option.h" #include "input/input.h" #include "options/path.h" -#include "mpvcore/bstr.h" +#include "bstr/bstr.h" #include "osdep/timer.h" #include "sub/osd.h" #include "core.h" diff --git a/player/main.c b/player/main.c index dfab92eefc..b421f2791a 100644 --- a/player/main.c +++ b/player/main.c @@ -32,20 +32,20 @@ #include "osdep/priority.h" #include "osdep/timer.h" -#include "mpvcore/av_log.h" -#include "mpvcore/codecs.h" -#include "mpvcore/cpudetect.h" -#include "mpvcore/encode.h" +#include "common/av_log.h" +#include "common/codecs.h" +#include "common/cpudetect.h" +#include "common/encode.h" #include "options/m_config.h" #include "options/m_option.h" #include "options/m_property.h" -#include "mpvcore/mp_common.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/mpv_global.h" +#include "common/common.h" +#include "common/msg.h" +#include "common/global.h" #include "options/parse_configfile.h" #include "options/parse_commandline.h" -#include "mpvcore/playlist.h" -#include "mpvcore/playlist_parser.h" +#include "common/playlist.h" +#include "common/playlist_parser.h" #include "options/options.h" #include "input/input.h" diff --git a/player/misc.c b/player/misc.c index f57695dae1..eb8c0c147e 100644 --- a/player/misc.c +++ b/player/misc.c @@ -26,12 +26,12 @@ #include "osdep/io.h" #include "osdep/timer.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" #include "options/m_property.h" -#include "mpvcore/mp_common.h" -#include "mpvcore/encode.h" -#include "mpvcore/playlist.h" +#include "common/common.h" +#include "common/encode.h" +#include "common/playlist.h" #include "input/input.h" #include "audio/out/ao.h" diff --git a/player/osd.c b/player/osd.c index 1ee8c52aa5..6f73ea9bc3 100644 --- a/player/osd.c +++ b/player/osd.c @@ -26,11 +26,11 @@ #include "config.h" #include "talloc.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "options/m_property.h" -#include "mpvcore/encode.h" +#include "common/encode.h" #include "osdep/getch2.h" #include "osdep/timer.h" diff --git a/player/playloop.c b/player/playloop.c index cb6b72f710..777d86e974 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -25,12 +25,12 @@ #include "config.h" #include "talloc.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" -#include "mpvcore/mp_common.h" -#include "mpvcore/encode.h" +#include "common/common.h" +#include "common/encode.h" #include "options/m_property.h" -#include "mpvcore/playlist.h" +#include "common/playlist.h" #include "input/input.h" #include "osdep/timer.h" diff --git a/player/screenshot.c b/player/screenshot.c index fd09474904..94fc25f563 100644 --- a/player/screenshot.c +++ b/player/screenshot.c @@ -28,8 +28,8 @@ #include "screenshot.h" #include "core.h" #include "command.h" -#include "mpvcore/bstr.h" -#include "mpvcore/mp_msg.h" +#include "bstr/bstr.h" +#include "common/msg.h" #include "options/path.h" #include "video/mp_image.h" #include "video/decode/dec_video.h" diff --git a/player/sub.c b/player/sub.c index ea6eaee89a..69ab7e3584 100644 --- a/player/sub.c +++ b/player/sub.c @@ -25,9 +25,9 @@ #include "config.h" #include "talloc.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "stream/stream.h" #include "sub/dec_sub.h" diff --git a/player/timeline/tl_cue.c b/player/timeline/tl_cue.c index 48336ed467..48b35d5b04 100644 --- a/player/timeline/tl_cue.c +++ b/player/timeline/tl_cue.c @@ -25,11 +25,11 @@ #include "talloc.h" #include "player/core.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "demux/demux.h" #include "options/path.h" -#include "mpvcore/bstr.h" -#include "mpvcore/mp_common.h" +#include "bstr/bstr.h" +#include "common/common.h" #include "stream/stream.h" // used by demuxer_cue.c diff --git a/player/timeline/tl_matroska.c b/player/timeline/tl_matroska.c index 4b52ad834f..8f793006d6 100644 --- a/player/timeline/tl_matroska.c +++ b/player/timeline/tl_matroska.c @@ -31,13 +31,13 @@ #include "talloc.h" #include "player/core.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "demux/demux.h" #include "options/path.h" -#include "mpvcore/bstr.h" -#include "mpvcore/mp_common.h" -#include "mpvcore/playlist.h" -#include "mpvcore/playlist_parser.h" +#include "bstr/bstr.h" +#include "common/common.h" +#include "common/playlist.h" +#include "common/playlist_parser.h" #include "stream/stream.h" struct find_entry { diff --git a/player/timeline/tl_mpv_edl.c b/player/timeline/tl_mpv_edl.c index 6a41bcb3c3..95bb03e2d8 100644 --- a/player/timeline/tl_mpv_edl.c +++ b/player/timeline/tl_mpv_edl.c @@ -25,11 +25,11 @@ #include "talloc.h" #include "player/core.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "demux/demux.h" #include "options/path.h" -#include "mpvcore/bstr.h" -#include "mpvcore/mp_common.h" +#include "bstr/bstr.h" +#include "common/common.h" #include "stream/stream.h" struct tl_part { diff --git a/player/video.c b/player/video.c index fd3f4ed658..7f4f7a6795 100644 --- a/player/video.c +++ b/player/video.c @@ -25,10 +25,10 @@ #include "config.h" #include "talloc.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/options.h" -#include "mpvcore/mp_common.h" -#include "mpvcore/encode.h" +#include "common/common.h" +#include "common/encode.h" #include "options/m_property.h" #include "audio/out/ao.h" -- cgit v1.2.3