diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-06 21:40:57 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-05-06 21:40:57 +0100 |
| commit | f819545c46036cb57b243deba15c11587b319347 (patch) | |
| tree | 049221acdd4c9aa37c8da4ebe412def9b41a68e9 | |
| parent | f1f2e2b1003c03b718800547e713260a7ef93ff7 (diff) | |
| parent | 1417c1c7f05f438c44fc117bbdca428b3eefae23 (diff) | |
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/libdcp
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | src/sound_asset.cc | 9 | ||||
| -rw-r--r-- | src/types.h | 8 |
3 files changed, 13 insertions, 6 deletions
@@ -1,7 +1,7 @@ import os def dependencies(target): - return (('libcxml', 'v0.11.0'), ('openjpeg-cdist', '5d8bffd')) + return (('libcxml', 'f35787e'), ('openjpeg-cdist', '5d8bffd')) def build(target, options): cmd = './waf configure --prefix=%s' % target.directory 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<boost::filesystem::path (Channel)> 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 |