diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-01 14:28:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-01 14:28:04 +0100 |
| commit | 15f23b356b757a9697bf1a9ec30c243ab8070404 (patch) | |
| tree | 5b86b032ea47f606bbadb0c32801e16064d341a9 /src/tools | |
| parent | 45e6a6df959188bfdb8dfc4906c35d1a3c234b0a (diff) | |
DCPVideoFrame -> DCPVideo and PlayerVideoFrame -> PlayerVideo.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_server_cli.cc | 2 | ||||
| -rw-r--r-- | src/tools/server_test.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc index e4ac85f4c..c74e258e8 100644 --- a/src/tools/dcpomatic_server_cli.cc +++ b/src/tools/dcpomatic_server_cli.cc @@ -33,7 +33,7 @@ #include <boost/thread/mutex.hpp> #include <boost/thread/condition.hpp> #include "lib/config.h" -#include "lib/dcp_video_frame.h" +#include "lib/dcp_video.h" #include "lib/exceptions.h" #include "lib/util.h" #include "lib/config.h" diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc index 5997caab6..acafa4a81 100644 --- a/src/tools/server_test.cc +++ b/src/tools/server_test.cc @@ -27,14 +27,14 @@ #include "lib/util.h" #include "lib/scaler.h" #include "lib/server.h" -#include "lib/dcp_video_frame.h" +#include "lib/dcp_video.h" #include "lib/decoder.h" #include "lib/exceptions.h" #include "lib/scaler.h" #include "lib/log.h" #include "lib/video_decoder.h" #include "lib/player.h" -#include "lib/player_video_frame.h" +#include "lib/player_video.h" using std::cout; using std::cerr; @@ -48,10 +48,10 @@ static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log")); static int frame_count = 0; void -process_video (shared_ptr<PlayerVideoFrame> pvf) +process_video (shared_ptr<PlayerVideo> pvf) { - shared_ptr<DCPVideoFrame> local (new DCPVideoFrame (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); - shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); + shared_ptr<DCPVideo> local (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); + shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); cout << "Frame " << frame_count << ": "; cout.flush (); |