summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-03-08 21:03:28 +0000
committerCarl Hetherington <cth@carlh.net>2013-03-08 21:03:28 +0000
commitbb95f333f15ace7c032bb5b5761b512b6fe2e84e (patch)
treed9486a34d1980804ceb9b2203e46de1bdf3bf9d8 /test
parent8af3fc82eb7d5955b09d94e1cc142f6a3adcf370 (diff)
Numerous fixes to A/B mode so that at least it doesn't crash (#72).
Diffstat (limited to 'test')
-rw-r--r--test/test.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/test.cc b/test/test.cc
index 15c34ca78..448168f24 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -254,9 +254,9 @@ public:
void
do_positive_delay_line_test (int delay_length, int data_length)
{
- NullLog log;
+ shared_ptr<NullLog> log (new NullLog);
- DelayLine d (&log, 6, delay_length);
+ DelayLine d (log, 6, delay_length);
shared_ptr<AudioBuffers> data (new AudioBuffers (6, data_length));
int in = 0;
@@ -297,9 +297,9 @@ do_positive_delay_line_test (int delay_length, int data_length)
void
do_negative_delay_line_test (int delay_length, int data_length)
{
- NullLog log;
+ shared_ptr<NullLog> log (new NullLog);
- DelayLine d (&log, 6, delay_length);
+ DelayLine d (log, 6, delay_length);
shared_ptr<AudioBuffers> data (new AudioBuffers (6, data_length));
int in = 0;
@@ -406,7 +406,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
shared_ptr<Subtitle> subtitle (new Subtitle (Position (50, 60), sub_image));
- FileLog log ("build/test/client_server_test.log");
+ shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log"));
shared_ptr<DCPVideoFrame> frame (
new DCPVideoFrame (
@@ -422,14 +422,14 @@ BOOST_AUTO_TEST_CASE (client_server_test)
"",
0,
200000000,
- &log
+ log
)
);
shared_ptr<EncodedData> locally_encoded = frame->encode_locally ();
BOOST_ASSERT (locally_encoded);
- Server* server = new Server (&log);
+ Server* server = new Server (log);
new thread (boost::bind (&Server::run, server, 2));