From eb15151705d47d23da844449126cc6b4879f110e Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 17 Dec 2013 02:02:25 +0100 Subject: Move options/config related files from mpvcore/ to options/ Since m_option.h and options.h are extremely often included, a lot of files have to be changed. Moving path.c/h to options/ is a bit questionable, but since this is mainly about access to config files (which are also handled in options/), it's probably ok. --- stream/cookies.c | 2 +- stream/resolve/resolve_quvi.c | 2 +- stream/resolve/resolve_quvi9.c | 2 +- stream/stream.c | 6 +++--- stream/stream_bluray.c | 2 +- stream/stream_cdda.c | 2 +- stream/stream_dvb.c | 4 ++-- stream/stream_dvd.c | 2 +- stream/stream_dvd.h | 2 +- stream/stream_dvdnav.c | 4 ++-- stream/stream_file.c | 2 +- stream/stream_lavf.c | 4 ++-- stream/stream_radio.c | 2 +- stream/stream_rar.c | 2 +- stream/stream_smb.c | 2 +- stream/stream_tv.c | 2 +- stream/stream_vcd.c | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) (limited to 'stream') diff --git a/stream/cookies.c b/stream/cookies.c index b5815da6e5..f4d5b863f4 100644 --- a/stream/cookies.c +++ b/stream/cookies.c @@ -33,7 +33,7 @@ #include "osdep/io.h" -#include "mpvcore/options.h" +#include "options/options.h" #include "cookies.h" #include "mpvcore/mp_msg.h" diff --git a/stream/resolve/resolve_quvi.c b/stream/resolve/resolve_quvi.c index 00279c568f..b45995dad8 100644 --- a/stream/resolve/resolve_quvi.c +++ b/stream/resolve/resolve_quvi.c @@ -20,7 +20,7 @@ #include "talloc.h" #include "mpvcore/mp_msg.h" -#include "mpvcore/options.h" +#include "options/options.h" #include "resolve.h" static void add_source(struct mp_resolve_result *res, const char *url, diff --git a/stream/resolve/resolve_quvi9.c b/stream/resolve/resolve_quvi9.c index ea96f521e3..62464be0b5 100644 --- a/stream/resolve/resolve_quvi9.c +++ b/stream/resolve/resolve_quvi9.c @@ -23,7 +23,7 @@ #include "talloc.h" #include "mpvcore/mp_msg.h" -#include "mpvcore/options.h" +#include "options/options.h" #include "mpvcore/playlist.h" #include "resolve.h" diff --git a/stream/stream.c b/stream/stream.c index 2429d55576..7ceecf390e 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -40,12 +40,12 @@ #include "mpvcore/mp_common.h" #include "mpvcore/bstr.h" #include "mpvcore/mp_msg.h" -#include "mpvcore/path.h" +#include "options/path.h" #include "osdep/timer.h" #include "stream.h" -#include "mpvcore/m_option.h" -#include "mpvcore/m_config.h" +#include "options/m_option.h" +#include "options/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_bluray.c b/stream/stream_bluray.c index f32e2b72d3..9f11a917d2 100644 --- a/stream/stream_bluray.c +++ b/stream/stream_bluray.c @@ -38,7 +38,7 @@ #include "config.h" #include "talloc.h" #include "mpvcore/mp_msg.h" -#include "mpvcore/m_option.h" +#include "options/m_option.h" #include "stream.h" #define BLURAY_SECTOR_SIZE 6144 diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index 678b06f343..48f5a7b465 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -42,7 +42,7 @@ #include "talloc.h" #include "stream.h" -#include "mpvcore/m_option.h" +#include "options/m_option.h" #include "libavutil/common.h" #include "compat/mpbswap.h" diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 71e9b87199..698c497d48 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -47,8 +47,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "osdep/io.h" #include "stream.h" -#include "mpvcore/m_option.h" -#include "mpvcore/path.h" +#include "options/m_option.h" +#include "options/path.h" #include "dvbin.h" diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index b006b52cc7..b3be35fd27 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -38,7 +38,7 @@ #define FIRST_PCM_AID 160 #include "stream.h" -#include "mpvcore/m_option.h" +#include "options/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 509e84801a..29087c93d9 100644 --- a/stream/stream_dvd.h +++ b/stream/stream_dvd.h @@ -26,7 +26,7 @@ #include #include #include "stream.h" -#include "mpvcore/m_option.h" +#include "options/m_option.h" typedef struct { dvd_reader_t *dvd; diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index 88c94f3f26..168091155d 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -28,10 +28,10 @@ #include -#include "mpvcore/options.h" +#include "options/options.h" #include "mpvcore/mp_msg.h" #include "input/input.h" -#include "mpvcore/m_option.h" +#include "options/m_option.h" #include "osdep/timer.h" #include "stream.h" #include "demux/demux.h" diff --git a/stream/stream_file.c b/stream/stream_file.c index dc53aeed82..73de4c266d 100644 --- a/stream/stream_file.c +++ b/stream/stream_file.c @@ -31,7 +31,7 @@ #include "mpvcore/mp_msg.h" #include "stream.h" -#include "mpvcore/m_option.h" +#include "options/m_option.h" struct priv { int fd; diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c index 1adf8177e4..8f82aedf05 100644 --- a/stream/stream_lavf.c +++ b/stream/stream_lavf.c @@ -21,10 +21,10 @@ #include #include "config.h" -#include "mpvcore/options.h" +#include "options/options.h" #include "mpvcore/mp_msg.h" #include "stream.h" -#include "mpvcore/m_option.h" +#include "options/m_option.h" #include "cookies.h" diff --git a/stream/stream_radio.c b/stream/stream_radio.c index 31b9d38bd9..b3fd501e33 100644 --- a/stream/stream_radio.c +++ b/stream/stream_radio.c @@ -42,7 +42,7 @@ #include #include "stream.h" -#include "mpvcore/m_option.h" +#include "options/m_option.h" #include "mpvcore/mp_msg.h" #include "stream_radio.h" diff --git a/stream/stream_rar.c b/stream/stream_rar.c index 8402517dc3..1cab4a8f48 100644 --- a/stream/stream_rar.c +++ b/stream/stream_rar.c @@ -35,7 +35,7 @@ #include "mpvcore/mp_msg.h" #include "stream.h" -#include "mpvcore/m_option.h" +#include "options/m_option.h" #include "rar.h" /* diff --git a/stream/stream_smb.c b/stream/stream_smb.c index 50f62fc1ae..2ec3c83d8d 100644 --- a/stream/stream_smb.c +++ b/stream/stream_smb.c @@ -25,7 +25,7 @@ #include "mpvcore/mp_msg.h" #include "stream.h" -#include "mpvcore/m_option.h" +#include "options/m_option.h" struct priv { int fd; diff --git a/stream/stream_tv.c b/stream/stream_tv.c index 89d22e9a3d..3bd18c3ffa 100644 --- a/stream/stream_tv.c +++ b/stream/stream_tv.c @@ -27,7 +27,7 @@ #include #include "stream.h" -#include "mpvcore/m_option.h" +#include "options/m_option.h" #include "tv.h" #include diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c index 20fab8d9e5..4b591aba46 100644 --- a/stream/stream_vcd.c +++ b/stream/stream_vcd.c @@ -26,7 +26,7 @@ #include "mpvcore/mp_msg.h" #include "stream.h" -#include "mpvcore/m_option.h" +#include "options/m_option.h" #include #include -- cgit v1.2.3