← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/utils/pactl.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/utils/pactl.c
1
 
/* $Id: pactl.c 1971 2007-10-28 19:13:50Z lennart $ */
 
1
/* $Id: pactl.c 2035 2007-11-09 01:30:46Z lennart $ */
2
2
 
3
3
/***
4
4
  This file is part of PulseAudio.
38
38
#include <sndfile.h>
39
39
 
40
40
#include <pulse/pulseaudio.h>
 
41
#include <pulsecore/core-util.h>
41
42
 
42
43
#if PA_API_VERSION < 10
43
44
#error Invalid PulseAudio API version
662
663
           "%s [options] exit\n"
663
664
           "%s [options] upload-sample FILENAME [NAME]\n"
664
665
           "%s [options] play-sample NAME [SINK]\n"
 
666
           "%s [options] remove-sample NAME\n"
665
667
           "%s [options] move-sink-input ID SINK\n"
666
668
           "%s [options] move-source-output ID SOURCE\n"
667
 
           "%s [options] remove-sample NAME\n"
668
669
           "%s [options] load-module NAME [ARGS ...]\n"
669
670
           "%s [options] unload-module ID\n"
670
671
           "%s [options] suspend-sink [SINK] 1|0\n"
850
851
                goto quit;
851
852
            }
852
853
 
853
 
            suspend = !!atoi(argv[argc-1]);
 
854
            suspend = pa_parse_boolean(argv[argc-1]);
854
855
 
855
856
            if (argc > optind+2)
856
857
                sink_name = pa_xstrdup(argv[optind+1]);
863
864
                goto quit;
864
865
            }
865
866
 
866
 
            suspend = !!atoi(argv[argc-1]);
 
867
            suspend = pa_parse_boolean(argv[argc-1]);
867
868
 
868
869
            if (argc > optind+2)
869
870
                source_name = pa_xstrdup(argv[optind+1]);