← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/daemon/daemon-conf.h

  • 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/daemon/daemon-conf.h
1
1
#ifndef foodaemonconfhfoo
2
2
#define foodaemonconfhfoo
3
3
 
4
 
/* $Id: daemon-conf.h 1971 2007-10-28 19:13:50Z lennart $ */
 
4
/* $Id: daemon-conf.h 2067 2007-11-21 01:30:40Z lennart $ */
5
5
 
6
6
/***
7
7
  This file is part of PulseAudio.
26
26
***/
27
27
 
28
28
#include <pulsecore/log.h>
 
29
#include <pulsecore/macro.h>
29
30
#include <pulse/sample.h>
30
31
 
31
32
#ifdef HAVE_SYS_RESOURCE_H
48
49
#ifdef HAVE_SYS_RESOURCE_H
49
50
typedef struct pa_rlimit {
50
51
    rlim_t value;
51
 
    int is_set;
 
52
    pa_bool_t is_set;
52
53
} pa_rlimit;
53
54
#endif
54
55
 
55
56
/* A structure containing configuration data for the PulseAudio server . */
56
57
typedef struct pa_daemon_conf {
57
58
    pa_daemon_conf_cmd_t cmd;
58
 
    int daemonize,
 
59
    pa_bool_t daemonize,
59
60
        fail,
60
61
        high_priority,
 
62
        realtime_scheduling,
61
63
        disallow_module_loading,
62
 
        exit_idle_time,
 
64
        use_pid_file,
 
65
        system_instance,
 
66
        no_cpu_limit,
 
67
        disable_shm,
 
68
        disable_remixing;
 
69
    int exit_idle_time,
63
70
        module_idle_time,
64
71
        scache_idle_time,
65
72
        auto_log_target,
66
 
        use_pid_file,
67
 
        system_instance,
68
 
        no_cpu_limit,
69
 
        disable_shm;
 
73
        realtime_priority,
 
74
        nice_level,
 
75
        resample_method;
70
76
    char *script_commands, *dl_search_path, *default_script_file;
71
77
    pa_log_target_t log_target;
72
78
    pa_log_level_t log_level;
73
 
    int resample_method;
74
79
    char *config_file;
75
80
 
76
81
#ifdef HAVE_SYS_RESOURCE_H
81
86
#ifdef RLIMIT_MEMLOCK
82
87
    pa_rlimit rlimit_memlock;
83
88
#endif
 
89
#ifdef RLIMIT_NICE
 
90
    pa_rlimit rlimit_nice;
 
91
#endif
 
92
#ifdef RLIMIT_RTPRIO
 
93
    pa_rlimit rlimit_rtprio;
 
94
#endif
84
95
#endif
85
96
 
86
97
    unsigned default_n_fragments, default_fragment_size_msec;