diff options
author | wm4 <wm4@nowhere> | 2012-11-09 01:06:43 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-11-12 20:08:18 +0100 |
commit | 4873b32c5959c988af1769529ff72e3fd62fba82 (patch) | |
tree | e18fbd7eef54de6071969689aa5c31d6ea1f0963 /audio/out/ao_alsa.c | |
parent | d4bdd0473d6f43132257c9fb3848d829755167a3 (diff) | |
download | mpv-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/out/ao_alsa.c')
-rw-r--r-- | audio/out/ao_alsa.c | 10 |
1 files changed, 5 insertions, 5 deletions
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 = { |