From 1417c1c7f05f438c44fc117bbdca428b3eefae23 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 6 May 2015 15:19:16 +0100 Subject: [PATCH] Increase number of channels in the Channel enum just in case casting to it from int is undefined if the int is out of range. --- src/sound_asset.cc | 9 ++++++--- src/types.h | 8 ++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/sound_asset.cc b/src/sound_asset.cc index baf8523a..179f6cd5 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -115,9 +115,12 @@ SoundAsset::create (boost::function get_path) LFE, LS, RS, - /* XXX: not quite sure what these should be yet */ - CHANNEL_7, - CHANNEL_8 + HI, + VI, + LC, + RC, + BSL, + BSR }; assert (int(_channels) <= int(sizeof(channels) / sizeof(Channel))); diff --git a/src/types.h b/src/types.h index e02c36eb..a309121a 100644 --- a/src/types.h +++ b/src/types.h @@ -42,8 +42,12 @@ enum Channel { LFE = 3, ///< low-frequency effects (sub) LS = 4, ///< left surround RS = 5, ///< right surround - CHANNEL_7 = 6, ///< channel 7; not sure what this should be called - CHANNEL_8 = 7 ///< channel 8; not sure what this should be called + HI = 6, + VI = 7, + LC = 8, + RC = 9, + BSL = 10, + BSR = 111 }; enum ContentKind -- 2.30.2