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.)

15 files changed, 54 insertions, 55 deletions

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;