X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcross.cc;h=171bf2c8100767bb79d8d5b610767c768a44e705;hp=2e9d54d41aea7b70697b4247b9b3d2dfd6fb3d88;hb=a5be11a965c2c38442e4e069874e7e21b5b43a5c;hpb=cae6fe1be05b9b8174f586b561029c5a40fb1c31 diff --git a/src/lib/cross.cc b/src/lib/cross.cc index 2e9d54d41..171bf2c81 100644 --- a/src/lib/cross.cc +++ b/src/lib/cross.cc @@ -1,26 +1,32 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "cross.h" #include "compose.hpp" #include "log.h" +#include "dcpomatic_log.h" +#include "config.h" #include "exceptions.h" +extern "C" { +#include +} #include #ifdef DCPOMATIC_LINUX #include @@ -30,6 +36,8 @@ #include #undef DATADIR #include +#include +#include #endif #ifdef DCPOMATIC_OSX #include @@ -46,10 +54,6 @@ #include "i18n.h" -#define LOG_GENERAL(...) log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); -#define LOG_ERROR(...) log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR); -#define LOG_ERROR_NC(...) log->log (__VA_ARGS__, LogEntry::TYPE_ERROR); - using std::pair; using std::list; using std::ifstream; @@ -175,7 +179,7 @@ shared_path () } void -run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, shared_ptr log) +run_ffprobe (boost::filesystem::path content, boost::filesystem::path out) { #ifdef DCPOMATIC_WINDOWS SECURITY_ATTRIBUTES security; @@ -355,10 +359,16 @@ Waker::~Waker () } void -start_batch_converter (boost::filesystem::path dcpomatic) +start_tool (boost::filesystem::path dcpomatic, string executable, +#ifdef DCPOMATIC_OSX + string app +#else + string +#endif + ) { #if defined(DCPOMATIC_LINUX) || defined(DCPOMATIC_WINDOWS) - boost::filesystem::path batch = dcpomatic.parent_path() / "dcpomatic2_batch"; + boost::filesystem::path batch = dcpomatic.parent_path() / executable; #endif #ifdef DCPOMATIC_OSX @@ -367,15 +377,127 @@ start_batch_converter (boost::filesystem::path dcpomatic) batch = batch.parent_path (); // Contents batch = batch.parent_path (); // DCP-o-matic.app batch = batch.parent_path (); // Applications - batch /= "DCP-o-matic 2 Batch Converter.app" / "Contents" / "MacOS" / "dcpomatic2_batch"; + batch /= app; + batch /= "Contents"; + batch /= "MacOS"; + batch /= executable; #endif -#ifdef DCPOMATIC_LINUX +#if defined(DCPOMATIC_LINUX) || defined(DCPOMATIC_OSX) pid_t pid = fork (); if (pid == 0) { - int const r = system (batch.string().c_str ()); + int const r = system (batch.string().c_str()); exit (WEXITSTATUS (r)); } #endif +#ifdef DCPOMATIC_WINDOWS + STARTUPINFO startup_info; + ZeroMemory (&startup_info, sizeof (startup_info)); + startup_info.cb = sizeof (startup_info); + + PROCESS_INFORMATION process_info; + ZeroMemory (&process_info, sizeof (process_info)); + + wchar_t cmd[512]; + MultiByteToWideChar (CP_UTF8, 0, batch.string().c_str(), -1, cmd, sizeof(cmd)); + CreateProcess (0, cmd, 0, 0, FALSE, 0, 0, 0, &startup_info, &process_info); +#endif +} + +void +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 () +{ +#ifdef DCPOMATIC_WINDOWS + return (uint64_t) GetCurrentThreadId (); +#else + return (uint64_t) pthread_self (); +#endif +} + +int +avio_open_boost (AVIOContext** s, boost::filesystem::path file, int flags) +{ +#ifdef DCPOMATIC_WINDOWS + int const length = (file.string().length() + 1) * 2; + char* utf8 = new char[length]; + WideCharToMultiByte (CP_UTF8, 0, file.c_str(), -1, utf8, length, 0, 0); + int const r = avio_open (s, utf8, flags); + delete[] utf8; + return r; +#else + return avio_open (s, file.c_str(), flags); +#endif +} + +#ifdef DCPOMATIC_WINDOWS +void +maybe_open_console () +{ + if (Config::instance()->win32_console ()) { + AllocConsole(); + + HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE); + int hCrt = _open_osfhandle((intptr_t) handle_out, _O_TEXT); + FILE* hf_out = _fdopen(hCrt, "w"); + setvbuf(hf_out, NULL, _IONBF, 1); + *stdout = *hf_out; + + HANDLE handle_in = GetStdHandle(STD_INPUT_HANDLE); + hCrt = _open_osfhandle((intptr_t) handle_in, _O_TEXT); + FILE* hf_in = _fdopen(hCrt, "r"); + setvbuf(hf_in, NULL, _IONBF, 128); + *stdin = *hf_in; + } +} +#endif + +boost::filesystem::path +home_directory () +{ +#if defined(DCPOMATIC_LINUX) || defined(DCPOMATIC_OSX) + return getenv("HOME"); +#endif +#ifdef DCPOMATIC_WINDOWS + return boost::filesystem::path(getenv("HOMEDRIVE")) / boost::filesystem::path(getenv("HOMEPATH")); +#endif +} + +string +command_and_read (string cmd) +{ +#ifdef DCPOMATIC_LINUX + FILE* pipe = popen (cmd.c_str(), "r"); + if (!pipe) { + throw runtime_error ("popen failed"); + } + + string result; + char buffer[128]; + try { + while (fgets(buffer, sizeof(buffer), pipe)) { + result += buffer; + } + } catch (...) { + pclose (pipe); + throw; + } + + pclose (pipe); + return result; +#endif + + return ""; }