summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-06-09 23:43:58 +0100
committerCarl Hetherington <cth@carlh.net>2018-06-09 23:43:58 +0100
commit4513308f3c08579d53a0eee91b470dca3a28cbc2 (patch)
tree71708f4825f779e092e2868469901347a21f76fc /src/lib
parent85fedd82ef6f1b2330534ce91ca64c46910e8e57 (diff)
Add option to open a DCP in the player (#1312).
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/cross.cc8
-rw-r--r--src/lib/cross.h3
-rw-r--r--src/lib/types.h2
3 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 4991d9ae3..75205dc1a 100644
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -414,6 +414,12 @@ start_batch_converter (boost::filesystem::path dcpomatic)
start_tool (dcpomatic, "dcpomatic2_batch", "DCP-o-matic\\ 2\\ Batch\\ Converter.app");
}
+void
+start_player (boost::filesystem::path dcpomatic)
+{
+ start_tool (dcpomatic, "dcpomatic2_player", "DCP-o-matic\\ 2\\ Player.app");
+}
+
uint64_t
thread_id ()
{
diff --git a/src/lib/cross.h b/src/lib/cross.h
index 8c1df998b..f1af03346 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -52,6 +52,7 @@ extern boost::filesystem::path shared_path ();
extern FILE * fopen_boost (boost::filesystem::path, std::string);
extern int dcpomatic_fseek (FILE *, int64_t, int);
extern void start_batch_converter (boost::filesystem::path dcpomatic);
+extern void start_player (boost::filesystem::path dcpomatic);
extern uint64_t thread_id ();
extern int avio_open_boost (AVIOContext** s, boost::filesystem::path file, int flags);
diff --git a/src/lib/types.h b/src/lib/types.h
index ed3746f45..dfce6aec5 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -80,6 +80,8 @@ namespace xmlpp {
#define BATCH_SERVER_PRESENCE_PORT (Config::instance()->server_port_base()+3)
/** Port on which batch converter listens for job requests */
#define BATCH_JOB_PORT (Config::instance()->server_port_base()+4)
+/** Port on which player listens for play requests */
+#define PLAYER_PLAY_PORT (Config::instance()->server_port_base()+5)
typedef std::vector<boost::shared_ptr<Content> > ContentList;
typedef std::vector<boost::shared_ptr<FFmpegContent> > FFmpegContentList;