Merge master; fix crash on new film.

[dcpomatic.git] / src / tools / servomatictest.cc

diff --git a/src/tools/servomatictest.cc b/src/tools/servomatictest.cc
index 41ec8075d174396f4dcee631ed390fcda281f178..af176ac18e6b02ea011cc526bd3a4a581b49e128 100644 (file)
--- a/src/tools/servomatictest.cc
+++ b/src/tools/servomatictest.cc
@@ -28,28 +28,45 @@
 #include "scaler.h"
 #include "server.h"
 #include "dcp_video_frame.h"
-#include "options.h"
 #include "decoder.h"
 #include "exceptions.h"
 #include "scaler.h"
 #include "log.h"
-#include "decoder_factory.h"
+#include "video_decoder.h"
+#include "player.h"
 
-using namespace std;
-using namespace boost;
+using std::cout;
+using std::cerr;
+using std::string;
+using std::pair;
+using boost::shared_ptr;
 
-static Server* server;
-static Log log_ ("servomatictest.log");
+static ServerDescription* server;
+static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
+static int frame = 0;
 
 void
-process_video (shared_ptr<Image> image, int frame)
+process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub)
 {
-       shared_ptr<DCPVideoFrame> local (new DCPVideoFrame (image, Size (1024, 1024), 0, Scaler::from_id ("bicubic"), frame, 24, "", 0, 250000000, &log_));
-       shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (image, Size (1024, 1024), 0, Scaler::from_id ("bicubic"), frame, 24, "", 0, 250000000, &log_));
+       shared_ptr<DCPVideoFrame> local (
+               new DCPVideoFrame (
+                       image, sub,
+                       libdcp::Size (1024, 1024), 0, 0, 0,
+                       Scaler::from_id ("bicubic"), frame, 24, "", 0, 250000000, log_)
+               );
+       
+       shared_ptr<DCPVideoFrame> remote (
+               new DCPVideoFrame (
+                       image, sub,
+                       libdcp::Size (1024, 1024), 0, 0, 0,
+                       Scaler::from_id ("bicubic"), frame, 24, "", 0, 250000000, log_)
+               );
 
        cout << "Frame " << frame << ": ";
        cout.flush ();
 
+       ++frame;
+
        shared_ptr<EncodedData> local_encoded = local->encode_locally ();
        shared_ptr<EncodedData> remote_encoded;
 
@@ -128,19 +145,20 @@ main (int argc, char* argv[])
                exit (EXIT_FAILURE);
        }
 
-       dvdomatic_setup ();
+       dcpomatic_setup ();
 
-       server = new Server (server_host, 1);
-       Film film (film_dir, true);
+       server = new ServerDescription (server_host, 1);
+       shared_ptr<Film> film (new Film (film_dir, true));
 
-       shared_ptr<Options> opt (new Options ("fred", "jim", "sheila"));
-       opt->out_size = Size (1024, 1024);
-       opt->decode_audio = false;
+       shared_ptr<Player> player = film->player ();
+       player->disable_audio ();
 
-       shared_ptr<Decoder> decoder = decoder_factory (film.state_copy(), opt, 0, &log_);
        try {
-               decoder->Video.connect (sigc::ptr_fun (process_video));
-               decoder->go ();
+               player->Video.connect (boost::bind (process_video, _1, _2, _3));
+               bool done = false;
+               while (!done) {
+                       done = player->pass ();
+               }
        } catch (std::exception& e) {
                cerr << "Error: " << e.what() << "\n";
        }