Revision 1ea879e5 audio/audio_int.h

b/audio/audio_int.h
76 76
    int rpos;
77 77
    uint64_t ts_helper;
78 78

  
79
    st_sample_t *mix_buf;
79
    struct st_sample *mix_buf;
80 80

  
81 81
    int samples;
82 82
    LIST_HEAD (sw_out_listhead, SWVoiceOut) sw_head;
......
95 95
    int total_samples_captured;
96 96
    uint64_t ts_helper;
97 97

  
98
    st_sample_t *conv_buf;
98
    struct st_sample *conv_buf;
99 99

  
100 100
    int samples;
101 101
    LIST_HEAD (sw_in_listhead, SWVoiceIn) sw_head;
......
107 107
    struct audio_pcm_info info;
108 108
    t_sample *conv;
109 109
    int64_t ratio;
110
    st_sample_t *buf;
110
    struct st_sample *buf;
111 111
    void *rate;
112 112
    int total_hw_samples_mixed;
113 113
    int active;
114 114
    int empty;
115 115
    HWVoiceOut *hw;
116 116
    char *name;
117
    volume_t vol;
117
    struct mixeng_volume vol;
118 118
    struct audio_callback callback;
119 119
    LIST_ENTRY (SWVoiceOut) entries;
120 120
};
......
125 125
    int64_t ratio;
126 126
    void *rate;
127 127
    int total_hw_samples_acquired;
128
    st_sample_t *buf;
128
    struct st_sample *buf;
129 129
    f_sample *clip;
130 130
    HWVoiceIn *hw;
131 131
    char *name;
132
    volume_t vol;
132
    struct mixeng_volume vol;
133 133
    struct audio_callback callback;
134 134
    LIST_ENTRY (SWVoiceIn) entries;
135 135
};
......
149 149
};
150 150

  
151 151
struct audio_pcm_ops {
152
    int  (*init_out)(HWVoiceOut *hw, audsettings_t *as);
152
    int  (*init_out)(HWVoiceOut *hw, struct audsettings *as);
153 153
    void (*fini_out)(HWVoiceOut *hw);
154 154
    int  (*run_out) (HWVoiceOut *hw);
155 155
    int  (*write)   (SWVoiceOut *sw, void *buf, int size);
156 156
    int  (*ctl_out) (HWVoiceOut *hw, int cmd, ...);
157 157

  
158
    int  (*init_in) (HWVoiceIn *hw, audsettings_t *as);
158
    int  (*init_in) (HWVoiceIn *hw, struct audsettings *as);
159 159
    void (*fini_in) (HWVoiceIn *hw);
160 160
    int  (*run_in)  (HWVoiceIn *hw);
161 161
    int  (*read)    (SWVoiceIn *sw, void *buf, int size);
......
204 204
extern struct audio_driver dsound_audio_driver;
205 205
extern struct audio_driver esd_audio_driver;
206 206
extern struct audio_driver pa_audio_driver;
207
extern volume_t nominal_volume;
207
extern struct mixeng_volume nominal_volume;
208 208

  
209
void audio_pcm_init_info (struct audio_pcm_info *info, audsettings_t *as);
209
void audio_pcm_init_info (struct audio_pcm_info *info, struct audsettings *as);
210 210
void audio_pcm_info_clear_buf (struct audio_pcm_info *info, void *buf, int len);
211 211

  
212 212
int  audio_pcm_sw_write (SWVoiceOut *sw, void *buf, int len);

Also available in: Unified diff