Ticket #9649: 27-win32-tool-path

File 27-win32-tool-path, 2.1 KB (added by Mark Spieth, 9 years ago)
Line 
1tool path fixup for win32 standard deploy
2
3From: Mark Spieth <mspieth@digivation.com.au>
4
5
6---
7 mythtv/libs/libmythtv/jobqueue.cpp         |   10 +++++++++-
8 mythtv/libs/libmythtv/previewgenerator.cpp |    4 ++++
9 2 files changed, 13 insertions(+), 1 deletions(-)
10
11diff --git a/mythtv/libs/libmythtv/jobqueue.cpp b/mythtv/libs/libmythtv/jobqueue.cpp
12index be6db4e..80e4ca3 100644
13--- a/mythtv/libs/libmythtv/jobqueue.cpp
14+++ b/mythtv/libs/libmythtv/jobqueue.cpp
15@@ -1876,7 +1876,11 @@ void JobQueue::DoTranscodeThread(int jobID)
16     runningJobsLock->lock();
17     if (runningJobs[jobID].command == "mythtranscode")
18     {
19+#ifdef _WIN32
20+        path = GetInstallPrefix() + "/mythtranscode";
21+#else
22         path = GetInstallPrefix() + "/bin/mythtranscode";
23+#endif
24         QByteArray parg = profilearg.toAscii();
25         command = QString("%1 -j %2 -V %3 -p %4 %5")
26           .arg(path).arg(jobID).arg(print_verbose_messages)
27@@ -2110,7 +2114,11 @@ void JobQueue::DoFlagCommercialsThread(int jobID)
28     runningJobsLock->lock();
29     if (runningJobs[jobID].command == "mythcommflag")
30     {
31-        path = GetInstallPrefix() + "/bin/mythcommflag";
32+#ifdef _WIN32
33+    path = GetInstallPrefix() + "/mythcommflag";
34+#else
35+    path = GetInstallPrefix() + "/bin/mythcommflag";
36+#endif
37         command = QString("%1 -j %2 -V %3")
38                           .arg(path).arg(jobID).arg(print_verbose_messages);
39     }
40diff --git a/mythtv/libs/libmythtv/previewgenerator.cpp b/mythtv/libs/libmythtv/previewgenerator.cpp
41index b212479..039458f 100644
42--- a/mythtv/libs/libmythtv/previewgenerator.cpp
43+++ b/mythtv/libs/libmythtv/previewgenerator.cpp
44@@ -196,7 +196,11 @@ bool PreviewGenerator::Run(void)
45     QDateTime dtm = QDateTime::currentDateTime();
46     QTime tm = QTime::currentTime();
47     bool ok = false;
48+#ifdef _WIN32
49+    QString command = GetInstallPrefix() + "/mythpreviewgen.exe";
50+#else
51     QString command = GetInstallPrefix() + "/bin/mythpreviewgen";
52+#endif
53     bool local_ok = ((IsLocal() || !!(mode & kForceLocal)) &&
54                      (!!(mode & kLocal)) &&
55                      QFileInfo(command).isExecutable());