diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/Makefile.objs | 3 | ||||
| -rw-r--r-- | audio/alsaaudio.c | 2 | ||||
| -rw-r--r-- | audio/audio.c | 6 | ||||
| -rw-r--r-- | audio/audio.h | 2 | ||||
| -rw-r--r-- | audio/noaudio.c | 2 | ||||
| -rw-r--r-- | audio/ossaudio.c | 4 | ||||
| -rw-r--r-- | audio/spiceaudio.c | 2 | ||||
| -rw-r--r-- | audio/wavaudio.c | 2 | ||||
| -rw-r--r-- | audio/wavcapture.c | 2 | ||||
| -rw-r--r-- | audio/winwaveaudio.c | 2 |
10 files changed, 15 insertions, 12 deletions
diff --git a/audio/Makefile.objs b/audio/Makefile.objs index 0f2932d..d71a877 100644 --- a/audio/Makefile.objs +++ b/audio/Makefile.objs @@ -12,3 +12,6 @@ common-obj-$(CONFIG_WINWAVE) += winwaveaudio.o common-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o common-obj-y += wavcapture.o + +$(obj)/audio.o $(obj)/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS) +$(obj)/sdlaudio.o: QEMU_CFLAGS += $(SDL_CFLAGS) diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index cb45b49..e4e5442 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -23,7 +23,7 @@ */ #include <alsa/asoundlib.h> #include "qemu-common.h" -#include "qemu-char.h" +#include "qemu/main-loop.h" #include "audio.h" #if QEMU_GNUC_PREREQ(4, 3) diff --git a/audio/audio.c b/audio/audio.c index 1c77389..1510b59 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -23,9 +23,9 @@ */ #include "hw/hw.h" #include "audio.h" -#include "monitor.h" -#include "qemu-timer.h" -#include "sysemu.h" +#include "monitor/monitor.h" +#include "qemu/timer.h" +#include "sysemu/sysemu.h" #define AUDIO_CAP "audio" #include "audio_int.h" diff --git a/audio/audio.h b/audio/audio.h index a70fda9..e7ea397 100644 --- a/audio/audio.h +++ b/audio/audio.h @@ -25,7 +25,7 @@ #define QEMU_AUDIO_H #include "config-host.h" -#include "qemu-queue.h" +#include "qemu/queue.h" typedef void (*audio_callback_fn) (void *opaque, int avail); diff --git a/audio/noaudio.c b/audio/noaudio.c index 54958f8..9f23aa2 100644 --- a/audio/noaudio.c +++ b/audio/noaudio.c @@ -23,7 +23,7 @@ */ #include "qemu-common.h" #include "audio.h" -#include "qemu-timer.h" +#include "qemu/timer.h" #define AUDIO_CAP "noaudio" #include "audio_int.h" diff --git a/audio/ossaudio.c b/audio/ossaudio.c index df51b7c..00be9c9 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -31,8 +31,8 @@ #include <sys/soundcard.h> #endif #include "qemu-common.h" -#include "host-utils.h" -#include "qemu-char.h" +#include "qemu/main-loop.h" +#include "qemu/host-utils.h" #include "audio.h" #define AUDIO_CAP "oss" diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c index 6f15591..bc24557 100644 --- a/audio/spiceaudio.c +++ b/audio/spiceaudio.c @@ -18,7 +18,7 @@ */ #include "hw/hw.h" -#include "qemu-timer.h" +#include "qemu/timer.h" #include "ui/qemu-spice.h" #define AUDIO_CAP "spice" diff --git a/audio/wavaudio.c b/audio/wavaudio.c index a449b51..950fa8f 100644 --- a/audio/wavaudio.c +++ b/audio/wavaudio.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "qemu-timer.h" +#include "qemu/timer.h" #include "audio.h" #define AUDIO_CAP "wav" diff --git a/audio/wavcapture.c b/audio/wavcapture.c index 4f785f5..9d94623 100644 --- a/audio/wavcapture.c +++ b/audio/wavcapture.c @@ -1,5 +1,5 @@ #include "hw/hw.h" -#include "monitor.h" +#include "monitor/monitor.h" #include "audio.h" typedef struct { diff --git a/audio/winwaveaudio.c b/audio/winwaveaudio.c index 72babbf..8dbd145 100644 --- a/audio/winwaveaudio.c +++ b/audio/winwaveaudio.c @@ -1,7 +1,7 @@ /* public domain */ #include "qemu-common.h" -#include "sysemu.h" +#include "sysemu/sysemu.h" #include "audio.h" #define AUDIO_CAP "winwave" |
