Revision 1ea879e5 audio/audio_template.h

b/audio/audio_template.h
82 82

  
83 83
static int glue (audio_pcm_hw_alloc_resources_, TYPE) (HW *hw)
84 84
{
85
    HWBUF = audio_calloc (AUDIO_FUNC, hw->samples, sizeof (st_sample_t));
85
    HWBUF = audio_calloc (AUDIO_FUNC, hw->samples, sizeof (struct st_sample));
86 86
    if (!HWBUF) {
87 87
        dolog ("Could not allocate " NAME " buffer (%d samples)\n",
88 88
               hw->samples);
......
116 116
    samples = ((int64_t) sw->hw->samples << 32) / sw->ratio;
117 117
#endif
118 118

  
119
    sw->buf = audio_calloc (AUDIO_FUNC, samples, sizeof (st_sample_t));
119
    sw->buf = audio_calloc (AUDIO_FUNC, samples, sizeof (struct st_sample));
120 120
    if (!sw->buf) {
121 121
        dolog ("Could not allocate buffer for `%s' (%d samples)\n",
122 122
               SW_NAME (sw), samples);
......
140 140
    SW *sw,
141 141
    HW *hw,
142 142
    const char *name,
143
    audsettings_t *as
143
    struct audsettings *as
144 144
    )
145 145
{
146 146
    int err;
......
229 229
static HW *glue (audio_pcm_hw_find_specific_, TYPE) (
230 230
    AudioState *s,
231 231
    HW *hw,
232
    audsettings_t *as
232
    struct audsettings *as
233 233
    )
234 234
{
235 235
    while ((hw = glue (audio_pcm_hw_find_any_, TYPE) (s, hw))) {
......
240 240
    return NULL;
241 241
}
242 242

  
243
static HW *glue (audio_pcm_hw_add_new_, TYPE) (AudioState *s, audsettings_t *as)
243
static HW *glue (audio_pcm_hw_add_new_, TYPE) (AudioState *s,
244
                                               struct audsettings *as)
244 245
{
245 246
    HW *hw;
246 247
    struct audio_driver *drv = s->drv;
......
308 309
    return NULL;
309 310
}
310 311

  
311
static HW *glue (audio_pcm_hw_add_, TYPE) (AudioState *s, audsettings_t *as)
312
static HW *glue (audio_pcm_hw_add_, TYPE) (AudioState *s,
313
                                           struct audsettings *as)
312 314
{
313 315
    HW *hw;
314 316

  
......
335 337
static SW *glue (audio_pcm_create_voice_pair_, TYPE) (
336 338
    AudioState *s,
337 339
    const char *sw_name,
338
    audsettings_t *as
340
    struct audsettings *as
339 341
    )
340 342
{
341 343
    SW *sw;
342 344
    HW *hw;
343
    audsettings_t hw_as;
345
    struct audsettings hw_as;
344 346

  
345 347
    if (glue (conf.fixed_, TYPE).enabled) {
346 348
        hw_as = glue (conf.fixed_, TYPE).settings;
......
405 407
    const char *name,
406 408
    void *callback_opaque ,
407 409
    audio_callback_fn_t callback_fn,
408
    audsettings_t *as
410
    struct audsettings *as
409 411
    )
410 412
{
411 413
    AudioState *s;

Also available in: Unified diff