diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-09 22:51:30 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-09 22:51:30 +0100 |
| commit | 9579bfdec2fab28fc221e397cf848a08e48f6840 (patch) | |
| tree | c05ccf3061815c81f9496edfd2b03e9752edd4f4 /src/lib | |
| parent | cb88e67a861161c49d350cbdc7d5006bbd94ffa1 (diff) | |
MAX_AUDIO_CHANNELS -> MAX_DCP_AUDIO_CHANNELS.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/audio_mapping.cc | 6 | ||||
| -rw-r--r-- | src/lib/util.cc | 2 | ||||
| -rw-r--r-- | src/lib/util.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc index ae7702998..28a0fc380 100644 --- a/src/lib/audio_mapping.cc +++ b/src/lib/audio_mapping.cc @@ -53,7 +53,7 @@ AudioMapping::setup (int c) _gain.resize (_content_channels); for (int i = 0; i < _content_channels; ++i) { - _gain[i].resize (MAX_AUDIO_CHANNELS); + _gain[i].resize (MAX_DCP_AUDIO_CHANNELS); } } @@ -61,7 +61,7 @@ void AudioMapping::make_default () { for (int i = 0; i < _content_channels; ++i) { - for (int j = 0; j < MAX_AUDIO_CHANNELS; ++j) { + for (int j = 0; j < MAX_DCP_AUDIO_CHANNELS; ++j) { _gain[i][j] = 0; } } @@ -117,7 +117,7 @@ AudioMapping::as_xml (xmlpp::Node* node) const node->add_child ("ContentChannels")->add_child_text (lexical_cast<string> (_content_channels)); for (int c = 0; c < _content_channels; ++c) { - for (int d = 0; d < MAX_AUDIO_CHANNELS; ++d) { + for (int d = 0; d < MAX_DCP_AUDIO_CHANNELS; ++d) { xmlpp::Element* t = node->add_child ("Gain"); t->set_attribute ("Content", lexical_cast<string> (c)); t->set_attribute ("DCP", lexical_cast<string> (d)); diff --git a/src/lib/util.cc b/src/lib/util.cc index f15d2283c..62416163b 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -790,7 +790,7 @@ video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, fl string audio_channel_name (int c) { - assert (MAX_AUDIO_CHANNELS == 12); + assert (MAX_DCP_AUDIO_CHANNELS == 12); /* TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency enhancement channel (sub-woofer). HI is the hearing-impaired audio track and diff --git a/src/lib/util.h b/src/lib/util.h index 0bbab8305..473c90239 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -48,8 +48,8 @@ extern "C" { #undef check -/** The maximum number of audio channels that we can cope with */ -#define MAX_AUDIO_CHANNELS 12 +/** The maximum number of audio channels that we can have in a DCP */ +#define MAX_DCP_AUDIO_CHANNELS 12 #define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way" |