Move Behaviour enum out to types.h

4 files changed, 17 insertions, 17 deletions

diff --git a/test/butler_test.cc b/test/butler_test.cc
index 706d0e424..5d7d8116c 100644
--- a/test/butler_test.cc
+++ b/test/butler_test.cc
@@ -66,13 +66,13 @@ BOOST_AUTO_TEST_CASE (butler_test1)
 		Butler::Audio::ENABLED
 		);
 
-	BOOST_CHECK (butler.get_video(Butler::Behaviour::BLOCKING, 0).second == DCPTime());
-	BOOST_CHECK (butler.get_video(Butler::Behaviour::BLOCKING, 0).second == DCPTime::from_frames(1, 24));
-	BOOST_CHECK (butler.get_video(Butler::Behaviour::BLOCKING, 0).second == DCPTime::from_frames(2, 24));
+	BOOST_CHECK(butler.get_video(Behaviour::BLOCKING, 0).second == DCPTime());
+	BOOST_CHECK(butler.get_video(Behaviour::BLOCKING, 0).second == DCPTime::from_frames(1, 24));
+	BOOST_CHECK(butler.get_video(Behaviour::BLOCKING, 0).second == DCPTime::from_frames(2, 24));
 	/* XXX: check the frame contents */
 
 	float buffer[256 * 6];
-	BOOST_REQUIRE (butler.get_audio(Butler::Behaviour::BLOCKING, buffer, 256) == DCPTime());
+	BOOST_REQUIRE(butler.get_audio(Behaviour::BLOCKING, buffer, 256) == DCPTime());
 	for (int i = 0; i < 256; ++i) {
 		BOOST_REQUIRE_EQUAL (buffer[i * 6 + 0], 0);
 		BOOST_REQUIRE_EQUAL (buffer[i * 6 + 1], 0);
@@ -116,15 +116,15 @@ BOOST_AUTO_TEST_CASE (butler_test2)
 	int const audio_frames_per_video_frame = 48000 / 25;
 	float audio_buffer[audio_frames_per_video_frame * 6];
 	for (int i = 0; i < 16; ++i) {
-		butler.get_video(Butler::Behaviour::BLOCKING, 0);
-		butler.get_audio(Butler::Behaviour::BLOCKING, audio_buffer, audio_frames_per_video_frame);
+		butler.get_video(Behaviour::BLOCKING, 0);
+		butler.get_audio(Behaviour::BLOCKING, audio_buffer, audio_frames_per_video_frame);
 	}
 
 	butler.seek (DCPTime::from_seconds(60), false);
 
 	for (int i = 0; i < 240; ++i) {
-		butler.get_video(Butler::Behaviour::BLOCKING, 0);
-		butler.get_audio(Butler::Behaviour::BLOCKING, audio_buffer, audio_frames_per_video_frame);
+		butler.get_video(Behaviour::BLOCKING, 0);
+		butler.get_audio(Behaviour::BLOCKING, audio_buffer, audio_frames_per_video_frame);
 	}
 
 	butler.rethrow();
diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc
index 7b2280883..58155e8ec 100644
--- a/test/dcp_playback_test.cc
+++ b/test/dcp_playback_test.cc
@@ -54,12 +54,12 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test)
 
 	std::vector<float> audio_buffer(2000 * 6);
 	while (true) {
-		auto p = butler->get_video (Butler::Behaviour::BLOCKING, 0);
+		auto p = butler->get_video(Behaviour::BLOCKING, 0);
 		if (!p.first) {
 			break;
 		}
 		/* assuming DCP is 24fps/48kHz */
-		butler->get_audio (Butler::Behaviour::BLOCKING, audio_buffer.data(), 2000);
+		butler->get_audio(Behaviour::BLOCKING, audio_buffer.data(), 2000);
 		p.first->image(AV_PIX_FMT_RGB24, VideoRange::FULL, true);
 	}
 }
diff --git a/test/player_test.cc b/test/player_test.cc
index 384a73ebc..5c5acb18c 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -223,7 +223,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test)
 	for (int i = 0; i < 10; ++i) {
 		auto t = DCPTime::from_frames (i, 24);
 		butler->seek (t, true);
-		auto video = butler->get_video(Butler::Behaviour::BLOCKING, 0);
+		auto video = butler->get_video(Behaviour::BLOCKING, 0);
 		BOOST_CHECK_EQUAL(video.second.get(), t.get());
 		write_image(video.first->image(AV_PIX_FMT_RGB24, VideoRange::FULL, true), String::compose("build/test/player_seek_test_%1.png", i));
 		/* This 14.08 is empirically chosen (hopefully) to accept changes in rendering between the reference and a test machine
@@ -258,7 +258,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2)
 	for (int i = 0; i < 10; ++i) {
 		auto t = DCPTime::from_seconds(5) + DCPTime::from_frames (i, 24);
 		butler->seek (t, true);
-		auto video = butler->get_video(Butler::Behaviour::BLOCKING, 0);
+		auto video = butler->get_video(Behaviour::BLOCKING, 0);
 		BOOST_CHECK_EQUAL(video.second.get(), t.get());
 		write_image(
 			video.first->image(AV_PIX_FMT_RGB24, VideoRange::FULL, true), String::compose("build/test/player_seek_test2_%1.png", i)
@@ -477,8 +477,8 @@ BOOST_AUTO_TEST_CASE (encrypted_dcp_with_no_kdm_gives_no_butler_error)
 
 	float buffer[2000 * 6];
 	for (int i = 0; i < length; ++i) {
-		butler.get_video(Butler::Behaviour::BLOCKING, 0);
-		butler.get_audio(Butler::Behaviour::BLOCKING, buffer, 2000);
+		butler.get_video(Behaviour::BLOCKING, 0);
+		butler.get_audio(Behaviour::BLOCKING, buffer, 2000);
 	}
 
 	BOOST_CHECK_NO_THROW(butler.rethrow());
@@ -745,7 +745,7 @@ BOOST_AUTO_TEST_CASE(frames_are_copied_correctly_for_low_frame_rates)
 
 	/* Check that only red frames come out - previously there would be some black ones mixed in */
 	for (auto i = 0; i < 24; ++i) {
-		auto frame = butler.get_video(Butler::Behaviour::BLOCKING);
+		auto frame = butler.get_video(Behaviour::BLOCKING);
 		auto image = frame.first->image(AV_PIX_FMT_RGB24, VideoRange::FULL, false);
 		for (int y = 0; y < image->size().height; ++y) {
 			uint8_t const* p = image->data()[0] + image->stride()[0] * y;
diff --git a/test/threed_test.cc b/test/threed_test.cc
index 5508eb735..241ffe7df 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -283,8 +283,8 @@ BOOST_AUTO_TEST_CASE (threed_test_butler_overfill)
 	butler->seek(dcpomatic::DCPTime(), true);
 	Butler::Error error;
 	for (auto i = 0; i < 960; ++i) {
-		butler->get_video(Butler::Behaviour::BLOCKING, &error);
-		butler->get_audio(Butler::Behaviour::BLOCKING, audio.data(), audio_frames);
+		butler->get_video(Behaviour::BLOCKING, &error);
+		butler->get_audio(Behaviour::BLOCKING, audio.data(), audio_frames);
 	}
 	BOOST_REQUIRE (error.code == Butler::Error::Code::NONE);
 }