*/
-#include <iostream>
-#include <iomanip>
-#include <exception>
-#include <getopt.h>
#include "lib/ratio.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/log.h"
+#include "lib/file_log.h"
#include "lib/video_decoder.h"
#include "lib/player.h"
#include "lib/player_video.h"
-#include "lib/data.h"
+#include "lib/encode_server_description.h"
+#include <getopt.h>
+#include <iostream>
+#include <iomanip>
+#include <exception>
using std::cout;
using std::cerr;
using std::string;
using std::pair;
using boost::shared_ptr;
+using dcp::Data;
static shared_ptr<Film> film;
-static ServerDescription* server;
+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, true, log_));
- shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, true, 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 ();
dcpomatic_setup ();
try {
- server = new ServerDescription (server_host, 1);
+ server = new EncodeServerDescription (server_host, 1);
film.reset (new Film (film_dir));
film->read_metadata ();
- shared_ptr<Player> player (new Player (film));
+ 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) {