~ubuntu-branches/debian/sid/bristol/sid

« back to all changes in this revision

Viewing changes to libbristol/audioRoutines.c

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2011-02-15 02:54:23 UTC
  • mfrom: (13.1.6 experimental)
  • Revision ID: james.westby@ubuntu.com-20110215025423-g8hcla5gyl08mae3
Tags: 0.60.8-2
* Upload to unstable.
* Relax JACK's build-deps to let this build in sid.

Show diffs side-by-side

added added

removed removed

Lines of Context:
89
89
        audioDev.fragBuf = 0;
90
90
        audioDev.OSegmentSize = audioDev.fragSize;
91
91
#if (BRISTOL_HAS_ALSA == 1)
92
 
        if ((flags & BRISTOL_OSS) == 0)
93
 
                audioDev.siflags |= AUDIO_ALSA;
 
92
        if (flags & BRISTOL_ALSA)
 
93
                audioDev.siflags = AUDIO_ALSA;
 
94
#endif
 
95
#ifdef BRISTOL_PA
 
96
        if (flags & BRISTOL_PULSE_S)
 
97
                audioDev.siflags = AUDIO_PULSE;
94
98
#endif
95
99
        audioDev.cflags |= SLAB_SUBFRAGMENT;
96
100
        audioDev.cflags |= SLAB_AUDIODBG;
103
107
        return(audioDev.fragSize);
104
108
#endif
105
109
 
106
 
        audioDev.flags = 0x0d;
 
110
        audioDev.flags = SLAB_FULL_DUPLEX;
107
111
 
108
112
        if (flags & BRISTOL_DUMMY)
109
113
                audioDev.flags |= AUDIO_DUMMY;