diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-02-04 23:38:08 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-02-04 23:38:08 +0000 |
| commit | 918124fb0b2fdf05bf98aee2c74c85387f1d8638 (patch) | |
| tree | 209154022d91c7381c2ed1b2b00f01ebe14997e6 /src/lib/types.h | |
| parent | 9a5f1ef94b9916f5cd5996255007200bf61af7bf (diff) | |
Listen for server replies on different ports on main and batch, and get servers to send replies to both (#1190).
Diffstat (limited to 'src/lib/types.h')
| -rw-r--r-- | src/lib/types.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/types.h b/src/lib/types.h index 0702c8734..8f99b8881 100644 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -74,10 +74,12 @@ namespace xmlpp { #define ENCODE_FRAME_PORT (Config::instance()->server_port_base()) /** Port on which EncodeServer listens for DCPOMATIC_HELLO from masters */ #define HELLO_PORT (Config::instance()->server_port_base()+1) -/** Port on which EncodeServerFinder listens for replies to DCPOMATIC_HELLO from servers */ -#define SERVER_PRESENCE_PORT (Config::instance()->server_port_base()+2) +/** Port on which EncodeServerFinder in the main DCP-o-matic listens for replies to DCPOMATIC_HELLO from servers */ +#define MAIN_SERVER_PRESENCE_PORT (Config::instance()->server_port_base()+2) +/** Port on which EncodeServerFinder in the batch converter listens for replies to DCPOMATIC_HELLO from servers */ +#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()+3) +#define BATCH_JOB_PORT (Config::instance()->server_port_base()+4) typedef std::vector<boost::shared_ptr<Content> > ContentList; typedef std::vector<boost::shared_ptr<FFmpegContent> > FFmpegContentList; |