← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/pulsecore/cli.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/cli.c
1
 
/* $Id: cli.c 1971 2007-10-28 19:13:50Z lennart $ */
 
1
/* $Id: cli.c 2008 2007-11-01 00:32:45Z lennart $ */
2
2
 
3
3
/***
4
4
  This file is part of PulseAudio.
59
59
 
60
60
    pa_client *client;
61
61
 
62
 
    int fail, kill_requested, defer_kill;
 
62
    pa_bool_t fail, kill_requested;
 
63
    int defer_kill;
63
64
};
64
65
 
65
66
static void line_callback(pa_ioline *line, const char *s, void *userdata);
86
87
    pa_ioline_set_callback(c->line, line_callback, c);
87
88
    pa_ioline_puts(c->line, "Welcome to PulseAudio! Use \"help\" for usage information.\n"PROMPT);
88
89
 
89
 
    c->fail = c->kill_requested = c->defer_kill = 0;
 
90
    c->fail = c->kill_requested = FALSE;
 
91
    c->defer_kill = 0;
90
92
 
91
93
    return c;
92
94
}
108
110
 
109
111
    pa_log_debug("CLI client killed.");
110
112
    if (c->defer_kill)
111
 
        c->kill_requested = 1;
 
113
        c->kill_requested = TRUE;
112
114
    else {
113
115
        if (c->eof_callback)
114
116
            c->eof_callback(c, c->userdata);