summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-09 01:06:43 +0100
committerwm4 <wm4@nowhere>2012-11-12 20:08:18 +0100
commit4873b32c5959c988af1769529ff72e3fd62fba82 (patch)
treee18fbd7eef54de6071969689aa5c31d6ea1f0963 /audio
parentd4bdd0473d6f43132257c9fb3848d829755167a3 (diff)
downloadmpv-4873b32c5959c988af1769529ff72e3fd62fba82.tar.bz2
mpv-4873b32c5959c988af1769529ff72e3fd62fba82.tar.xz
Rename directories, move files (step 2 of 2)
Finish renaming directories and moving files. Adjust all include statements to make the previous commit compile. The two commits are separate, because git is bad at tracking renames and content changes at the same time. Also take this as an opportunity to remove the separation between "common" and "mplayer" sources in the Makefile. ("common" used to be shared between mplayer and mencoder.)
Diffstat (limited to 'audio')
-rw-r--r--audio/decode/ad.c4
-rw-r--r--audio/decode/ad.h4
-rw-r--r--audio/decode/ad_dvdpcm.c2
-rw-r--r--audio/decode/ad_internal.h8
-rw-r--r--audio/decode/ad_lavc.c8
-rw-r--r--audio/decode/ad_pcm.c4
-rw-r--r--audio/decode/ad_spdif.c2
-rw-r--r--audio/decode/dec_audio.c14
-rw-r--r--audio/decode/dec_audio.h2
-rw-r--r--audio/filter/af.h7
-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_lavcac3enc.c2
-rw-r--r--audio/filter/af_scaletempo.c2
-rw-r--r--audio/format.c2
-rw-r--r--audio/format.h2
-rw-r--r--audio/mixer.c6
-rw-r--r--audio/mixer.h3
-rw-r--r--audio/out/ao.c4
-rw-r--r--audio/out/ao.h2
-rw-r--r--audio/out/ao_alsa.c10
-rw-r--r--audio/out/ao_coreaudio.c8
-rw-r--r--audio/out/ao_dsound.c8
-rw-r--r--audio/out/ao_jack.c8
-rw-r--r--audio/out/ao_lavc.c15
-rw-r--r--audio/out/ao_null.c4
-rw-r--r--audio/out/ao_openal.c8
-rw-r--r--audio/out/ao_oss.c8
-rw-r--r--audio/out/ao_pcm.c10
-rw-r--r--audio/out/ao_portaudio.c8
-rw-r--r--audio/out/ao_pulse.c8
-rw-r--r--audio/out/ao_rsound.c6
-rw-r--r--audio/out/audio_out_internal.h2
-rw-r--r--audio/reorder_ch.c4
35 files changed, 93 insertions, 98 deletions
diff --git a/audio/decode/ad.c b/audio/decode/ad.c
index 93cebed86d..ac344636e6 100644
--- a/audio/decode/ad.c
+++ b/audio/decode/ad.c
@@ -25,8 +25,8 @@
#include "config.h"
#include "stream/stream.h"
-#include "libmpdemux/demuxer.h"
-#include "libmpdemux/stheader.h"
+#include "demux/demux.h"
+#include "demux/stheader.h"
#include "ad.h"
/* Missed vorbis, mad, dshow */
diff --git a/audio/decode/ad.h b/audio/decode/ad.h
index 5396085d04..2de0e0641a 100644
--- a/audio/decode/ad.h
+++ b/audio/decode/ad.h
@@ -19,8 +19,8 @@
#ifndef MPLAYER_AD_H
#define MPLAYER_AD_H
-#include "mpc_info.h"
-#include "libmpdemux/stheader.h"
+#include "core/mpc_info.h"
+#include "demux/stheader.h"
typedef struct mp_codec_info ad_info_t;
diff --git a/audio/decode/ad_dvdpcm.c b/audio/decode/ad_dvdpcm.c
index 41f6a1426d..3b12c71c12 100644
--- a/audio/decode/ad_dvdpcm.c
+++ b/audio/decode/ad_dvdpcm.c
@@ -21,7 +21,7 @@
#include <unistd.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "ad_internal.h"
static const ad_info_t info =
diff --git a/audio/decode/ad_internal.h b/audio/decode/ad_internal.h
index 4cffc95126..1fed350b98 100644
--- a/audio/decode/ad_internal.h
+++ b/audio/decode/ad_internal.h
@@ -19,12 +19,12 @@
#ifndef MPLAYER_AD_INTERNAL_H
#define MPLAYER_AD_INTERNAL_H
-#include "codec-cfg.h"
-#include "libaf/format.h"
+#include "core/codec-cfg.h"
+#include "audio/format.h"
#include "stream/stream.h"
-#include "libmpdemux/demuxer.h"
-#include "libmpdemux/stheader.h"
+#include "demux/demux.h"
+#include "demux/stheader.h"
#include "ad.h"
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index 2eacfadb8f..2342a6985f 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -28,13 +28,13 @@
#include "talloc.h"
#include "config.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
#include "ad_internal.h"
-#include "libaf/reorder_ch.h"
+#include "audio/reorder_ch.h"
-#include "mpbswap.h"
+#include "compat/mpbswap.h"
static const ad_info_t info =
{
diff --git a/audio/decode/ad_pcm.c b/audio/decode/ad_pcm.c
index c265dfcd56..01500b1274 100644
--- a/audio/decode/ad_pcm.c
+++ b/audio/decode/ad_pcm.c
@@ -26,8 +26,8 @@
#include "talloc.h"
#include "config.h"
#include "ad_internal.h"
-#include "libaf/format.h"
-#include "libaf/reorder_ch.h"
+#include "audio/format.h"
+#include "audio/reorder_ch.h"
static const ad_info_t info = {
"Uncompressed PCM audio decoder",
diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c
index 877bc99317..c22280cbf0 100644
--- a/audio/decode/ad_spdif.c
+++ b/audio/decode/ad_spdif.c
@@ -23,7 +23,7 @@
#include <libavutil/opt.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "ad_internal.h"
static const ad_info_t info = {
diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c
index 2602352e52..1444d39009 100644
--- a/audio/decode/dec_audio.c
+++ b/audio/decode/dec_audio.c
@@ -22,20 +22,20 @@
#include <assert.h>
#include "config.h"
-#include "mp_msg.h"
-#include "bstr.h"
+#include "core/mp_msg.h"
+#include "core/bstr.h"
#include "stream/stream.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
-#include "codec-cfg.h"
-#include "libmpdemux/stheader.h"
+#include "core/codec-cfg.h"
+#include "demux/stheader.h"
#include "dec_audio.h"
#include "ad.h"
-#include "libaf/format.h"
+#include "audio/format.h"
-#include "libaf/af.h"
+#include "audio/filter/af.h"
int fakemono = 0;
diff --git a/audio/decode/dec_audio.h b/audio/decode/dec_audio.h
index 0d4baf0666..986b85f22a 100644
--- a/audio/decode/dec_audio.h
+++ b/audio/decode/dec_audio.h
@@ -19,7 +19,7 @@
#ifndef MPLAYER_DEC_AUDIO_H
#define MPLAYER_DEC_AUDIO_H
-#include "libmpdemux/stheader.h"
+#include "demux/stheader.h"
struct bstr;
diff --git a/audio/filter/af.h b/audio/filter/af.h
index edce49a978..31abe1edee 100644
--- a/audio/filter/af.h
+++ b/audio/filter/af.h
@@ -23,11 +23,10 @@
#include "config.h"
-#include "options.h"
-#include "libaf/format.h"
+#include "core/options.h"
+#include "audio/format.h"
#include "control.h"
-#include "cpudetect.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
struct af_instance;
diff --git a/audio/filter/af_bs2b.c b/audio/filter/af_bs2b.c
index ccbf3794c5..aebcc3b201 100644
--- a/audio/filter/af_bs2b.c
+++ b/audio/filter/af_bs2b.c
@@ -27,7 +27,7 @@
#include <string.h>
#include "af.h"
-#include "subopt-helper.h"
+#include "core/subopt-helper.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 441ec31ac3..2e25d8a642 100644
--- a/audio/filter/af_export.c
+++ b/audio/filter/af_export.c
@@ -38,7 +38,7 @@
#include <fcntl.h>
#include "af.h"
-#include "path.h"
+#include "core/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 4ac9caaa85..6192091f5a 100644
--- a/audio/filter/af_format.c
+++ b/audio/filter/af_format.c
@@ -30,7 +30,7 @@
#include "config.h"
#include "af.h"
-#include "mpbswap.h"
+#include "compat/mpbswap.h"
/* Functions used by play to convert the input audio to the correct
format */
diff --git a/audio/filter/af_lavcac3enc.c b/audio/filter/af_lavcac3enc.c
index ad78266ad3..b54f5bf61e 100644
--- a/audio/filter/af_lavcac3enc.c
+++ b/audio/filter/af_lavcac3enc.c
@@ -32,7 +32,7 @@
#include "config.h"
#include "af.h"
-#include "reorder_ch.h"
+#include "audio/reorder_ch.h"
#define AC3_MAX_CHANNELS 6
diff --git a/audio/filter/af_scaletempo.c b/audio/filter/af_scaletempo.c
index 0bbc220997..cf326fedfb 100644
--- a/audio/filter/af_scaletempo.c
+++ b/audio/filter/af_scaletempo.c
@@ -38,7 +38,7 @@
#include "af.h"
#include "libavutil/common.h"
-#include "subopt-helper.h"
+#include "core/subopt-helper.h"
// Data for specific instances of this filter
typedef struct af_scaletempo_s
diff --git a/audio/format.c b/audio/format.c
index 88d66522a0..4ca7307ccf 100644
--- a/audio/format.c
+++ b/audio/format.c
@@ -24,7 +24,7 @@
#include <inttypes.h>
#include <limits.h>
-#include "af.h"
+#include "audio/filter/af.h"
int af_fmt2bits(int format)
{
diff --git a/audio/format.h b/audio/format.h
index e60c0789b9..a3edcad20c 100644
--- a/audio/format.h
+++ b/audio/format.h
@@ -25,7 +25,7 @@
#include <sys/types.h>
#include "config.h"
-#include "bstr.h"
+#include "core/bstr.h"
// Endianness
#define AF_FORMAT_BE (0<<0) // Big Endian
diff --git a/audio/mixer.c b/audio/mixer.c
index 2f9505a1ae..985ccb6516 100644
--- a/audio/mixer.c
+++ b/audio/mixer.c
@@ -21,9 +21,9 @@
#include <libavutil/common.h>
#include "config.h"
-#include "libao2/audio_out.h"
-#include "libaf/af.h"
-#include "mp_msg.h"
+#include "audio/out/ao.h"
+#include "audio/filter/af.h"
+#include "core/mp_msg.h"
#include "mixer.h"
diff --git a/audio/mixer.h b/audio/mixer.h
index ba90d0881c..3de92e1e03 100644
--- a/audio/mixer.h
+++ b/audio/mixer.h
@@ -21,9 +21,6 @@
#include <stdbool.h>
-#include "libaf/af.h"
-#include "libao2/audio_out.h"
-
enum {
SOFTVOL_NO = 0,
SOFTVOL_YES = 1,
diff --git a/audio/out/ao.c b/audio/out/ao.c
index ab8e60b753..915af93793 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -24,9 +24,9 @@
#include "talloc.h"
#include "config.h"
-#include "audio_out.h"
+#include "ao.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
// there are some globals:
struct ao *global_ao;
diff --git a/audio/out/ao.h b/audio/out/ao.h
index 9e172fd06c..2a7d15ae08 100644
--- a/audio/out/ao.h
+++ b/audio/out/ao.h
@@ -21,7 +21,7 @@
#include <stdbool.h>
-#include "bstr.h"
+#include "core/bstr.h"
#define CONTROL_OK 1
#define CONTROL_TRUE 1
diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c
index 27119112cb..cd50a1c1d5 100644
--- a/audio/out/ao_alsa.c
+++ b/audio/out/ao_alsa.c
@@ -36,18 +36,18 @@
#include <alloca.h>
#include "config.h"
-#include "subopt-helper.h"
-#include "mixer.h"
-#include "mp_msg.h"
+#include "core/subopt-helper.h"
+#include "audio/mixer.h"
+#include "core/mp_msg.h"
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
#include <alsa/asoundlib.h>
-#include "audio_out.h"
+#include "ao.h"
#include "audio_out_internal.h"
-#include "libaf/format.h"
+#include "audio/format.h"
static const ao_info_t info =
{
diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c
index 146cfd2a22..850a6b2086 100644
--- a/audio/out/ao_coreaudio.c
+++ b/audio/out/ao_coreaudio.c
@@ -46,14 +46,14 @@
#include <unistd.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
-#include "audio_out.h"
+#include "ao.h"
#include "audio_out_internal.h"
-#include "libaf/format.h"
+#include "audio/format.h"
#include "osdep/timer.h"
#include "libavutil/fifo.h"
-#include "subopt-helper.h"
+#include "core/subopt-helper.h"
static const ao_info_t info =
{
diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c
index f2f44dd401..8d3124122c 100644
--- a/audio/out/ao_dsound.c
+++ b/audio/out/ao_dsound.c
@@ -33,12 +33,12 @@
#include <math.h>
#include "config.h"
-#include "libaf/format.h"
-#include "audio_out.h"
+#include "audio/format.h"
+#include "ao.h"
#include "audio_out_internal.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "osdep/timer.h"
-#include "subopt-helper.h"
+#include "core/subopt-helper.h"
static const ao_info_t info =
diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c
index b30f99a14e..2762954040 100644
--- a/audio/out/ao_jack.c
+++ b/audio/out/ao_jack.c
@@ -27,13 +27,13 @@
#include <unistd.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
-#include "audio_out.h"
+#include "ao.h"
#include "audio_out_internal.h"
-#include "libaf/format.h"
+#include "audio/format.h"
#include "osdep/timer.h"
-#include "subopt-helper.h"
+#include "core/subopt-helper.h"
#include "libavutil/fifo.h"
diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c
index ef76db2717..08e1aa5555 100644
--- a/audio/out/ao_lavc.c
+++ b/audio/out/ao_lavc.c
@@ -27,16 +27,15 @@
#include <libavutil/audioconvert.h>
#include "config.h"
-#include "options.h"
-#include "mpcommon.h"
-#include "fmt-conversion.h"
-#include "libaf/format.h"
-#include "libaf/reorder_ch.h"
+#include "core/options.h"
+#include "core/mp_common.h"
+#include "audio/format.h"
+#include "audio/reorder_ch.h"
#include "talloc.h"
-#include "audio_out.h"
-#include "mp_msg.h"
+#include "ao.h"
+#include "core/mp_msg.h"
-#include "encode_lavc.h"
+#include "core/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_null.c b/audio/out/ao_null.c
index 87f11a51b6..102f0a7013 100644
--- a/audio/out/ao_null.c
+++ b/audio/out/ao_null.c
@@ -25,8 +25,8 @@
#include "config.h"
#include "osdep/timer.h"
-#include "libaf/format.h"
-#include "audio_out.h"
+#include "audio/format.h"
+#include "ao.h"
struct priv {
unsigned last_time;
diff --git a/audio/out/ao_openal.c b/audio/out/ao_openal.c
index e5a40a769d..157cf93ac4 100644
--- a/audio/out/ao_openal.c
+++ b/audio/out/ao_openal.c
@@ -35,13 +35,13 @@
#include <AL/alext.h>
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
-#include "audio_out.h"
+#include "ao.h"
#include "audio_out_internal.h"
-#include "libaf/format.h"
+#include "audio/format.h"
#include "osdep/timer.h"
-#include "subopt-helper.h"
+#include "core/subopt-helper.h"
static const ao_info_t info =
{
diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c
index 9d4dde4837..ff8f8a1840 100644
--- a/audio/out/ao_oss.c
+++ b/audio/out/ao_oss.c
@@ -31,8 +31,8 @@
#include <string.h>
#include "config.h"
-#include "mp_msg.h"
-#include "mixer.h"
+#include "core/mp_msg.h"
+#include "audio/mixer.h"
#ifdef HAVE_SYS_SOUNDCARD_H
#include <sys/soundcard.h>
@@ -42,9 +42,9 @@
#endif
#endif
-#include "libaf/format.h"
+#include "audio/format.h"
-#include "audio_out.h"
+#include "ao.h"
#include "audio_out_internal.h"
static const ao_info_t info =
diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c
index 0b1c527e89..f0fd390c8e 100644
--- a/audio/out/ao_pcm.c
+++ b/audio/out/ao_pcm.c
@@ -28,11 +28,11 @@
#include "talloc.h"
-#include "subopt-helper.h"
-#include "libaf/format.h"
-#include "libaf/reorder_ch.h"
-#include "audio_out.h"
-#include "mp_msg.h"
+#include "core/subopt-helper.h"
+#include "audio/format.h"
+#include "audio/reorder_ch.h"
+#include "ao.h"
+#include "core/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 36b08f8288..b0744e8f8a 100644
--- a/audio/out/ao_portaudio.c
+++ b/audio/out/ao_portaudio.c
@@ -26,10 +26,10 @@
#include <portaudio.h>
#include "config.h"
-#include "subopt-helper.h"
-#include "libaf/format.h"
-#include "mp_msg.h"
-#include "audio_out.h"
+#include "core/subopt-helper.h"
+#include "audio/format.h"
+#include "core/mp_msg.h"
+#include "ao.h"
struct priv {
PaStream *stream;
diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c
index 1d2ebc5281..539dbfa640 100644
--- a/audio/out/ao_pulse.c
+++ b/audio/out/ao_pulse.c
@@ -27,10 +27,10 @@
#include <pulse/pulseaudio.h>
#include "config.h"
-#include "libaf/format.h"
-#include "mp_msg.h"
-#include "audio_out.h"
-#include "input/input.h"
+#include "audio/format.h"
+#include "core/mp_msg.h"
+#include "ao.h"
+#include "core/input/input.h"
#define PULSE_CLIENT_NAME "mpv"
diff --git a/audio/out/ao_rsound.c b/audio/out/ao_rsound.c
index 8232aad865..bf77b1e4c2 100644
--- a/audio/out/ao_rsound.c
+++ b/audio/out/ao_rsound.c
@@ -29,10 +29,10 @@
#include "talloc.h"
-#include "subopt-helper.h"
+#include "core/subopt-helper.h"
#include "osdep/timer.h"
-#include "libaf/format.h"
-#include "audio_out.h"
+#include "audio/format.h"
+#include "ao.h"
struct priv {
rsound_t *rd;
diff --git a/audio/out/audio_out_internal.h b/audio/out/audio_out_internal.h
index 215428fb0e..f3e92dff66 100644
--- a/audio/out/audio_out_internal.h
+++ b/audio/out/audio_out_internal.h
@@ -19,7 +19,7 @@
#ifndef MPLAYER_AUDIO_OUT_INTERNAL_H
#define MPLAYER_AUDIO_OUT_INTERNAL_H
-#include "options.h"
+#include "core/options.h"
// prototypes:
//static ao_info_t info;
diff --git a/audio/reorder_ch.c b/audio/reorder_ch.c
index 50379de2c5..4b51a79439 100644
--- a/audio/reorder_ch.c
+++ b/audio/reorder_ch.c
@@ -25,12 +25,12 @@
#include <inttypes.h>
#include <string.h>
-#include "reorder_ch.h"
+#include "audio/reorder_ch.h"
#ifdef TEST
#define mp_msg(mod,lev, fmt, args... ) printf( fmt, ## args )
#else
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#endif