| 1 | tool path fixup for win32 standard deploy
|
|---|
| 2 |
|
|---|
| 3 | From: Mark Spieth <mspieth@digivation.com.au>
|
|---|
| 4 |
|
|---|
| 5 |
|
|---|
| 6 | ---
|
|---|
| 7 | mythtv/libs/libmythbase/logging.cpp | 5 +++++
|
|---|
| 8 | mythtv/libs/libmythtv/jobqueue.cpp | 8 ++++++++
|
|---|
| 9 | mythtv/libs/libmythtv/previewgenerator.cpp | 4 ++++
|
|---|
| 10 | 3 files changed, 17 insertions(+)
|
|---|
| 11 |
|
|---|
| 12 | diff --git a/mythtv/libs/libmythbase/logging.cpp b/mythtv/libs/libmythbase/logging.cpp
|
|---|
| 13 | index 8c8b507..ea377fb 100644
|
|---|
| 14 | --- a/mythtv/libs/libmythbase/logging.cpp
|
|---|
| 15 | +++ b/mythtv/libs/libmythbase/logging.cpp
|
|---|
| 16 | @@ -493,7 +493,12 @@ void LoggerThread::launchLogServer(void)
|
|---|
| 17 | QStringList args;
|
|---|
| 18 | args << "--daemon" << logPropagateArgs;
|
|---|
| 19 |
|
|---|
| 20 | +#if defined(_WIN32)
|
|---|
| 21 | + MythSystemLegacy ms(GetInstallPrefix() + "/mythlogserver", args, mask);
|
|---|
| 22 | +#else
|
|---|
| 23 | MythSystemLegacy ms(GetInstallPrefix() + "/bin/mythlogserver", args, mask);
|
|---|
| 24 | +#endif
|
|---|
| 25 | +
|
|---|
| 26 | ms.Run();
|
|---|
| 27 | ms.Wait(0);
|
|---|
| 28 | }
|
|---|
| 29 | diff --git a/mythtv/libs/libmythtv/jobqueue.cpp b/mythtv/libs/libmythtv/jobqueue.cpp
|
|---|
| 30 | index f426309..c4a26c3 100644
|
|---|
| 31 | --- a/mythtv/libs/libmythtv/jobqueue.cpp
|
|---|
| 32 | +++ b/mythtv/libs/libmythtv/jobqueue.cpp
|
|---|
| 33 | @@ -1919,7 +1919,11 @@ void JobQueue::DoTranscodeThread(int jobID)
|
|---|
| 34 | runningJobsLock->lock();
|
|---|
| 35 | if (runningJobs[jobID].command == "mythtranscode")
|
|---|
| 36 | {
|
|---|
| 37 | +#ifdef _WIN32
|
|---|
| 38 | + path = GetInstallPrefix() + "/mythtranscode";
|
|---|
| 39 | +#else
|
|---|
| 40 | path = GetInstallPrefix() + "/bin/mythtranscode";
|
|---|
| 41 | +#endif
|
|---|
| 42 | command = QString("%1 -j %2 --profile %3")
|
|---|
| 43 | .arg(path).arg(jobID).arg(profilearg);
|
|---|
| 44 | if (useCutlist)
|
|---|
| 45 | @@ -2287,7 +2291,11 @@ void JobQueue::DoFlagCommercialsThread(int jobID)
|
|---|
| 46 | runningJobsLock->lock();
|
|---|
| 47 | if (runningJobs[jobID].command == "mythcommflag")
|
|---|
| 48 | {
|
|---|
| 49 | +#ifdef _WIN32
|
|---|
| 50 | + path = GetInstallPrefix() + "/mythcommflag";
|
|---|
| 51 | +#else
|
|---|
| 52 | path = GetInstallPrefix() + "/bin/mythcommflag";
|
|---|
| 53 | +#endif
|
|---|
| 54 | command = QString("%1 -j %2 --noprogress")
|
|---|
| 55 | .arg(path).arg(jobID);
|
|---|
| 56 | command += logPropagateArgs;
|
|---|
| 57 | diff --git a/mythtv/libs/libmythtv/previewgenerator.cpp b/mythtv/libs/libmythtv/previewgenerator.cpp
|
|---|
| 58 | index 3813b68..3000a45 100644
|
|---|
| 59 | --- a/mythtv/libs/libmythtv/previewgenerator.cpp
|
|---|
| 60 | +++ b/mythtv/libs/libmythtv/previewgenerator.cpp
|
|---|
| 61 | @@ -196,7 +196,11 @@ bool PreviewGenerator::Run(void)
|
|---|
| 62 | QDateTime dtm = MythDate::current();
|
|---|
| 63 | QTime tm = QTime::currentTime();
|
|---|
| 64 | bool ok = false;
|
|---|
| 65 | +#ifdef _WIN32
|
|---|
| 66 | + QString command = GetInstallPrefix() + "/mythpreviewgen.exe";
|
|---|
| 67 | +#else
|
|---|
| 68 | QString command = GetInstallPrefix() + "/bin/mythpreviewgen";
|
|---|
| 69 | +#endif
|
|---|
| 70 | bool local_ok = ((IsLocal() || !!(mode & kForceLocal)) &&
|
|---|
| 71 | (!!(mode & kLocal)) &&
|
|---|
| 72 | QFileInfo(command).isExecutable());
|
|---|
