diff options
| author | Chris Robinson <[email protected]> | 2020-06-15 13:49:45 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2020-06-15 13:49:45 -0700 |
| commit | 6db6d1510a0c5404b65cbf6598615d173b9b374e (patch) | |
| tree | 76e502e4cb3ddb7fe51eaffc263b3262fbec332c | |
| parent | 401a9bacd17ef7a08053a4edbc09d93c6f78a291 (diff) | |
Remove the Lower channel labels and rename the Upper labels
| -rw-r--r-- | alc/backends/pulseaudio.cpp | 14 | ||||
| -rw-r--r-- | alc/devformat.h | 15 | ||||
| -rw-r--r-- | alc/panning.cpp | 15 |
3 files changed, 21 insertions, 23 deletions
diff --git a/alc/backends/pulseaudio.cpp b/alc/backends/pulseaudio.cpp index aa9b0b4a..9281506c 100644 --- a/alc/backends/pulseaudio.cpp +++ b/alc/backends/pulseaudio.cpp @@ -268,13 +268,13 @@ al::optional<Channel> ChannelFromPulse(pa_channel_position_t chan) case PA_CHANNEL_POSITION_AUX29: break; case PA_CHANNEL_POSITION_AUX30: break; case PA_CHANNEL_POSITION_AUX31: break; - case PA_CHANNEL_POSITION_TOP_CENTER: break; - case PA_CHANNEL_POSITION_TOP_FRONT_LEFT: return al::make_optional(UpperFrontLeft); - case PA_CHANNEL_POSITION_TOP_FRONT_RIGHT: return al::make_optional(UpperFrontRight); - case PA_CHANNEL_POSITION_TOP_FRONT_CENTER: break; - case PA_CHANNEL_POSITION_TOP_REAR_LEFT: return al::make_optional(UpperBackLeft); - case PA_CHANNEL_POSITION_TOP_REAR_RIGHT: return al::make_optional(UpperBackRight); - case PA_CHANNEL_POSITION_TOP_REAR_CENTER: break; + case PA_CHANNEL_POSITION_TOP_CENTER: return al::make_optional(TopCenter); + case PA_CHANNEL_POSITION_TOP_FRONT_LEFT: return al::make_optional(TopFrontLeft); + case PA_CHANNEL_POSITION_TOP_FRONT_RIGHT: return al::make_optional(TopFrontRight); + case PA_CHANNEL_POSITION_TOP_FRONT_CENTER: return al::make_optional(TopFrontCenter); + case PA_CHANNEL_POSITION_TOP_REAR_LEFT: return al::make_optional(TopBackLeft); + case PA_CHANNEL_POSITION_TOP_REAR_RIGHT: return al::make_optional(TopBackRight); + case PA_CHANNEL_POSITION_TOP_REAR_CENTER: return al::make_optional(TopBackCenter); case PA_CHANNEL_POSITION_MAX: break; } WARN("Unexpected channel enum %d\n", chan); diff --git a/alc/devformat.h b/alc/devformat.h index d1624c9c..4e4b9a53 100644 --- a/alc/devformat.h +++ b/alc/devformat.h @@ -20,14 +20,13 @@ enum Channel { SideLeft, SideRight, - UpperFrontLeft, - UpperFrontRight, - UpperBackLeft, - UpperBackRight, - LowerFrontLeft, - LowerFrontRight, - LowerBackLeft, - LowerBackRight, + TopFrontLeft, + TopFrontCenter, + TopFrontRight, + TopCenter, + TopBackLeft, + TopBackCenter, + TopBackRight, MaxChannels }; diff --git a/alc/panning.cpp b/alc/panning.cpp index 655450b8..f8f3a8bb 100644 --- a/alc/panning.cpp +++ b/alc/panning.cpp @@ -90,14 +90,13 @@ inline const char *GetLabelFromChannel(Channel channel) case SideLeft: return "side-left"; case SideRight: return "side-right"; - case UpperFrontLeft: return "upper-front-left"; - case UpperFrontRight: return "upper-front-right"; - case UpperBackLeft: return "upper-back-left"; - case UpperBackRight: return "upper-back-right"; - case LowerFrontLeft: return "lower-front-left"; - case LowerFrontRight: return "lower-front-right"; - case LowerBackLeft: return "lower-back-left"; - case LowerBackRight: return "lower-back-right"; + case TopFrontLeft: return "top-front-left"; + case TopFrontCenter: return "top-front-center"; + case TopFrontRight: return "top-front-right"; + case TopCenter: return "top-center"; + case TopBackLeft: return "top-back-left"; + case TopBackCenter: return "top-back-center"; + case TopBackRight: return "top-back-right"; case MaxChannels: break; } |