← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/pulse/context.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/pulse/context.c
1
 
/* $Id: context.c 1971 2007-10-28 19:13:50Z lennart $ */
 
1
/* $Id: context.c 2067 2007-11-21 01:30:40Z lennart $ */
2
2
 
3
3
/***
4
4
  This file is part of PulseAudio.
86
86
    [PA_COMMAND_UNDERFLOW] = pa_command_overflow_or_underflow,
87
87
    [PA_COMMAND_PLAYBACK_STREAM_KILLED] = pa_command_stream_killed,
88
88
    [PA_COMMAND_RECORD_STREAM_KILLED] = pa_command_stream_killed,
 
89
    [PA_COMMAND_PLAYBACK_STREAM_MOVED] = pa_command_stream_moved,
 
90
    [PA_COMMAND_RECORD_STREAM_MOVED] = pa_command_stream_moved,
 
91
    [PA_COMMAND_PLAYBACK_STREAM_SUSPENDED] = pa_command_stream_suspended,
 
92
    [PA_COMMAND_RECORD_STREAM_SUSPENDED] = pa_command_stream_suspended,
89
93
    [PA_COMMAND_SUBSCRIBE_EVENT] = pa_command_subscribe_event
90
94
};
91
95
 
396
400
            /* Enable shared memory support if possible */
397
401
            if (c->version >= 10 &&
398
402
                pa_mempool_is_shared(c->mempool) &&
399
 
                c->is_local) {
 
403
                c->is_local > 0) {
400
404
 
401
405
                /* Only enable SHM if both sides are owned by the same
402
406
                 * user. This is a security measure because otherwise
965
969
 
966
970
int pa_context_is_local(pa_context *c) {
967
971
    pa_assert(c);
 
972
    pa_assert(PA_REFCNT_VALUE(c) >= 1);
 
973
 
 
974
    PA_CHECK_VALIDITY(c, c->is_local >= 0, PA_ERR_BADSTATE);
968
975
 
969
976
    return c->is_local;
970
977
}