← Back to branch summary

~ubuntu-branches/ubuntu/trusty/alsa-lib/trusty

« back to all changes in this revision

Viewing changes to src/pcm/pcm_meter.c

  • Committer: Package Import Robot
  • Author(s): Luke Yelavich, Luke Yelavich
  • Date: 2013-07-26 10:54:32 UTC
  • mfrom: (1.1.17) (2.4.9 sid)
  • Revision ID: package-import@ubuntu.com-20130726105432-nbrwu6yk576ihzbb
Tags: 1.0.27.2-1ubuntu1
[ Luke Yelavich ]
* Merge from debian unstable.  Remaining changes:
  - debian/control: Add Vcs-Bzr URI
  - Show hints for non-standard devices that lack configuration files
  - Add a compile/run autopkg test
  - Add config file for the tegra alc5632 chip found in the AC100 netbook.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pcm/pcm_meter.c
419
419
static int snd_pcm_meter_hw_params_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
420
420
{
421
421
        snd_pcm_meter_t *meter = pcm->private_data;
422
 
        return _snd_pcm_hw_params(meter->gen.slave, params);
 
422
        return _snd_pcm_hw_params_internal(meter->gen.slave, params);
423
423
}
424
424
 
425
425
static int snd_pcm_meter_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
514
514
        .async = snd_pcm_generic_async,
515
515
        .mmap = snd_pcm_generic_mmap,
516
516
        .munmap = snd_pcm_generic_munmap,
 
517
        .query_chmaps = snd_pcm_generic_query_chmaps,
 
518
        .get_chmap = snd_pcm_generic_get_chmap,
 
519
        .set_chmap = snd_pcm_generic_set_chmap,
517
520
};
518
521
 
519
522
static const snd_pcm_fast_ops_t snd_pcm_meter_fast_ops = {
542
545
        .poll_descriptors_count = snd_pcm_generic_poll_descriptors_count,
543
546
        .poll_descriptors = snd_pcm_generic_poll_descriptors,
544
547
        .poll_revents = snd_pcm_generic_poll_revents,
 
548
        .may_wait_for_avail_min = snd_pcm_generic_may_wait_for_avail_min,
545
549
};
546
550
 
547
551
/**