projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/nchip/public_html/qemu into garage-push
[qemu]
/
audio
/
audio.h
diff --git
a/audio/audio.h
b/audio/audio.h
index
4aaeb96
..
3fb2c8b
100644
(file)
--- a/
audio/audio.h
+++ b/
audio/audio.h
@@
-78,7
+78,6
@@
typedef struct CaptureVoiceOut CaptureVoiceOut;
typedef struct SWVoiceIn SWVoiceIn;
typedef struct QEMUSoundCard {
typedef struct SWVoiceIn SWVoiceIn;
typedef struct QEMUSoundCard {
- AudioState *audio;
char *name;
LIST_ENTRY (QEMUSoundCard) entries;
} QEMUSoundCard;
char *name;
LIST_ENTRY (QEMUSoundCard) entries;
} QEMUSoundCard;
@@
-94,12
+93,10
@@
void AUD_log (const char *cap, const char *fmt, ...)
#endif
;
#endif
;
-AudioState *AUD_init (void);
void AUD_help (void);
void AUD_help (void);
-void AUD_register_card (AudioState *s, const char *name, QEMUSoundCard *card);
+void AUD_register_card (const char *name, QEMUSoundCard *card);
void AUD_remove_card (QEMUSoundCard *card);
CaptureVoiceOut *AUD_add_capture (
void AUD_remove_card (QEMUSoundCard *card);
CaptureVoiceOut *AUD_add_capture (
- AudioState *s,
struct audsettings *as,
struct audio_capture_ops *ops,
void *opaque
struct audsettings *as,
struct audio_capture_ops *ops,
void *opaque