← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/pulse/channelmap.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/pulse/channelmap.c
1
 
/* $Id: channelmap.c 1971 2007-10-28 19:13:50Z lennart $ */
 
1
/* $Id: channelmap.c 2054 2007-11-13 23:41:17Z lennart $ */
2
2
 
3
3
/***
4
4
  This file is part of PulseAudio.
36
36
 
37
37
#include "channelmap.h"
38
38
 
39
 
const char *const table[] = {
 
39
const char *const table[PA_CHANNEL_POSITION_MAX] = {
40
40
    [PA_CHANNEL_POSITION_MONO] = "mono",
41
41
 
42
42
    [PA_CHANNEL_POSITION_FRONT_CENTER] = "front-center",
99
99
    [PA_CHANNEL_POSITION_TOP_REAR_RIGHT] = "top-rear-right"
100
100
};
101
101
 
102
 
const char *const pretty_table[] = {
 
102
const char *const pretty_table[PA_CHANNEL_POSITION_MAX] = {
103
103
    [PA_CHANNEL_POSITION_MONO] = "Mono",
104
104
 
105
105
    [PA_CHANNEL_POSITION_FRONT_CENTER] = "Front Center",
531
531
 
532
532
    return 1;
533
533
}
534