From adeab682b76138d7a05bab3943af23cd57e2bc57 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 27 Feb 2020 23:50:10 +0100 Subject: [PATCH] Move swaroop playlist editor stuff into its own swaroop_ files. --- src/lib/{spl.cc => swaroop_spl.cc} | 2 +- src/lib/{spl.h => swaroop_spl.h} | 2 +- src/lib/{spl_entry.cc => swaroop_spl_entry.cc} | 2 +- src/lib/{spl_entry.h => swaroop_spl_entry.h} | 4 ++-- src/lib/wscript | 5 +++-- ...c_ecinema.cc => swaroop_dcpomatic_ecinema.cc} | 0 ...playlist.cc => swaroop_dcpomatic_playlist.cc} | 4 ++-- ...pomatic_uuid.cc => swaroop_dcpomatic_uuid.cc} | 0 src/tools/wscript | 16 +++++++++------- src/wx/controls.h | 1 - src/wx/swaroop_controls.h | 1 + 11 files changed, 20 insertions(+), 17 deletions(-) rename src/lib/{spl.cc => swaroop_spl.cc} (98%) rename src/lib/{spl.h => swaroop_spl.h} (98%) rename src/lib/{spl_entry.cc => swaroop_spl_entry.cc} (98%) rename src/lib/{spl_entry.h => swaroop_spl_entry.h} (95%) rename src/tools/{dcpomatic_ecinema.cc => swaroop_dcpomatic_ecinema.cc} (100%) rename src/tools/{dcpomatic_playlist.cc => swaroop_dcpomatic_playlist.cc} (99%) rename src/tools/{dcpomatic_uuid.cc => swaroop_dcpomatic_uuid.cc} (100%) diff --git a/src/lib/spl.cc b/src/lib/swaroop_spl.cc similarity index 98% rename from src/lib/spl.cc rename to src/lib/swaroop_spl.cc index e8e86f89c..02ed966a4 100644 --- a/src/lib/spl.cc +++ b/src/lib/swaroop_spl.cc @@ -18,7 +18,7 @@ */ -#include "spl.h" +#include "swaroop_spl.h" #include "content_store.h" #include #include diff --git a/src/lib/spl.h b/src/lib/swaroop_spl.h similarity index 98% rename from src/lib/spl.h rename to src/lib/swaroop_spl.h index 18892993f..308f5286d 100644 --- a/src/lib/spl.h +++ b/src/lib/swaroop_spl.h @@ -21,7 +21,7 @@ #ifndef DCPOMATIC_SPL_H #define DCPOMATIC_SPL_H -#include "spl_entry.h" +#include "swaroop_spl_entry.h" #include class ContentStore; diff --git a/src/lib/spl_entry.cc b/src/lib/swaroop_spl_entry.cc similarity index 98% rename from src/lib/spl_entry.cc rename to src/lib/swaroop_spl_entry.cc index a2f36317e..ed5a469ac 100644 --- a/src/lib/spl_entry.cc +++ b/src/lib/swaroop_spl_entry.cc @@ -18,7 +18,7 @@ */ -#include "spl_entry.h" +#include "swaroop_spl_entry.h" #include "dcp_content.h" #include "dcpomatic_assert.h" #include diff --git a/src/lib/spl_entry.h b/src/lib/swaroop_spl_entry.h similarity index 95% rename from src/lib/spl_entry.h rename to src/lib/swaroop_spl_entry.h index d939ec66a..75e0b5223 100644 --- a/src/lib/spl_entry.h +++ b/src/lib/swaroop_spl_entry.h @@ -18,8 +18,8 @@ */ -#ifndef DCPOMATIC_SPL_ENTRY_H -#define DCPOMATIC_SPL_ENTRY_H +#ifndef DCPOMATIC_SWAROOP_SPL_ENTRY_H +#define DCPOMATIC_SWAROOP_SPL_ENTRY_H #include #include diff --git a/src/lib/wscript b/src/lib/wscript index 31071bf7a..6ef41e91e 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -150,8 +150,6 @@ sources = """ server.cc shuffler.cc state.cc - spl.cc - spl_entry.cc string_log_entry.cc string_text_file.cc string_text_file_content.cc @@ -201,6 +199,9 @@ def build(bld): obj.source = sources + ' version.cc' + if bld.env.VARIANT == 'swaroop-theater' or bld.env.VARIANT == 'swaroop-studio': + obj.source += ' swaroop_spl.cc swaroop_spl_entry.cc' + if bld.env.TARGET_WINDOWS: obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE' if bld.env.STATIC_DCPOMATIC: diff --git a/src/tools/dcpomatic_ecinema.cc b/src/tools/swaroop_dcpomatic_ecinema.cc similarity index 100% rename from src/tools/dcpomatic_ecinema.cc rename to src/tools/swaroop_dcpomatic_ecinema.cc diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/swaroop_dcpomatic_playlist.cc similarity index 99% rename from src/tools/dcpomatic_playlist.cc rename to src/tools/swaroop_dcpomatic_playlist.cc index de6ae107b..73fcbf802 100644 --- a/src/tools/dcpomatic_playlist.cc +++ b/src/tools/swaroop_dcpomatic_playlist.cc @@ -27,8 +27,8 @@ #include "../lib/cross.h" #include "../lib/film.h" #include "../lib/dcp_content.h" -#include "../lib/spl_entry.h" -#include "../lib/spl.h" +#include "../lib/swaroop_spl_entry.h" +#include "../lib/swaroop_spl.h" #include #include #include diff --git a/src/tools/dcpomatic_uuid.cc b/src/tools/swaroop_dcpomatic_uuid.cc similarity index 100% rename from src/tools/dcpomatic_uuid.cc rename to src/tools/swaroop_dcpomatic_uuid.cc diff --git a/src/tools/wscript b/src/tools/wscript index 3b2c0a04c..710f49eeb 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -37,9 +37,9 @@ def build(bld): cli_tools = [] if bld.env.VARIANT == 'swaroop-theater': - cli_tools = [ 'dcpomatic_uuid'] - elif bld.env.VARIANT == "swaroop-studio": - cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'dcpomatic_ecinema', 'dcpomatic_uuid'] + cli_tools = ['swaroop_dcpomatic_uuid'] + elif bld.env.VARIANT == 'swaroop-studio': + cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'swaroop_dcpomatic_ecinema', 'swaroop_dcpomatic_uuid'] else: cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create'] @@ -49,16 +49,18 @@ def build(bld): obj.includes = ['..'] obj.use = ['libdcpomatic2'] obj.source = '%s.cc' % t - obj.target = t.replace('dcpomatic', 'dcpomatic2') + obj.target = t.replace('dcpomatic', 'dcpomatic2').replace('swaroop_', '') if t == 'server_test': obj.install_path = None gui_tools = [] if not bld.env.DISABLE_GUI: if bld.env.VARIANT == 'swaroop-theater': - gui_tools = ['dcpomatic_player', 'dcpomatic_playlist'] + gui_tools = ['dcpomatic_player', 'swaroop_dcpomatic_playlist'] + elif bld.env.VARIANT == 'swaroop-studio': + gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'swaroop_dcpomatic_playlist'] else: - gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'dcpomatic_playlist'] + gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player'] for t in gui_tools: obj = bld(features='cxx cxxprogram') @@ -75,7 +77,7 @@ def build(bld): obj.source = '%s.cc' % t if bld.env.TARGET_WINDOWS: obj.source += ' ../../platform/windows/%s.rc' % t - obj.target = t.replace('dcpomatic', 'dcpomatic2') + obj.target = t.replace('dcpomatic', 'dcpomatic2').replace('swaroop_', '') i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic2', bld) diff --git a/src/wx/controls.h b/src/wx/controls.h index 1b6a379cc..c11d6e8e3 100644 --- a/src/wx/controls.h +++ b/src/wx/controls.h @@ -24,7 +24,6 @@ #include "lib/dcpomatic_time.h" #include "lib/types.h" #include "lib/film.h" -#include "lib/spl.h" #include #include #include diff --git a/src/wx/swaroop_controls.h b/src/wx/swaroop_controls.h index a8bb41dea..f773bf901 100644 --- a/src/wx/swaroop_controls.h +++ b/src/wx/swaroop_controls.h @@ -19,6 +19,7 @@ */ #include "controls.h" +#include "lib/swaroop_spl.h" class DCPContent; class EncryptedECinemaKDM; -- 2.30.2