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

« back to all changes in this revision

Viewing changes to src/pulsecore/protocol-esound.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:
1
 
/* $Id: protocol-esound.c 1971 2007-10-28 19:13:50Z lennart $ */
 
1
/* $Id: protocol-esound.c 2050 2007-11-13 17:37:44Z lennart $ */
2
2
 
3
3
/***
4
4
  This file is part of PulseAudio.
72
72
#define RECORD_BUFFER_SECONDS (5)
73
73
#define RECORD_BUFFER_FRAGMENTS (100)
74
74
 
75
 
#define MAX_CACHE_SAMPLE_SIZE (2048000)
 
75
#define MAX_CACHE_SAMPLE_SIZE (1024000)
76
76
 
77
77
#define SCACHE_PREFIX "esound."
78
78
 
1406
1406
 
1407
1407
pa_protocol_esound* pa_protocol_esound_new(pa_core*core, pa_socket_server *server, pa_module *m, pa_modargs *ma) {
1408
1408
    pa_protocol_esound *p = NULL;
1409
 
    int public = 0;
 
1409
    pa_bool_t public = FALSE;
1410
1410
    const char *acl;
1411
1411
 
1412
1412
    pa_assert(core);