← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/pulseaudio/oneiric

« back to all changes in this revision

Viewing changes to src/pulsecore/conf-parser.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2007-12-04 00:56:08 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20071204005608-y1xqvcu45g1yxtlu
Tags: 0.9.8-1ubuntu1
"Hail our new PulseAudio overlords (part two)."

* Merge from Debian unstable.
* Ubuntu-specific changes:
  - debian/control:
    + Don't build-depend on libjack0.100.0-dev or build jack module
      packages,
    + Update pulseaudio's Recommends and Suggests to accomodate
      existing promoted main packages,
    + Explicitly mention pasuspender in pulseaudio-utils's long
      description,
    + Add Vcs-Bzr URI,
    + Adhere to DebianMaintainerField;
  - debian/rules: Use multiuser for update-rc.d;
  - debian/patches/series: Retain the exclusion of
    0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch.
* Dropped Ubuntu-specific change (absorbed into Debian source):
  debian/patches/0002-Double-esound-maximum-sample-size.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pulsecore/conf-parser.c
1
 
/* $Id: conf-parser.c 1971 2007-10-28 19:13:50Z lennart $ */
 
1
/* $Id: conf-parser.c 2007 2007-11-01 00:31:59Z lennart $ */
2
2
 
3
3
/***
4
4
  This file is part of PulseAudio.
169
169
}
170
170
 
171
171
int pa_config_parse_bool(const char *filename, unsigned line, const char *lvalue, const char *rvalue, void *data, PA_GCC_UNUSED void *userdata) {
172
 
    int *b = data, k;
 
172
    int k;
 
173
    pa_bool_t *b = data;
173
174
 
174
175
    pa_assert(filename);
175
176
    pa_assert(lvalue);
181
182
        return -1;
182
183
    }
183
184
 
184
 
    *b = k;
 
185
    *b = !!k;
185
186
 
186
187
    return 0;
187
188
}