summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-17 02:02:25 +0100
committerwm4 <wm4@nowhere>2013-12-17 02:07:57 +0100
commiteb15151705d47d23da844449126cc6b4879f110e (patch)
tree661866ee9e73bc893c7963660aae01db503e99aa /audio
parent793f85945fc07db905e54390c065ae51b9eeef9b (diff)
downloadmpv-eb15151705d47d23da844449126cc6b4879f110e.tar.bz2
mpv-eb15151705d47d23da844449126cc6b4879f110e.tar.xz
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.
Diffstat (limited to 'audio')
-rw-r--r--audio/decode/ad_lavc.c2
-rw-r--r--audio/decode/ad_spdif.c2
-rw-r--r--audio/filter/af.c4
-rw-r--r--audio/filter/af.h2
-rw-r--r--audio/filter/af_bs2b.c2
-rw-r--r--audio/filter/af_export.c2
-rw-r--r--audio/filter/af_format.c2
-rw-r--r--audio/filter/af_lavfi.c2
-rw-r--r--audio/filter/af_lavrresample.c2
-rw-r--r--audio/filter/af_scaletempo.c2
-rw-r--r--audio/out/ao.c4
-rw-r--r--audio/out/ao_alsa.c4
-rw-r--r--audio/out/ao_coreaudio.c2
-rw-r--r--audio/out/ao_dsound.c2
-rw-r--r--audio/out/ao_jack.c2
-rw-r--r--audio/out/ao_lavc.c2
-rw-r--r--audio/out/ao_null.c2
-rw-r--r--audio/out/ao_openal.c2
-rw-r--r--audio/out/ao_oss.c2
-rw-r--r--audio/out/ao_pcm.c2
-rw-r--r--audio/out/ao_portaudio.c2
-rw-r--r--audio/out/ao_rsound.c2
-rw-r--r--audio/out/ao_sdl.c2
-rw-r--r--audio/out/ao_sndio.c2
-rw-r--r--audio/out/ao_wasapi.c2
25 files changed, 28 insertions, 28 deletions
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index f972bc581f..8b2c2d1727 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -32,7 +32,7 @@
#include "mpvcore/av_common.h"
#include "mpvcore/codecs.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/av_opts.h"
#include "ad.h"
diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c
index 8c3c7c3ea7..fdc12772b8 100644
--- a/audio/decode/ad_spdif.c
+++ b/audio/decode/ad_spdif.c
@@ -28,7 +28,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/av_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "ad.h"
#define OUTBUF_SIZE 65536
diff --git a/audio/filter/af.c b/audio/filter/af.c
index e2f712d09e..dfe1666e0a 100644
--- a/audio/filter/af.c
+++ b/audio/filter/af.c
@@ -22,8 +22,8 @@
#include <string.h>
#include <assert.h>
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_config.h"
+#include "options/m_option.h"
+#include "options/m_config.h"
#include "af.h"
diff --git a/audio/filter/af.h b/audio/filter/af.h
index fb7f2b3b1d..260d4dae7e 100644
--- a/audio/filter/af.h
+++ b/audio/filter/af.h
@@ -25,7 +25,7 @@
#include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "audio/format.h"
#include "audio/chmap.h"
#include "audio/audio.h"
diff --git a/audio/filter/af_bs2b.c b/audio/filter/af_bs2b.c
index aaada29a74..48df9197dc 100644
--- a/audio/filter/af_bs2b.c
+++ b/audio/filter/af_bs2b.c
@@ -27,7 +27,7 @@
#include <string.h>
#include "af.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
/// Internal specific data of the filter
struct af_bs2b {
diff --git a/audio/filter/af_export.c b/audio/filter/af_export.c
index d39154755b..bbea56cab9 100644
--- a/audio/filter/af_export.c
+++ b/audio/filter/af_export.c
@@ -43,7 +43,7 @@
#include "talloc.h"
#include "af.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#define DEF_SZ 512 // default buffer size (in samples)
#define SHARED_FILE "mpv-af_export" /* default file name
diff --git a/audio/filter/af_format.c b/audio/filter/af_format.c
index 552587b56e..17af1c43c9 100644
--- a/audio/filter/af_format.c
+++ b/audio/filter/af_format.c
@@ -19,7 +19,7 @@
#include <libavutil/common.h>
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "audio/format.h"
#include "af.h"
diff --git a/audio/filter/af_lavfi.c b/audio/filter/af_lavfi.c
index ab5b8d5495..e764d4fae8 100644
--- a/audio/filter/af_lavfi.c
+++ b/audio/filter/af_lavfi.c
@@ -38,7 +38,7 @@
#include "audio/fmt-conversion.h"
#include "af.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/av_opts.h"
#define IS_LIBAV_FORK (LIBAVFILTER_VERSION_MICRO < 100)
diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c
index 7386c27fa6..65d380e873 100644
--- a/audio/filter/af_lavrresample.c
+++ b/audio/filter/af_lavrresample.c
@@ -55,7 +55,7 @@
#endif
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/av_opts.h"
#include "audio/filter/af.h"
#include "audio/fmt-conversion.h"
diff --git a/audio/filter/af_scaletempo.c b/audio/filter/af_scaletempo.c
index 960aaf8c2e..c54fe44e36 100644
--- a/audio/filter/af_scaletempo.c
+++ b/audio/filter/af_scaletempo.c
@@ -39,7 +39,7 @@
#include "mpvcore/mp_common.h"
#include "af.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
// Data for specific instances of this filter
typedef struct af_scaletempo_s
diff --git a/audio/out/ao.c b/audio/out/ao.c
index 9c09730ec8..6434949cd9 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -27,8 +27,8 @@
#include "ao.h"
#include "audio/format.h"
-#include "mpvcore/options.h"
-#include "mpvcore/m_config.h"
+#include "options/options.h"
+#include "options/m_config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/mpv_global.h"
diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c
index b8de922cb9..372b490e9f 100644
--- a/audio/out/ao_alsa.c
+++ b/audio/out/ao_alsa.c
@@ -36,8 +36,8 @@
#include <string.h>
#include "config.h"
-#include "mpvcore/options.h"
-#include "mpvcore/m_option.h"
+#include "options/options.h"
+#include "options/m_option.h"
#include "mpvcore/mp_msg.h"
#define ALSA_PCM_NEW_HW_PARAMS_API
diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c
index d61ce63d01..2fb7976c67 100644
--- a/audio/out/ao_coreaudio.c
+++ b/audio/out/ao_coreaudio.c
@@ -39,7 +39,7 @@
#include "ao.h"
#include "audio/format.h"
#include "osdep/timer.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/mp_ring.h"
#include "mpvcore/mp_msg.h"
#include "audio/out/ao_coreaudio_properties.h"
diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c
index ec5e83bd50..1ace4093b4 100644
--- a/audio/out/ao_dsound.c
+++ b/audio/out/ao_dsound.c
@@ -41,7 +41,7 @@
#include "audio/reorder_ch.h"
#include "mpvcore/mp_msg.h"
#include "osdep/timer.h"
-#include "mpvcore/m_option.h"
+#include "options/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 8a55a54239..8c54796e2b 100644
--- a/audio/out/ao_jack.c
+++ b/audio/out/ao_jack.c
@@ -34,7 +34,7 @@
#include "ao.h"
#include "audio/format.h"
#include "osdep/timer.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/mp_ring.h"
diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c
index 3b1bb20de6..713b952229 100644
--- a/audio/out/ao_lavc.c
+++ b/audio/out/ao_lavc.c
@@ -30,7 +30,7 @@
#include "compat/libav.h"
#include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_common.h"
#include "audio/format.h"
#include "audio/fmt-conversion.h"
diff --git a/audio/out/ao_null.c b/audio/out/ao_null.c
index 14ff16b5d7..282511ae40 100644
--- a/audio/out/ao_null.c
+++ b/audio/out/ao_null.c
@@ -30,7 +30,7 @@
#include "config.h"
#include "osdep/timer.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/mp_msg.h"
#include "audio/format.h"
#include "ao.h"
diff --git a/audio/out/ao_openal.c b/audio/out/ao_openal.c
index c126852389..c6c2e9e8b8 100644
--- a/audio/out/ao_openal.c
+++ b/audio/out/ao_openal.c
@@ -40,7 +40,7 @@
#include "ao.h"
#include "audio/format.h"
#include "osdep/timer.h"
-#include "mpvcore/m_option.h"
+#include "options/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 3f37b34b60..9ff7d1a165 100644
--- a/audio/out/ao_oss.c
+++ b/audio/out/ao_oss.c
@@ -35,7 +35,7 @@
#include <string.h>
#include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_msg.h"
#if HAVE_SYS_SOUNDCARD_H
diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c
index 1d88fc6665..2a086c549f 100644
--- a/audio/out/ao_pcm.c
+++ b/audio/out/ao_pcm.c
@@ -30,7 +30,7 @@
#include "talloc.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "audio/format.h"
#include "audio/reorder_ch.h"
#include "ao.h"
diff --git a/audio/out/ao_portaudio.c b/audio/out/ao_portaudio.c
index fad1dc12d8..6e3d9680fd 100644
--- a/audio/out/ao_portaudio.c
+++ b/audio/out/ao_portaudio.c
@@ -26,7 +26,7 @@
#include <portaudio.h>
#include "config.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "audio/format.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/mp_ring.h"
diff --git a/audio/out/ao_rsound.c b/audio/out/ao_rsound.c
index 4340deccba..6bd99030a1 100644
--- a/audio/out/ao_rsound.c
+++ b/audio/out/ao_rsound.c
@@ -29,7 +29,7 @@
#include "talloc.h"
-#include "mpvcore/m_option.h"
+#include "options/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 c2b1c9d947..dd2fb894be 100644
--- a/audio/out/ao_sdl.c
+++ b/audio/out/ao_sdl.c
@@ -24,7 +24,7 @@
#include "talloc.h"
#include "ao.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "osdep/timer.h"
#include <libavutil/fifo.h>
diff --git a/audio/out/ao_sndio.c b/audio/out/ao_sndio.c
index cfe0616943..6cf08cd095 100644
--- a/audio/out/ao_sndio.c
+++ b/audio/out/ao_sndio.c
@@ -22,7 +22,7 @@
#include <errno.h>
#include <sndio.h>
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/mp_msg.h"
#include "audio/format.h"
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c
index f1032f1c36..b2ac1f2343 100644
--- a/audio/out/ao_wasapi.c
+++ b/audio/out/ao_wasapi.c
@@ -30,7 +30,7 @@
#include <avrt.h>
#include "config.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/m_config.h"
#include "audio/format.h"
#include "mpvcore/mp_msg.h"