Move ports around to allow master/server to coexist (#962).

[dcpomatic.git] / src / tools / dcpomatic.cc

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 92de9a1f0a0d3d49d4720abc2a466977a5707f3e..e9a1f652cea81ef535369e8cb82604b855316a06 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -496,6 +496,16 @@ private:
                        }
                }
 
+
+               /* Remove any existing DCP if the user agrees */
+               boost::filesystem::path const dcp_dir = _film->dir (_film->dcp_name(), false);
+               if (boost::filesystem::exists (dcp_dir)) {
+                       if (!confirm_dialog (this, wxString::Format (_("Do you want to overwrite the existing DCP %s?"), std_to_wx(dcp_dir.string()).data()))) {
+                               return;
+                       }
+                       boost::filesystem::remove_all (dcp_dir);
+               }
+
                try {
                        /* It seems to make sense to auto-save metadata here, since the make DCP may last
                           a long time, and crashes/power failures are moderately likely.
@@ -549,7 +559,7 @@ private:
                        try {
                                boost::asio::io_service io_service;
                                boost::asio::ip::tcp::resolver resolver (io_service);
-                               boost::asio::ip::tcp::resolver::query query ("127.0.0.1", raw_convert<string> (Config::instance()->server_port_base() + 2));
+                               boost::asio::ip::tcp::resolver::query query ("127.0.0.1", raw_convert<string> (BATCH_JOB_PORT));
                                boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query);
                                Socket socket (5);
                                socket.connect (*endpoint_iterator);