projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use an enum instead of a bool to specify blocking/non-blocking.
[dcpomatic.git]
/
test
/
dcp_playback_test.cc
diff --git
a/test/dcp_playback_test.cc
b/test/dcp_playback_test.cc
index 2ab7eaec37deb90d6b0ad1ea3ca6f649ad5ae251..892825753378bb852ab6ed154b74482a81d094d8 100644
(file)
--- a/
test/dcp_playback_test.cc
+++ b/
test/dcp_playback_test.cc
@@
-55,15
+55,14
@@
BOOST_AUTO_TEST_CASE (dcp_playback_test)
false
);
false
);
-
auto audio_buffer = new float[2000 * 6]
;
+
std::vector<float> audio_buffer(2000 * 6)
;
while (true) {
while (true) {
- auto p = butler->get_video (
true
, 0);
+ auto p = butler->get_video (
Butler::Behaviour::BLOCKING
, 0);
if (!p.first) {
break;
}
/* assuming DCP is 24fps/48kHz */
if (!p.first) {
break;
}
/* assuming DCP is 24fps/48kHz */
- butler->get_audio (audio_buffer, 2000);
+ butler->get_audio (audio_buffer
.data()
, 2000);
p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
}
p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
}
- delete[] audio_buffer;
}
}