summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-11-14 20:04:15 +0000
committerCarl Hetherington <cth@carlh.net>2012-11-14 20:04:15 +0000
commit05c37b9bb09f7bfa4c2ec8ea6b3fa4a83d0fec20 (patch)
treefa7a3e408c2eb66b070864694b6af7e0787e508f /test
parent5161626c3c28ba528511a8b211286a5e81a0f02a (diff)
Tests pass again.
Diffstat (limited to 'test')
-rw-r--r--test/metadata.ref5
-rw-r--r--test/test.cc7
2 files changed, 5 insertions, 7 deletions
diff --git a/test/metadata.ref b/test/metadata.ref
index 8276d59e2..af6e9fddb 100644
--- a/test/metadata.ref
+++ b/test/metadata.ref
@@ -13,11 +13,10 @@ scaler bicubic
dcp_trim_start 42
dcp_trim_end 99
dcp_ab 1
-selected_audio_stream -1
+use_content_audio 1
audio_gain 0
audio_delay 0
still_duration 10
-selected_subtitle_stream -1
with_subtitles 0
subtitle_offset 0
subtitle_scale 1
@@ -31,7 +30,5 @@ package_type
width 0
height 0
length 0
-audio_sample_rate 0
content_digest
-has_subtitles 0
frames_per_second 0
diff --git a/test/test.cc b/test/test.cc
index 423501296..89a56872b 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -520,11 +520,12 @@ BOOST_AUTO_TEST_CASE (job_manager_test)
BOOST_AUTO_TEST_CASE (stream_test)
{
- AudioStream a ("4 9 hello there world");
+ AudioStream a ("4 44100 1 hello there world");
BOOST_CHECK_EQUAL (a.id(), 4);
- BOOST_CHECK_EQUAL (a.channels(), 9);
+ BOOST_CHECK_EQUAL (a.sample_rate(), 44100);
+ BOOST_CHECK_EQUAL (a.channel_layout(), 1);
BOOST_CHECK_EQUAL (a.name(), "hello there world");
- BOOST_CHECK_EQUAL (a.to_string(), "4 9 hello there world");
+ BOOST_CHECK_EQUAL (a.to_string(), "4 44100 1 hello there world");
SubtitleStream s ("5 a b c");
BOOST_CHECK_EQUAL (s.id(), 5);