summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
Diffstat (limited to 'audio')
-rw-r--r--audio/audio.c6
-rw-r--r--audio/audio.h1
-rw-r--r--audio/mixeng.c3
-rw-r--r--audio/noaudio.c4
-rw-r--r--audio/ossaudio.c3
-rw-r--r--audio/sdlaudio.c3
-rw-r--r--audio/wavaudio.c4
-rw-r--r--audio/wavcapture.c4
8 files changed, 20 insertions, 8 deletions
diff --git a/audio/audio.c b/audio/audio.c
index 4248c1401f..2521c6f491 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -21,7 +21,11 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include "vl.h"
+#include "hw/hw.h"
+#include "audio.h"
+#include "console.h"
+#include "qemu-timer.h"
+#include "sysemu.h"
#define AUDIO_CAP "audio"
#include "audio_int.h"
diff --git a/audio/audio.h b/audio/audio.h
index db1a940971..ec9eee46f4 100644
--- a/audio/audio.h
+++ b/audio/audio.h
@@ -73,7 +73,6 @@ typedef struct CaptureState {
LIST_ENTRY (CaptureState) entries;
} CaptureState;
-typedef struct AudioState AudioState;
typedef struct SWVoiceOut SWVoiceOut;
typedef struct CaptureVoiceOut CaptureVoiceOut;
typedef struct SWVoiceIn SWVoiceIn;
diff --git a/audio/mixeng.c b/audio/mixeng.c
index 34cc1aeee4..b668c524e7 100644
--- a/audio/mixeng.c
+++ b/audio/mixeng.c
@@ -22,7 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include "vl.h"
+#include "qemu-common.h"
+#include "audio.h"
#define AUDIO_CAP "mixeng"
#include "audio_int.h"
diff --git a/audio/noaudio.c b/audio/noaudio.c
index a3423e5eb1..64695e6af9 100644
--- a/audio/noaudio.c
+++ b/audio/noaudio.c
@@ -21,7 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include "vl.h"
+#include "qemu-common.h"
+#include "audio.h"
+#include "qemu-timer.h"
#define AUDIO_CAP "noaudio"
#include "audio_int.h"
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index cedcea45ff..5a91556cc0 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -30,7 +30,8 @@
#else
#include <sys/soundcard.h>
#endif
-#include "vl.h"
+#include "qemu-common.h"
+#include "audio.h"
#define AUDIO_CAP "oss"
#include "audio_int.h"
diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
index 11edab08d8..b6cfad18f5 100644
--- a/audio/sdlaudio.c
+++ b/audio/sdlaudio.c
@@ -23,7 +23,8 @@
*/
#include <SDL.h>
#include <SDL_thread.h>
-#include "vl.h"
+#include "qemu-common.h"
+#include "audio.h"
#ifndef _WIN32
#ifdef __sun__
diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index 2dbc58cbe1..11ca86ddaf 100644
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -21,7 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include "vl.h"
+#include "hw/hw.h"
+#include "qemu-timer.h"
+#include "audio.h"
#define AUDIO_CAP "wav"
#include "audio_int.h"
diff --git a/audio/wavcapture.c b/audio/wavcapture.c
index 4810fa30dd..3281c3110d 100644
--- a/audio/wavcapture.c
+++ b/audio/wavcapture.c
@@ -1,4 +1,6 @@
-#include "vl.h"
+#include "hw/hw.h"
+#include "console.h"
+#include "audio.h"
typedef struct {
QEMUFile *f;