projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basic grunt-work, untested and unfinished, but it compiles.
[dcpomatic.git]
/
src
/
tools
/
server_test.cc
diff --git
a/src/tools/server_test.cc
b/src/tools/server_test.cc
index fdfceb567c7d0651d25aede2c0212a8f662b182a..3fa7ebb6042ed999c1ca96a50a520b3dee82f043 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>
/*
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.
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
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/>.
*/
*/
@@
-21,7
+22,7
@@
#include "lib/film.h"
#include "lib/filter.h"
#include "lib/util.h"
#include "lib/film.h"
#include "lib/filter.h"
#include "lib/util.h"
-#include "lib/server.h"
+#include "lib/
encode_
server.h"
#include "lib/dcp_video.h"
#include "lib/decoder.h"
#include "lib/exceptions.h"
#include "lib/dcp_video.h"
#include "lib/decoder.h"
#include "lib/exceptions.h"
@@
-29,7
+30,7
@@
#include "lib/video_decoder.h"
#include "lib/player.h"
#include "lib/player_video.h"
#include "lib/video_decoder.h"
#include "lib/player.h"
#include "lib/player_video.h"
-#include "lib/server_description.h"
+#include "lib/
encode_
server_description.h"
#include <getopt.h>
#include <iostream>
#include <iomanip>
#include <getopt.h>
#include <iostream>
#include <iomanip>
@@
-40,10
+41,12
@@
using std::cerr;
using std::string;
using std::pair;
using boost::shared_ptr;
using std::string;
using std::pair;
using boost::shared_ptr;
+using boost::optional;
+using boost::bind;
using dcp::Data;
static shared_ptr<Film> film;
using dcp::Data;
static shared_ptr<Film> film;
-static ServerDescription* server;
+static
Encode
ServerDescription* server;
static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
static int frame_count = 0;
static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
static int frame_count = 0;
@@
-100,7
+103,7
@@
help (string n)
int
main (int argc, char* argv[])
{
int
main (int argc, char* argv[])
{
-
string
film_dir;
+
boost::filesystem::path
film_dir;
string server_host;
while (true) {
string server_host;
while (true) {
@@
-131,7
+134,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);
}
help (argv[0]);
exit (EXIT_FAILURE);
}
@@
-139,16
+142,13
@@
main (int argc, char* argv[])
dcpomatic_setup ();
try {
dcpomatic_setup ();
try {
- server = new ServerDescription (server_host, 1);
+ server = new
Encode
ServerDescription (server_host, 1);
film.reset (new Film (film_dir));
film->read_metadata ();
shared_ptr<Player> player (new Player (film, film->playlist ()));
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 ());
- }
+ player->Video.connect (bind (&process_video, _1));
+ while (!player->pass ()) {}
} catch (std::exception& e) {
cerr << "Error: " << e.what() << "\n";
}
} catch (std::exception& e) {
cerr << "Error: " << e.what() << "\n";
}