std::shared_ptr

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

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 3307d8f5c4ea68a347d69c984406586117132a2c..e3375b98839fc99cdd158ff3d96fa03bfc99518e 100644 (file)
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -39,27 +40,31 @@ using std::cout;
 using std::cerr;
 using std::string;
 using std::pair;
-using boost::shared_ptr;
-using dcp::Data;
+using std::shared_ptr;
+using boost::optional;
+using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using dcp::ArrayData;
 
 static shared_ptr<Film> film;
 static EncodeServerDescription* server;
-static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
 static int frame_count = 0;
 
 void
 process_video (shared_ptr<PlayerVideo> pvf)
 {
-       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_));
+       shared_ptr<DCPVideo> local  (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K));
+       shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K));
 
        cout << "Frame " << frame_count << ": ";
        cout.flush ();
 
        ++frame_count;
 
-       Data local_encoded = local->encode_locally (boost::bind (&Log::dcp_log, log_.get(), _1, _2));
-       Data remote_encoded;
+       ArrayData local_encoded = local->encode_locally ();
+       ArrayData remote_encoded;
 
        string remote_error;
        try {
@@ -78,8 +83,8 @@ process_video (shared_ptr<PlayerVideo> pvf)
                return;
        }
 
-       uint8_t* p = local_encoded.data().get ();
-       uint8_t* q = remote_encoded.data().get ();
+       uint8_t* p = local_encoded.data();
+       uint8_t* q = remote_encoded.data();
        for (int i = 0; i < local_encoded.size(); ++i) {
                if (*p++ != *q++) {
                        cout << "\033[0;31mdata differ\033[0m at byte " << i << "\n";
@@ -100,7 +105,7 @@ help (string n)
 int
 main (int argc, char* argv[])
 {
-       string film_dir;
+       boost::filesystem::path film_dir;
        string server_host;
 
        while (true) {
@@ -131,7 +136,7 @@ main (int argc, char* argv[])
                }
        }
 
-       if (server_host.empty() || film_dir.empty()) {
+       if (server_host.empty() || film_dir.string().empty()) {
                help (argv[0]);
                exit (EXIT_FAILURE);
        }
@@ -139,16 +144,13 @@ main (int argc, char* argv[])
        dcpomatic_setup ();
 
        try {
-               server = new EncodeServerDescription (server_host, 1);
+               server = new EncodeServerDescription (server_host, 1, SERVER_LINK_VERSION);
                film.reset (new Film (film_dir));
                film->read_metadata ();
 
-               shared_ptr<Player> 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) {
-                       process_video (player->get_video(t, true).front ());
-               }
+               shared_ptr<Player> player (new Player(film));
+               player->Video.connect (bind (&process_video, _1));
+               while (!player->pass ()) {}
        } catch (std::exception& e) {
                cerr << "Error: " << e.what() << "\n";
        }