← Back to branch summary

~vcs-imports/qemu/maemo

« back to all changes in this revision

Viewing changes to audio/audio_int.h

  • Committer: Riku Voipio
  • Date: 2009-06-08 15:31:58 UTC
  • mfrom: (6281.2.366)
  • mto: This revision was merged to the branch mainline in revision 6452.
  • Revision ID: git-v1:759b334a9739814df2883aa4c41b1c0f5670e90a
Merge commit 'gnu/master' into test

Epic merge

Conflicts:
        Makefile
        block.c
        block.h
        configure
        hw/boards.h
        hw/flash.h
        hw/integratorcp.c
        hw/nand.c
        hw/omap2.c
        hw/omap_i2c.c
        hw/sd.c
        hw/smc91c111.c
        hw/tsc2005.c
        hw/tusb6010.c
        hw/usb-musb.c
        linux-user/syscall.c
        target-arm/machine.c
        target-arm/translate.c

Show diffs side-by-side

added added

removed removed

Lines of Context:
audio/audio_int.h
104
104
} HWVoiceIn;
105
105
 
106
106
struct SWVoiceOut {
 
107
    QEMUSoundCard *card;
107
108
    struct audio_pcm_info info;
108
109
    t_sample *conv;
109
110
    int64_t ratio;
120
121
};
121
122
 
122
123
struct SWVoiceIn {
 
124
    QEMUSoundCard *card;
123
125
    int active;
124
126
    struct audio_pcm_info info;
125
127
    int64_t ratio;