From 75ab3390a812dd6becc2730d8a95af064485d1ca Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Sun, 14 Jun 2015 18:34:44 +0200 Subject: [PATCH] [DEV] update list of audio channel (complate list) --- audio/channel.cpp | 47 ++++++++++++++++++-- audio/channel.h | 110 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 139 insertions(+), 18 deletions(-) diff --git a/audio/channel.cpp b/audio/channel.cpp index e3b840f..960ff8d 100644 --- a/audio/channel.cpp +++ b/audio/channel.cpp @@ -16,10 +16,49 @@ static const char* listValues[] = { "rear-left", "rear-center", "rear-right", - "surround-left", - "surround-right", - "sub-woofer", - "lfe" + "center-right", + "center-center", + "top-front-left", + "top-front-center", + "top-front-right", + "top-rear-left", + "top-rear-center", + "top-rear-right", + "top-center-right", + "top-center-center", + "lfe", + "aux0", + "aux1", + "aux2", + "aux3", + "aux4", + "aux5", + "aux6", + "aux7", + "aux8", + "aux9", + "aux10", + "aux11", + "aux12", + "aux13", + "aux14", + "aux15", + "aux16", + "aux17", + "aux18", + "aux19", + "aux20", + "aux21", + "aux22", + "aux23", + "aux24", + "aux25", + "aux26", + "aux27", + "aux28", + "aux29", + "aux30", + "aux31" }; static int32_t listValuesSize = sizeof(listValues)/sizeof(char*); diff --git a/audio/channel.h b/audio/channel.h index 856fedd..1749e23 100644 --- a/audio/channel.h +++ b/audio/channel.h @@ -16,33 +16,115 @@ #include "audio_msg/AudioBuffer.h" namespace audio { enum channel { - channel_unknow = audio_msg::AudioBuffer::CHANNEL_UNKNOW, - channel_frontLeft = audio_msg::AudioBuffer::CHANNEL_FRONT_LEFT, - channel_frontCenter = audio_msg::AudioBuffer::CHANNEL_FRONT_CENTER, - channel_frontRight = audio_msg::AudioBuffer::CHANNEL_FRONT_RIGHT, - channel_rearLeft = audio_msg::AudioBuffer::CHANNEL_REAR_LEFT, - channel_rearCenter = audio_msg::AudioBuffer::CHANNEL_REAR_CENTER, - channel_rearRight = audio_msg::AudioBuffer::CHANNEL_REAR_RIGHT, - channel_surroundLeft = audio_msg::AudioBuffer::CHANNEL_SURROUND_LEFT, - channel_surroundRight = audio_msg::AudioBuffer::CHANNEL_SURROUND_RIGHT, - channel_subWoofer = audio_msg::AudioBuffer::CHANNEL_SUBWOOFER, - channel_lfe = audio_msg::AudioBuffer::CHANNEL_LFE + channel_unknow = audio_msg::AudioBuffer::CHANNEL_UNKNOW, + channel_frontLeft = audio_msg::AudioBuffer::CHANNEL_FRONT_LEFT, + channel_frontCenter = audio_msg::AudioBuffer::CHANNEL_FRONT_CENTER, + channel_frontRight = audio_msg::AudioBuffer::CHANNEL_FRONT_RIGHT, + channel_rearLeft = audio_msg::AudioBuffer::CHANNEL_REAR_LEFT, + channel_rearCenter = audio_msg::AudioBuffer::CHANNEL_REAR_CENTER, + channel_rearRight = audio_msg::AudioBuffer::CHANNEL_REAR_RIGHT, + channel_centerLeft = audio_msg::AudioBuffer::CHANNEL_CENTER_LEFT, + channel_centerRight = audio_msg::AudioBuffer::CHANNEL_CENTER_RIGHT, + channel_topFrontLeft = audio_msg::AudioBuffer::CHANNEL_TOP_FRONT_LEFT, + channel_topFrontCenter = audio_msg::AudioBuffer::CHANNEL_TOP_FRONT_CENTER, + channel_topFrontRight = audio_msg::AudioBuffer::CHANNEL_TOP_FRONT_RIGHT, + channel_topRearLeft = audio_msg::AudioBuffer::CHANNEL_TOP_REAR_LEFT, + channel_topRearCenter = audio_msg::AudioBuffer::CHANNEL_TOP_REAR_CENTER, + channel_topRearRight = audio_msg::AudioBuffer::CHANNEL_TOP_REAR_RIGHT, + channel_topCenterLeft = audio_msg::AudioBuffer::CHANNEL_TOP_CENTER_LEFT, + channel_topCenterRight = audio_msg::AudioBuffer::CHANNEL_TOP_CENTER_RIGHT, + channel_lfe = audio_msg::AudioBuffer::CHANNEL_LFE, + channel_aux0 = audio_msg::AudioBuffer::CHANNEL_AUX0, + channel_aux1 = audio_msg::AudioBuffer::CHANNEL_AUX1, + channel_aux2 = audio_msg::AudioBuffer::CHANNEL_AUX2, + channel_aux3 = audio_msg::AudioBuffer::CHANNEL_AUX3, + channel_aux4 = audio_msg::AudioBuffer::CHANNEL_AUX4, + channel_aux5 = audio_msg::AudioBuffer::CHANNEL_AUX5, + channel_aux6 = audio_msg::AudioBuffer::CHANNEL_AUX6, + channel_aux7 = audio_msg::AudioBuffer::CHANNEL_AUX7, + channel_aux8 = audio_msg::AudioBuffer::CHANNEL_AUX8, + channel_aux9 = audio_msg::AudioBuffer::CHANNEL_AUX9, + channel_aux10 = audio_msg::AudioBuffer::CHANNEL_AUX10, + channel_aux11 = audio_msg::AudioBuffer::CHANNEL_AUX11, + channel_aux12 = audio_msg::AudioBuffer::CHANNEL_AUX12, + channel_aux13 = audio_msg::AudioBuffer::CHANNEL_AUX13, + channel_aux14 = audio_msg::AudioBuffer::CHANNEL_AUX14, + channel_aux15 = audio_msg::AudioBuffer::CHANNEL_AUX15, + channel_aux16 = audio_msg::AudioBuffer::CHANNEL_AUX16, + channel_aux17 = audio_msg::AudioBuffer::CHANNEL_AUX17, + channel_aux18 = audio_msg::AudioBuffer::CHANNEL_AUX18, + channel_aux19 = audio_msg::AudioBuffer::CHANNEL_AUX19, + channel_aux20 = audio_msg::AudioBuffer::CHANNEL_AUX20, + channel_aux21 = audio_msg::AudioBuffer::CHANNEL_AUX21, + channel_aux22 = audio_msg::AudioBuffer::CHANNEL_AUX22, + channel_aux23 = audio_msg::AudioBuffer::CHANNEL_AUX23, + channel_aux24 = audio_msg::AudioBuffer::CHANNEL_AUX24, + channel_aux25 = audio_msg::AudioBuffer::CHANNEL_AUX25, + channel_aux26 = audio_msg::AudioBuffer::CHANNEL_AUX26, + channel_aux27 = audio_msg::AudioBuffer::CHANNEL_AUX27, + channel_aux28 = audio_msg::AudioBuffer::CHANNEL_AUX28, + channel_aux29 = audio_msg::AudioBuffer::CHANNEL_AUX29, + channel_aux30 = audio_msg::AudioBuffer::CHANNEL_AUX30, + channel_aux31 = audio_msg::AudioBuffer::CHANNEL_AUX31, }; }; #else namespace audio { enum channel { channel_unknow, //!< Error channel ... + // normal level channel_frontLeft, //!< channel Front Left channel_frontCenter, //!< channel Front Center channel_frontRight, //!< channel Front Right channel_rearLeft, //!< channel rear Left channel_rearCenter, //!< channel rear Center channel_rearRight, //!< channel rear Right - channel_surroundLeft, //!< channel surround Left - channel_surroundRight, //!< channel surround Right - channel_subWoofer, //!< channel Sub-woofer + channel_centerLeft, //!< channel center Left + channel_centerRight, //!< channel center Right + // top level + channel_topFrontLeft, //!< channel top front left + channel_topFrontCenter, //!< channel top front center + channel_topFrontRight, //!< channel top front right + channel_topRearLeft, //!< channel top rear left + channel_topRearCenter, //!< channel top rear center + channel_topRearRight, //!< channel top rear Right + channel_topCenterLeft, //!< channel top center left + channel_topCenterRight, //!< channel top center right + // global elements channel_lfe, //!< channel Low frequency + // Some user auxyliary channel (audio mixing table) + channel_aux0, + channel_aux1, + channel_aux2, + channel_aux3, + channel_aux4, + channel_aux5, + channel_aux6, + channel_aux7, + channel_aux8, + channel_aux9, + channel_aux10, + channel_aux11, + channel_aux12, + channel_aux13, + channel_aux14, + channel_aux15, + channel_aux16, + channel_aux17, + channel_aux18, + channel_aux19, + channel_aux20, + channel_aux21, + channel_aux22, + channel_aux23, + channel_aux24, + channel_aux25, + channel_aux26, + channel_aux27, + channel_aux28, + channel_aux29, + channel_aux30, + channel_aux31, }; }; #endif