summaryrefslogtreecommitdiffstats
path: root/audio/out
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-08-06 22:41:30 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-08-06 22:52:31 +0200
commit406241005e3d897b30a5b168a16ad61f0996c43c (patch)
tree7884ce5d2d4f5aaa253ffd82e567d13bdd2860af /audio/out
parentbc27f946c27e33933a3a696cade78a04902c8dce (diff)
downloadmpv-406241005e3d897b30a5b168a16ad61f0996c43c.tar.bz2
mpv-406241005e3d897b30a5b168a16ad61f0996c43c.tar.xz
core: move contents to mpvcore (2/2)
Followup commit. Fixes all the files references.
Diffstat (limited to 'audio/out')
-rw-r--r--audio/out/ao.c8
-rw-r--r--audio/out/ao.h4
-rw-r--r--audio/out/ao_alsa.c6
-rw-r--r--audio/out/ao_coreaudio.c6
-rw-r--r--audio/out/ao_coreaudio_utils.h2
-rw-r--r--audio/out/ao_dsound.c4
-rw-r--r--audio/out/ao_jack.c6
-rw-r--r--audio/out/ao_lavc.c8
-rw-r--r--audio/out/ao_openal.c4
-rw-r--r--audio/out/ao_oss.c4
-rw-r--r--audio/out/ao_pcm.c4
-rw-r--r--audio/out/ao_portaudio.c6
-rw-r--r--audio/out/ao_pulse.c4
-rw-r--r--audio/out/ao_rsound.c2
-rw-r--r--audio/out/ao_sdl.c4
-rw-r--r--audio/out/ao_wasapi.c8
16 files changed, 40 insertions, 40 deletions
diff --git a/audio/out/ao.c b/audio/out/ao.c
index 49fffb657d..5f5ad4d38c 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -27,10 +27,10 @@
#include "ao.h"
#include "audio/format.h"
-#include "core/options.h"
-#include "core/m_config.h"
-#include "core/mp_msg.h"
-#include "core/mpv_global.h"
+#include "mpvcore/options.h"
+#include "mpvcore/m_config.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mpv_global.h"
// there are some globals:
struct ao *global_ao;
diff --git a/audio/out/ao.h b/audio/out/ao.h
index 65e5a3fc6b..673a252ccb 100644
--- a/audio/out/ao.h
+++ b/audio/out/ao.h
@@ -21,8 +21,8 @@
#include <stdbool.h>
-#include "core/bstr.h"
-#include "core/mp_common.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_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 9b1c32181d..63309c3dbd 100644
--- a/audio/out/ao_alsa.c
+++ b/audio/out/ao_alsa.c
@@ -36,10 +36,10 @@
#include <alloca.h>
#include "config.h"
-#include "core/options.h"
-#include "core/m_option.h"
+#include "mpvcore/options.h"
+#include "mpvcore/m_option.h"
#include "audio/mixer.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_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 59e1f82f36..a7e7b11966 100644
--- a/audio/out/ao_coreaudio.c
+++ b/audio/out/ao_coreaudio.c
@@ -36,9 +36,9 @@
#include "ao.h"
#include "audio/format.h"
#include "osdep/timer.h"
-#include "core/m_option.h"
-#include "core/mp_ring.h"
-#include "core/mp_msg.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/mp_ring.h"
+#include "mpvcore/mp_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 96383f9870..296f1d2497 100644
--- a/audio/out/ao_coreaudio_utils.h
+++ b/audio/out/ao_coreaudio_utils.h
@@ -22,7 +22,7 @@
#include <AudioToolbox/AudioToolbox.h>
#include <inttypes.h>
#include <stdbool.h>
-#include "core/mp_msg.h"
+#include "mpvcore/mp_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 4e85460243..039df2a7ed 100644
--- a/audio/out/ao_dsound.c
+++ b/audio/out/ao_dsound.c
@@ -39,9 +39,9 @@
#include "audio/format.h"
#include "ao.h"
#include "audio/reorder_ch.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
#include "osdep/timer.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
/**
\todo use the definitions from the win32 api headers when they define these
diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c
index ba855cce23..579dee2631 100644
--- a/audio/out/ao_jack.c
+++ b/audio/out/ao_jack.c
@@ -27,14 +27,14 @@
#include <unistd.h>
#include "config.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
#include "ao.h"
#include "audio/format.h"
#include "osdep/timer.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
-#include "core/mp_ring.h"
+#include "mpvcore/mp_ring.h"
#include <jack/jack.h>
diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c
index e72c6c903d..0631d54aea 100644
--- a/audio/out/ao_lavc.c
+++ b/audio/out/ao_lavc.c
@@ -28,15 +28,15 @@
#include "compat/libav.h"
#include "config.h"
-#include "core/options.h"
-#include "core/mp_common.h"
+#include "mpvcore/options.h"
+#include "mpvcore/mp_common.h"
#include "audio/format.h"
#include "audio/reorder_ch.h"
#include "talloc.h"
#include "ao.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
-#include "core/encode_lavc.h"
+#include "mpvcore/encode_lavc.h"
static const char *sample_padding_signed = "\x00\x00\x00\x00";
static const char *sample_padding_u8 = "\x80";
diff --git a/audio/out/ao_openal.c b/audio/out/ao_openal.c
index ccc73ba9f5..1f9115a471 100644
--- a/audio/out/ao_openal.c
+++ b/audio/out/ao_openal.c
@@ -35,12 +35,12 @@
#include <AL/alext.h>
#endif
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
#include "ao.h"
#include "audio/format.h"
#include "osdep/timer.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
#define MAX_CHANS MP_NUM_CHANNELS
#define NUM_BUF 128
diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c
index 08d80bf7fd..0e17bcb632 100644
--- a/audio/out/ao_oss.c
+++ b/audio/out/ao_oss.c
@@ -34,8 +34,8 @@
#include <string.h>
#include "config.h"
-#include "core/options.h"
-#include "core/mp_msg.h"
+#include "mpvcore/options.h"
+#include "mpvcore/mp_msg.h"
#include "audio/mixer.h"
#ifdef HAVE_SYS_SOUNDCARD_H
diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c
index 2b6a89e78b..207b75fddd 100644
--- a/audio/out/ao_pcm.c
+++ b/audio/out/ao_pcm.c
@@ -28,11 +28,11 @@
#include "talloc.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
#include "audio/format.h"
#include "audio/reorder_ch.h"
#include "ao.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
#ifdef __MINGW32__
// for GetFileType to detect pipes
diff --git a/audio/out/ao_portaudio.c b/audio/out/ao_portaudio.c
index ea8d8f3e88..b80549398f 100644
--- a/audio/out/ao_portaudio.c
+++ b/audio/out/ao_portaudio.c
@@ -26,10 +26,10 @@
#include <portaudio.h>
#include "config.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
#include "audio/format.h"
-#include "core/mp_msg.h"
-#include "core/mp_ring.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mp_ring.h"
#include "ao.h"
struct priv {
diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c
index 382a4d2dcc..0a7d5347ba 100644
--- a/audio/out/ao_pulse.c
+++ b/audio/out/ao_pulse.c
@@ -28,9 +28,9 @@
#include "config.h"
#include "audio/format.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
#include "ao.h"
-#include "core/input/input.h"
+#include "mpvcore/input/input.h"
#define PULSE_CLIENT_NAME "mpv"
diff --git a/audio/out/ao_rsound.c b/audio/out/ao_rsound.c
index db89ad52c6..5bfdbcef0f 100644
--- a/audio/out/ao_rsound.c
+++ b/audio/out/ao_rsound.c
@@ -29,7 +29,7 @@
#include "talloc.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
#include "osdep/timer.h"
#include "audio/format.h"
#include "ao.h"
diff --git a/audio/out/ao_sdl.c b/audio/out/ao_sdl.c
index b5368066d8..231b40681a 100644
--- a/audio/out/ao_sdl.c
+++ b/audio/out/ao_sdl.c
@@ -23,8 +23,8 @@
#include "audio/format.h"
#include "talloc.h"
#include "ao.h"
-#include "core/mp_msg.h"
-#include "core/m_option.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/m_option.h"
#include "osdep/timer.h"
#include <libavutil/fifo.h>
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c
index 03a733ce33..d5860ae3ea 100644
--- a/audio/out/ao_wasapi.c
+++ b/audio/out/ao_wasapi.c
@@ -28,11 +28,11 @@
#include <avrt.h>
#include "config.h"
-#include "core/m_option.h"
-#include "core/m_config.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/m_config.h"
#include "audio/format.h"
-#include "core/mp_msg.h"
-#include "core/mp_ring.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mp_ring.h"
#include "ao.h"
#ifndef BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE