diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-12-13 10:06:18 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-12-13 10:06:18 +0000 |
| commit | 097a1fb413bbbb89182161d4c1a31daa5419ec96 (patch) | |
| tree | 87d6ed5b14e7554b26f565380b69528ab3ec10ec /test | |
| parent | ea910e250a0fb3b0ad3ce0cf32dd27b24c17cd1d (diff) | |
Time -> DCPTime.
Diffstat (limited to 'test')
| -rw-r--r-- | test/ffmpeg_seek_test.cc | 12 | ||||
| -rw-r--r-- | test/long_ffmpeg_seek_test.cc | 12 | ||||
| -rw-r--r-- | test/play_test.cc | 6 |
3 files changed, 15 insertions, 15 deletions
diff --git a/test/ffmpeg_seek_test.cc b/test/ffmpeg_seek_test.cc index 7014bf1b0..f587d6cc6 100644 --- a/test/ffmpeg_seek_test.cc +++ b/test/ffmpeg_seek_test.cc @@ -31,11 +31,11 @@ using boost::shared_ptr; #define FFMPEG_SEEK_TEST_DEBUG 1 -boost::optional<Time> first_video; -boost::optional<Time> first_audio; +boost::optional<DCPTime> first_video; +boost::optional<DCPTime> first_audio; static void -process_video (shared_ptr<PlayerImage>, Eyes, ColourConversion, bool, Time t) +process_video (shared_ptr<PlayerImage>, Eyes, ColourConversion, bool, DCPTime t) { if (!first_video) { first_video = t; @@ -43,7 +43,7 @@ process_video (shared_ptr<PlayerImage>, Eyes, ColourConversion, bool, Time t) } static void -process_audio (shared_ptr<const AudioBuffers>, Time t) +process_audio (shared_ptr<const AudioBuffers>, DCPTime t) { if (!first_audio) { first_audio = t; @@ -51,7 +51,7 @@ process_audio (shared_ptr<const AudioBuffers>, Time t) } static string -print_time (Time t, float fps) +print_time (DCPTime t, float fps) { stringstream s; s << t << " " << (float(t) / TIME_HZ) << "s " << (float(t) * fps / TIME_HZ) << "f"; @@ -59,7 +59,7 @@ print_time (Time t, float fps) } static void -check (shared_ptr<Player> p, Time t) +check (shared_ptr<Player> p, DCPTime t) { first_video.reset (); first_audio.reset (); diff --git a/test/long_ffmpeg_seek_test.cc b/test/long_ffmpeg_seek_test.cc index 5f7f6c2f2..5285d4481 100644 --- a/test/long_ffmpeg_seek_test.cc +++ b/test/long_ffmpeg_seek_test.cc @@ -31,11 +31,11 @@ using boost::shared_ptr; #define LONG_FFMPEG_SEEK_TEST_DEBUG 1 -boost::optional<Time> first_video; -boost::optional<Time> first_audio; +boost::optional<DCPTime> first_video; +boost::optional<DCPTime> first_audio; static void -process_video (shared_ptr<PlayerImage>, Eyes, ColourConversion, bool, Time t) +process_video (shared_ptr<PlayerImage>, Eyes, ColourConversion, bool, DCPTime t) { if (!first_video) { first_video = t; @@ -43,7 +43,7 @@ process_video (shared_ptr<PlayerImage>, Eyes, ColourConversion, bool, Time t) } static void -process_audio (shared_ptr<const AudioBuffers>, Time t) +process_audio (shared_ptr<const AudioBuffers>, DCPTime t) { if (!first_audio) { first_audio = t; @@ -51,7 +51,7 @@ process_audio (shared_ptr<const AudioBuffers>, Time t) } static string -print_time (Time t, float fps) +print_time (DCPTime t, float fps) { stringstream s; s << t << " " << (float(t) / TIME_HZ) << "s " << (float(t) * fps / TIME_HZ) << "f"; @@ -59,7 +59,7 @@ print_time (Time t, float fps) } static void -check (shared_ptr<Player> p, Time t) +check (shared_ptr<Player> p, DCPTime t) { first_video.reset (); first_audio.reset (); diff --git a/test/play_test.cc b/test/play_test.cc index dfa597431..c9486d161 100644 --- a/test/play_test.cc +++ b/test/play_test.cc @@ -34,7 +34,7 @@ struct Video { boost::shared_ptr<Content> content; boost::shared_ptr<const Image> image; - Time time; + DCPTime time; }; class PlayerWrapper @@ -46,7 +46,7 @@ public: _player->Video.connect (bind (&PlayerWrapper::process_video, this, _1, _2, _5)); } - void process_video (shared_ptr<PlayerImage> i, bool, Time t) + void process_video (shared_ptr<PlayerImage> i, bool, DCPTime t) { Video v; v.content = _player->_last_video; @@ -67,7 +67,7 @@ public: return v; } - void seek (Time t, bool ac) + void seek (DCPTime t, bool ac) { _player->seek (t, ac); _queue.clear (); |