← Back to branch summary

~ubuntu-branches/ubuntu/karmic/pulseaudio/karmic-updates

« back to all changes in this revision

Viewing changes to src/pulsecore/flist.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich, Daniel T Chen, Luke Yelavich
  • Date: 2009-09-11 09:24:39 UTC
  • mfrom: (1.14.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090911092439-7dixbvy6r30alrv8
Tags: 1:0.9.16-0ubuntu1
https://launchpad.net/bugs/426210
[ Daniel T Chen ]
* debian/patches/0090-use-volume-ignore-for-analog-output.patch:
  + Realign volume control behaviour with existing Ubuntu releases,
    i.e., disable volume = merge and use volume = ignore for
    analog output

[ Luke Yelavich ]
* New upstream release
* debian/patches/0057-introspect-version-fixes.patch (LP: #426210),
  debian/patches/0056-alsa-rework.patch,
  debian/patches/0055-llvm-clang-analyzer-fixes.patch,
  0054-volume-libpulse-backported-fixes.patch,
  0053-add-input-sources.patch,
  debian/patches/0052-disable-cpu-limit.patch: Dropped, all applied upstream
* debian/patches/0051-reduce-lib-linking.patch: Drop, since we are not going
  to be doing bi-arch pulseaudio packages for karmic

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pulsecore/flist.c
130
130
}
131
131
 
132
132
int pa_flist_push(pa_flist*l, void *p) {
133
 
    unsigned idx, n, len;
 
133
    unsigned idx, n;
134
134
    pa_atomic_ptr_t*cells;
 
135
#ifdef PROFILE
 
136
    unsigned len;
 
137
#endif
135
138
 
136
139
    pa_assert(l);
137
140
    pa_assert(p);
138
141
 
139
142
    cells = PA_FLIST_CELLS(l);
140
143
 
141
 
    n = len = l->size + N_EXTRA_SCAN - (unsigned) pa_atomic_load(&l->length);
 
144
    n = l->size + N_EXTRA_SCAN - (unsigned) pa_atomic_load(&l->length);
 
145
 
 
146
#ifdef PROFILE
 
147
    len = n;
 
148
#endif
142
149
 
143
150
    _Y;
144
151
    idx = reduce(l, (unsigned) pa_atomic_load(&l->write_idx));
171
178
}
172
179
 
173
180
void* pa_flist_pop(pa_flist*l) {
174
 
    unsigned idx, len, n;
 
181
    unsigned idx, n;
175
182
    pa_atomic_ptr_t *cells;
 
183
#ifdef PROFILE
 
184
    unsigned len;
 
185
#endif
176
186
 
177
187
    pa_assert(l);
178
188
 
179
189
    cells = PA_FLIST_CELLS(l);
180
190
 
181
 
    n = len = (unsigned) pa_atomic_load(&l->length) + N_EXTRA_SCAN;
 
191
    n = (unsigned) pa_atomic_load(&l->length) + N_EXTRA_SCAN;
 
192
 
 
193
#ifdef PROFILE
 
194
    len = n;
 
195
#endif
182
196
 
183
197
    _Y;
184
198
    idx = reduce(l, (unsigned) pa_atomic_load(&l->read_idx));