X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fserver_test.cc;fp=src%2Ftools%2Fserver_test.cc;h=5e50df227ed703f87d229005e861d418df00c630;hp=0de05c342e83e63a1e83119e1d6fa8a68d894180;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=e669b562937786bf5b771c927cc03a4074b01be8 diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc index 0de05c342..5e50df227 100644 --- a/src/tools/server_test.cc +++ b/src/tools/server_test.cc @@ -31,7 +31,6 @@ #include "lib/player.h" #include "lib/player_video.h" #include "lib/encode_server_description.h" -#include #include #include #include @@ -42,19 +41,18 @@ using std::cerr; using std::string; using std::pair; using boost::shared_ptr; -using boost::make_shared; using dcp::Data; static shared_ptr film; static EncodeServerDescription* server; -static shared_ptr log_ = make_shared ("servomatictest.log"); +static shared_ptr log_ (new FileLog ("servomatictest.log")); static int frame_count = 0; void process_video (shared_ptr pvf) { - shared_ptr local = make_shared (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_); - shared_ptr remote = make_shared (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_); + shared_ptr local (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); + shared_ptr remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); cout << "Frame " << frame_count << ": "; cout.flush (); @@ -146,7 +144,7 @@ main (int argc, char* argv[]) film.reset (new Film (film_dir)); film->read_metadata (); - shared_ptr player = make_shared (film, film->playlist ()); + shared_ptr player (new Player (film, film->playlist ())); DCPTime const frame = DCPTime::from_frames (1, film->video_frame_rate ()); for (DCPTime t; t < film->length(); t += frame) {