forked from pool/pulseaudio
58 lines
3.3 KiB
Diff
58 lines
3.3 KiB
Diff
|
From 86144ee6cb6af54903a8d3d8395751ae26a4d134 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Thu, 14 Jan 2010 21:32:26 +0100
|
||
|
|
Subject: [PATCH] client: include dolby channel names in comments
|
||
|
|
|
||
|
|
---
|
||
|
|
src/pulse/channelmap.h | 20 ++++++++++----------
|
||
|
|
1 files changed, 10 insertions(+), 10 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/pulse/channelmap.h b/src/pulse/channelmap.h
|
||
|
|
index 469effc..d1d5c8b 100644
|
||
|
|
--- a/src/pulse/channelmap.h
|
||
|
|
+++ b/src/pulse/channelmap.h
|
||
|
|
@@ -74,9 +74,9 @@ typedef enum pa_channel_position {
|
||
|
|
PA_CHANNEL_POSITION_INVALID = -1,
|
||
|
|
PA_CHANNEL_POSITION_MONO = 0,
|
||
|
|
|
||
|
|
- PA_CHANNEL_POSITION_FRONT_LEFT, /* Apple calls this 'Left' */
|
||
|
|
- PA_CHANNEL_POSITION_FRONT_RIGHT, /* Apple calls this 'Right' */
|
||
|
|
- PA_CHANNEL_POSITION_FRONT_CENTER, /* Apple calls this 'Center' */
|
||
|
|
+ PA_CHANNEL_POSITION_FRONT_LEFT, /* Apple, Dolby call this 'Left' */
|
||
|
|
+ PA_CHANNEL_POSITION_FRONT_RIGHT, /* Apple, Dolby call this 'Right' */
|
||
|
|
+ PA_CHANNEL_POSITION_FRONT_CENTER, /* Apple, Dolby call this 'Center' */
|
||
|
|
|
||
|
|
/** \cond fulldocs */
|
||
|
|
PA_CHANNEL_POSITION_LEFT = PA_CHANNEL_POSITION_FRONT_LEFT,
|
||
|
|
@@ -84,20 +84,20 @@ typedef enum pa_channel_position {
|
||
|
|
PA_CHANNEL_POSITION_CENTER = PA_CHANNEL_POSITION_FRONT_CENTER,
|
||
|
|
/** \endcond */
|
||
|
|
|
||
|
|
- PA_CHANNEL_POSITION_REAR_CENTER, /* Microsoft calls this 'Back Center', Apple calls this 'Center Surround' */
|
||
|
|
- PA_CHANNEL_POSITION_REAR_LEFT, /* Microsoft calls this 'Back Left', Apple calls this 'Left Surround' */
|
||
|
|
- PA_CHANNEL_POSITION_REAR_RIGHT, /* Microsoft calls this 'Back Right', Apple calls this 'Right Surround' */
|
||
|
|
+ PA_CHANNEL_POSITION_REAR_CENTER, /* Microsoft calls this 'Back Center', Apple calls this 'Center Surround', Dolby calls this 'Surround Rear Center' */
|
||
|
|
+ PA_CHANNEL_POSITION_REAR_LEFT, /* Microsoft calls this 'Back Left', Apple calls this 'Left Surround' (!), Dolby calls this 'Surround Rear Left' */
|
||
|
|
+ PA_CHANNEL_POSITION_REAR_RIGHT, /* Microsoft calls this 'Back Right', Apple calls this 'Right Surround' (!), Dolby calls this 'Surround Rear Right' */
|
||
|
|
|
||
|
|
PA_CHANNEL_POSITION_LFE, /* Microsoft calls this 'Low Frequency', Apple calls this 'LFEScreen' */
|
||
|
|
/** \cond fulldocs */
|
||
|
|
PA_CHANNEL_POSITION_SUBWOOFER = PA_CHANNEL_POSITION_LFE,
|
||
|
|
/** \endcond */
|
||
|
|
|
||
|
|
- PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER, /* Apple calls this 'Left Center' */
|
||
|
|
- PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER, /* Apple calls this 'Right Center */
|
||
|
|
+ PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER, /* Apple, Dolby call this 'Left Center' */
|
||
|
|
+ PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER, /* Apple, Dolby call this 'Right Center */
|
||
|
|
|
||
|
|
- PA_CHANNEL_POSITION_SIDE_LEFT, /* Apple calls this 'Left Surround Direct' */
|
||
|
|
- PA_CHANNEL_POSITION_SIDE_RIGHT, /* Apple calls this 'Right Surround Direct' */
|
||
|
|
+ PA_CHANNEL_POSITION_SIDE_LEFT, /* Apple calls this 'Left Surround Direct', Dolby calls this 'Surround Left' (!) */
|
||
|
|
+ PA_CHANNEL_POSITION_SIDE_RIGHT, /* Apple calls this 'Right Surround Direct', Dolby calls this 'Surround Right' (!) */
|
||
|
|
|
||
|
|
PA_CHANNEL_POSITION_AUX0,
|
||
|
|
PA_CHANNEL_POSITION_AUX1,
|
||
|
|
--
|
||
|
|
1.6.0.2
|
||
|
|
|