projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve thumbprint dialog; disallow thumbprint editing and make OK only sensitive...
[dcpomatic.git]
/
test
/
frame_rate_test.cc
diff --git
a/test/frame_rate_test.cc
b/test/frame_rate_test.cc
index 90216af5cfa5b3a800031a42f769e768aedce351..d54868b3fbde8ca6ee4ec921cd6fdd6c25b12d17 100644
(file)
--- a/
test/frame_rate_test.cc
+++ b/
test/frame_rate_test.cc
@@
-18,24
+18,26
@@
*/
*/
+
/** @file test/frame_rate_test.cc
* @brief Tests for FrameRateChange and the computation of the best
* frame rate for the DCP.
* @ingroup feature
*/
/** @file test/frame_rate_test.cc
* @brief Tests for FrameRateChange and the computation of the best
* frame rate for the DCP.
* @ingroup feature
*/
-#include <boost/test/unit_test.hpp>
-#include "lib/
film
.h"
+
+#include "lib/
audio_content
.h"
#include "lib/config.h"
#include "lib/config.h"
-#include "lib/ffmpeg_content.h"
-#include "lib/playlist.h"
#include "lib/ffmpeg_audio_stream.h"
#include "lib/ffmpeg_audio_stream.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
#include "lib/frame_rate_change.h"
#include "lib/frame_rate_change.h"
+#include "lib/playlist.h"
#include "lib/video_content.h"
#include "lib/video_content.h"
-#include "lib/audio_content.h"
#include "test.h"
#include "test.h"
+#include <boost/test/unit_test.hpp>
+
-using std::shared_ptr;
/* Test Playlist::best_dcp_frame_rate and FrameRateChange
with a single piece of content.
/* Test Playlist::best_dcp_frame_rate and FrameRateChange
with a single piece of content.
@@
-263,7
+265,7
@@
BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
afr.push_back (30);
Config::instance()->set_allowed_dcp_frame_rates (afr);
afr.push_back (30);
Config::instance()->set_allowed_dcp_frame_rates (afr);
-
shared_ptr<FFmpegAudioStream> stream (new FFmpegAudioStream ("foo", 0, 0, 0, 0)
);
+
auto stream = std::make_shared<FFmpegAudioStream>("foo", 0, 0, 0, 0, 0
);
content->audio.reset (new AudioContent (content.get()));
content->audio->add_stream (stream);
content->_video_frame_rate = 24;
content->audio.reset (new AudioContent (content.get()));
content->audio->add_stream (stream);
content->_video_frame_rate = 24;