Split audio; builds.

1 files changed, 25 insertions, 22 deletions

diff --git a/test/audio_decoder_test.cc b/test/audio_decoder_test.cc
index 2c6794a76..f714e0682 100644
--- a/test/audio_decoder_test.cc
+++ b/test/audio_decoder_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,11 +21,13 @@
  *  @brief Tests of the AudioDecoder class.
  */
 
-#include <cassert>
-#include <boost/test/unit_test.hpp>
 #include "test.h"
+#include "lib/content.h"
 #include "lib/audio_decoder.h"
-#include "lib/single_stream_audio_content.h"
+#include "lib/audio_content.h"
+#include "lib/film.h"
+#include <boost/test/unit_test.hpp>
+#include <cassert>
 #include <iostream>
 
 using std::string;
@@ -33,14 +35,14 @@ using std::cout;
 using std::min;
 using boost::shared_ptr;
 
-class TestAudioContent : public SingleStreamAudioContent
+class TestAudioContent : public Content
 {
 public:
 	TestAudioContent (shared_ptr<const Film> film)
 		: Content (film)
-		, SingleStreamAudioContent (film)
  	{
-		_audio_stream.reset (new AudioStream (48000, 2));
+		audio.reset (new AudioContent (this, film));
+		audio->set_stream (AudioStreamPtr (new AudioStream (48000, 2)));
 	}
 
 	std::string summary () const {
@@ -48,19 +50,19 @@ public:
 	}
 
 	DCPTime full_length () const {
-		return DCPTime::from_seconds (float (audio_length()) / audio_stream()->frame_rate ());
+		return DCPTime::from_seconds (float (audio_length()) / audio->stream()->frame_rate ());
 	}
 
 	Frame audio_length () const {
-		return llrint (61.2942 * audio_stream()->frame_rate ());
+		return llrint (61.2942 * audio->stream()->frame_rate ());
 	}
 };
 
 class TestAudioDecoder : public AudioDecoder
 {
 public:
-	TestAudioDecoder (shared_ptr<TestAudioContent> content)
-		: AudioDecoder (content, false)
+	TestAudioDecoder (shared_ptr<TestAudioContent> content, shared_ptr<Log> log)
+		: AudioDecoder (content->audio, false, log)
 		, _test_audio_content (content)
 		, _position (0)
 	{}
@@ -72,14 +74,14 @@ public:
 			_test_audio_content->audio_length() - _position
 			);
 
-		shared_ptr<AudioBuffers> buffers (new AudioBuffers (_test_audio_content->audio_stream()->channels(), N));
-		for (int i = 0; i < _test_audio_content->audio_stream()->channels(); ++i) {
+		shared_ptr<AudioBuffers> buffers (new AudioBuffers (_test_audio_content->audio->stream()->channels(), N));
+		for (int i = 0; i < _test_audio_content->audio->stream()->channels(); ++i) {
 			for (int j = 0; j < N; ++j) {
 				buffers->data(i)[j] = j + _position;
 			}
 		}
 
-		audio (_test_audio_content->audio_stream(), buffers, ContentTime::from_frames (_position, 48000));
+		audio (_test_audio_content->audio->stream(), buffers, ContentTime::from_frames (_position, 48000));
 		_position += N;
 
 		return N < 2000;
@@ -88,7 +90,7 @@ public:
 	void seek (ContentTime t, bool accurate)
 	{
 		AudioDecoder::seek (t, accurate);
-		_position = t.frames_round (_test_audio_content->resampled_audio_frame_rate ());
+		_position = t.frames_round (_test_audio_content->audio->resampled_audio_frame_rate ());
 	}
 
 private:
@@ -102,8 +104,8 @@ shared_ptr<TestAudioDecoder> decoder;
 static ContentAudio
 get (Frame from, Frame length)
 {
-	decoder->seek (ContentTime::from_frames (from, content->resampled_audio_frame_rate ()), true);
-	ContentAudio ca = decoder->get_audio (content->audio_stream(), from, length, true);
+	decoder->seek (ContentTime::from_frames (from, content->audio->resampled_audio_frame_rate ()), true);
+	ContentAudio ca = decoder->get_audio (content->audio->stream(), from, length, true);
 	BOOST_CHECK_EQUAL (ca.frame, from);
 	return ca;
 }
@@ -112,7 +114,7 @@ static void
 check (Frame from, Frame length)
 {
 	ContentAudio ca = get (from, length);
-	for (int i = 0; i < content->audio_stream()->channels(); ++i) {
+	for (int i = 0; i < content->audio->stream()->channels(); ++i) {
 		for (int j = 0; j < length; ++j) {
 			BOOST_REQUIRE_EQUAL (ca.audio->data(i)[j], j + from);
 		}
@@ -125,20 +127,21 @@ BOOST_AUTO_TEST_CASE (audio_decoder_get_audio_test)
 	shared_ptr<Film> film = new_test_film ("audio_decoder_test");
 
 	content.reset (new TestAudioContent (film));
-	decoder.reset (new TestAudioDecoder (content));
+	decoder.reset (new TestAudioDecoder (content, film->log()));
 
 	/* Simple reads */
+
 	check (0, 48000);
 	check (44, 9123);
 	check (9991, 22);
 
 	/* Read off the end */
 
-	Frame const from = content->resampled_audio_frame_rate() * 61;
-	Frame const length = content->resampled_audio_frame_rate() * 4;
+	Frame const from = content->audio->resampled_audio_frame_rate() * 61;
+	Frame const length = content->audio->resampled_audio_frame_rate() * 4;
 	ContentAudio ca = get (from, length);
 
-	for (int i = 0; i < content->audio_stream()->channels(); ++i) {
+	for (int i = 0; i < content->audio->stream()->channels(); ++i) {
 		for (int j = 0; j < ca.audio->frames(); ++j) {
 			BOOST_REQUIRE_EQUAL (ca.audio->data(i)[j], j + from);
 		}