← Back to branch summary

~ubuntu-branches/ubuntu/natty/alsa-lib/natty

« back to all changes in this revision

Viewing changes to src/pcm/pcm_direct.h

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2010-05-19 11:04:50 UTC
  • mfrom: (1.1.14 upstream) (2.2.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100519110450-79ixzqrupz0ylqjb
Tags: 1.0.23-0ubuntu1
* New upstream release
  - debian/patches/:
    + Dont_leak_timer_fd_on_pcm_slave_close.patch
    + Fix-S24_3LE-softvol-distortion.patc
    + Fix-modem-on-hook.patch
    + Fix-stream-state-updates.patch
    + Fix-pcm-timer-open-subdevice-pcm_hw.patch
    + b9dbee6-Fix-threading-drain.patch
      - Dropped
    + Fix-str-lit-no-format.patch
    + lp433573-Support-Echo3G.patch
      - retained, need to be sent upstream
* Merge from debian unstable, remaining changes:
  - debian/rules:
    + Don't bail when removing include/alsa
  - debian/control: Add Vcs-Bzr URI
  - Add configuration files for bluetooth/bluez-alsa and pulseaudio
  - debian/libasound2.install: Ship smixer plugins for native and bi-arch
    packages
  - drop libcxxtools-dev build dependency, its in universe
  - add --with-plugindir=\$${prefix}/lib/alsa-lib to configure-stamp
  - Demote libc6-i386 pre-depends to depends for lib32asound2

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pcm/pcm_direct.h
142
142
        int hw_fd;                      /* hardware file descriptor */
143
143
        struct pollfd timer_fd;
144
144
        int poll_fd;
145
 
        int tread;
146
 
        int timer_need_poll;
147
 
        unsigned int timer_event_suspend;
148
 
        unsigned int timer_event_resume;
 
145
        int tread: 1;
 
146
        int timer_need_poll: 1;
 
147
        unsigned int timer_events;
149
148
        int server_fd;
150
149
        pid_t server_pid;
151
150
        snd_timer_t *timer;             /* timer used as poll_fd */