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/ --- audio/out/ao.c | 4 ++-- audio/out/ao.h | 4 ++-- audio/out/ao_alsa.c | 2 +- audio/out/ao_coreaudio.c | 4 ++-- audio/out/ao_coreaudio_utils.h | 2 +- audio/out/ao_dsound.c | 2 +- audio/out/ao_jack.c | 4 ++-- audio/out/ao_lavc.c | 6 +++--- audio/out/ao_null.c | 2 +- audio/out/ao_openal.c | 2 +- audio/out/ao_oss.c | 2 +- audio/out/ao_pcm.c | 2 +- audio/out/ao_portaudio.c | 4 ++-- audio/out/ao_pulse.c | 2 +- audio/out/ao_sdl.c | 2 +- audio/out/ao_sndio.c | 2 +- audio/out/ao_wasapi.c | 6 +++--- 17 files changed, 26 insertions(+), 26 deletions(-) (limited to 'audio/out') diff --git a/audio/out/ao.c b/audio/out/ao.c index 6434949cd9..ddd177400d 100644 --- a/audio/out/ao.c +++ b/audio/out/ao.c @@ -29,8 +29,8 @@ #include "options/options.h" #include "options/m_config.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/mpv_global.h" +#include "common/msg.h" +#include "common/global.h" extern const struct ao_driver audio_out_oss; extern const struct ao_driver audio_out_coreaudio; diff --git a/audio/out/ao.h b/audio/out/ao.h index dff9ad6a8b..81737e094d 100644 --- a/audio/out/ao.h +++ b/audio/out/ao.h @@ -21,8 +21,8 @@ #include -#include "mpvcore/bstr.h" -#include "mpvcore/mp_common.h" +#include "bstr/bstr.h" +#include "common/common.h" #include "audio/chmap.h" #include "audio/chmap_sel.h" diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c index 372b490e9f..a65b9b05ec 100644 --- a/audio/out/ao_alsa.c +++ b/audio/out/ao_alsa.c @@ -38,7 +38,7 @@ #include "config.h" #include "options/options.h" #include "options/m_option.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #define ALSA_PCM_NEW_HW_PARAMS_API #define ALSA_PCM_NEW_SW_PARAMS_API diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c index 2fb7976c67..4a4091daf9 100644 --- a/audio/out/ao_coreaudio.c +++ b/audio/out/ao_coreaudio.c @@ -40,8 +40,8 @@ #include "audio/format.h" #include "osdep/timer.h" #include "options/m_option.h" -#include "mpvcore/mp_ring.h" -#include "mpvcore/mp_msg.h" +#include "misc/ring.h" +#include "common/msg.h" #include "audio/out/ao_coreaudio_properties.h" #include "audio/out/ao_coreaudio_utils.h" diff --git a/audio/out/ao_coreaudio_utils.h b/audio/out/ao_coreaudio_utils.h index 296f1d2497..cf69248b47 100644 --- a/audio/out/ao_coreaudio_utils.h +++ b/audio/out/ao_coreaudio_utils.h @@ -22,7 +22,7 @@ #include #include #include -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "audio/out/ao.h" #define CA_CFSTR_ENCODING kCFStringEncodingASCII diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c index 1ace4093b4..26c7bb83ed 100644 --- a/audio/out/ao_dsound.c +++ b/audio/out/ao_dsound.c @@ -39,7 +39,7 @@ #include "audio/format.h" #include "ao.h" #include "audio/reorder_ch.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "osdep/timer.h" #include "options/m_option.h" diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c index 8c54796e2b..f4cb5c475e 100644 --- a/audio/out/ao_jack.c +++ b/audio/out/ao_jack.c @@ -29,14 +29,14 @@ #include #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "ao.h" #include "audio/format.h" #include "osdep/timer.h" #include "options/m_option.h" -#include "mpvcore/mp_ring.h" +#include "misc/ring.h" #include diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c index 713b952229..3e4ba01105 100644 --- a/audio/out/ao_lavc.c +++ b/audio/out/ao_lavc.c @@ -31,14 +31,14 @@ #include "compat/libav.h" #include "config.h" #include "options/options.h" -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "audio/format.h" #include "audio/fmt-conversion.h" #include "talloc.h" #include "ao.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" -#include "mpvcore/encode_lavc.h" +#include "common/encode_lavc.h" struct priv { uint8_t *buffer; diff --git a/audio/out/ao_null.c b/audio/out/ao_null.c index 282511ae40..7c912d94a4 100644 --- a/audio/out/ao_null.c +++ b/audio/out/ao_null.c @@ -31,7 +31,7 @@ #include "config.h" #include "osdep/timer.h" #include "options/m_option.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "audio/format.h" #include "ao.h" diff --git a/audio/out/ao_openal.c b/audio/out/ao_openal.c index c6c2e9e8b8..d613b74208 100644 --- a/audio/out/ao_openal.c +++ b/audio/out/ao_openal.c @@ -35,7 +35,7 @@ #include #endif -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "ao.h" #include "audio/format.h" diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c index 9ff7d1a165..574fcf6beb 100644 --- a/audio/out/ao_oss.c +++ b/audio/out/ao_oss.c @@ -36,7 +36,7 @@ #include "config.h" #include "options/options.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #if HAVE_SYS_SOUNDCARD_H #include diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c index 2a086c549f..14548d3be3 100644 --- a/audio/out/ao_pcm.c +++ b/audio/out/ao_pcm.c @@ -34,7 +34,7 @@ #include "audio/format.h" #include "audio/reorder_ch.h" #include "ao.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #ifdef __MINGW32__ // for GetFileType to detect pipes diff --git a/audio/out/ao_portaudio.c b/audio/out/ao_portaudio.c index 6e3d9680fd..8b4efe7944 100644 --- a/audio/out/ao_portaudio.c +++ b/audio/out/ao_portaudio.c @@ -28,8 +28,8 @@ #include "config.h" #include "options/m_option.h" #include "audio/format.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/mp_ring.h" +#include "common/msg.h" +#include "misc/ring.h" #include "ao.h" struct priv { diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c index 651589c34f..f3bce40574 100644 --- a/audio/out/ao_pulse.c +++ b/audio/out/ao_pulse.c @@ -28,7 +28,7 @@ #include "config.h" #include "audio/format.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "ao.h" #include "input/input.h" diff --git a/audio/out/ao_sdl.c b/audio/out/ao_sdl.c index dd2fb894be..ac1fd6febb 100644 --- a/audio/out/ao_sdl.c +++ b/audio/out/ao_sdl.c @@ -23,7 +23,7 @@ #include "audio/format.h" #include "talloc.h" #include "ao.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/m_option.h" #include "osdep/timer.h" diff --git a/audio/out/ao_sndio.c b/audio/out/ao_sndio.c index 6cf08cd095..75ea5d095b 100644 --- a/audio/out/ao_sndio.c +++ b/audio/out/ao_sndio.c @@ -23,7 +23,7 @@ #include #include "options/m_option.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "audio/format.h" #include "ao.h" diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c index b2ac1f2343..d70b66a493 100644 --- a/audio/out/ao_wasapi.c +++ b/audio/out/ao_wasapi.c @@ -31,10 +31,10 @@ #include "config.h" #include "options/m_option.h" -#include "mpvcore/m_config.h" +#include "common/m_config.h" #include "audio/format.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/mp_ring.h" +#include "common/msg.h" +#include "common/mp_ring.h" #include "ao.h" #ifndef BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE -- cgit v1.2.3