~diwic/ubuntu/lucid/pulseaudio/bugfixes

« back to all changes in this revision

Viewing changes to src/utils/pacmd.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2007-12-04 00:56:08 UTC
  • mto: (1.15.1 sid)
  • mto: This revision was merged to the branch mainline in revision 15.
  • Revision ID: james.westby@ubuntu.com-20071204005608-3lzrrrpxi186kgx4
Tags: upstream-0.9.8
ImportĀ upstreamĀ versionĀ 0.9.8

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
/* $Id: pacmd.c 1426 2007-02-13 15:35:19Z ossman $ */
 
1
/* $Id: pacmd.c 2067 2007-11-21 01:30:40Z lennart $ */
2
2
 
3
3
/***
4
4
  This file is part of PulseAudio.
50
50
    size_t ibuf_index, ibuf_length, obuf_index, obuf_length;
51
51
    fd_set ifds, ofds;
52
52
 
53
 
    if (pa_pid_file_check_running(&pid) < 0) {
 
53
    if (pa_pid_file_check_running(&pid, "pulseaudio") < 0) {
54
54
        pa_log("no PulseAudio daemon running");
55
55
        goto fail;
56
56
    }
75
75
        if (r >= 0)
76
76
            break;
77
77
 
78
 
        if (pa_pid_file_kill(SIGUSR2, NULL) < 0) {
 
78
        if (pa_pid_file_kill(SIGUSR2, NULL, "pulseaudio") < 0) {
79
79
            pa_log("failed to kill PulseAudio daemon.");
80
80
            goto fail;
81
81
        }
82
82
 
83
 
        pa_msleep(50);
 
83
        pa_msleep(300);
84
84
    }
85
85
 
86
86
    if (i >= 5) {