justdan96
/
tsMuxer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the GUI look for the main binary under "tsmuxer" and "tsMuxeR" 

The all-lowercase binary name is the one that's emitted by the current build
system, while the old one is kept for backwards compatibility.

Fixes #63
master
Daniel Kamil Kozar 2019-12-07 19:37:10 +01:00
parent b79ef4c3e4
commit 5ee30737be
No known key found for this signature in database
GPG Key ID: A5FB0175B3A93F03
2 changed files with 59 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tsMuxerGUI/tsmuxerwindow.cpp
View File

@ -893,10 +893,7 @@ void TsMuxerWindow::addFile() {
connect(this, SIGNAL(codecListReady()), this, SLOT(continueAddFile()));
connect(this, SIGNAL(fileAdded()), this, SLOT(addFile()));
runInMuxMode = false;
shellExecute(
QDir::toNativeSeparators(QCoreApplication::applicationDirPath()) +
QDir::separator() + "tsMuxeR",
QStringList() << newFileName);
tsMuxerExecute(QStringList() << newFileName);
}
bool TsMuxerWindow::checkFileDuplicate(const QString &fileName) {
@ -1417,14 +1414,26 @@ void TsMuxerWindow::onProcessError(QProcess::ProcessError error) {
msgBox.exec();
}
void TsMuxerWindow::shellExecute(const QString &process,
const QStringList &args) {
static QString getTsMuxerBinaryPath() {
const auto applicationDirPath =
QDir::toNativeSeparators(QCoreApplication::applicationDirPath()) + QDir::separator();
for(auto binaryName : {"tsmuxer", "tsMuxeR"}) {
auto binaryPath = applicationDirPath + binaryName;
if (QFile::exists(binaryPath)) {
return binaryPath;
}
}
return QString();
}
void TsMuxerWindow::tsMuxerExecute(const QStringList &args) {
const auto exePath = getTsMuxerBinaryPath();
ui.buttonMux->setEnabled(false);
procStdOutput.clear();
procErrOutput.clear();
processFinished = false;
processExitCode = -1;
proc.start(process, args);
proc.start(exePath, args);
if (muxForm.isVisible())
muxForm.setProcess(&proc);
}
@ -2110,10 +2119,7 @@ void TsMuxerWindow::appendFile() {
connect(this, SIGNAL(codecListReady()), this, SLOT(continueAppendFile()));
connect(this, SIGNAL(fileAppended()), this, SLOT(appendFile()));
runInMuxMode = false;
shellExecute(
QDir::toNativeSeparators(QCoreApplication::applicationDirPath()) +
QDir::separator() + "tsMuxeR",
QStringList() << newFileName);
tsMuxerExecute(QStringList() << newFileName);
}
void TsMuxerWindow::continueAppendFile() {
@ -2396,10 +2402,7 @@ void TsMuxerWindow::startMuxing() {
disconnect();
// QCoreApplication::dir
runInMuxMode = true;
shellExecute(
QDir::toNativeSeparators(QCoreApplication::applicationDirPath()) +
QDir::separator() + "tsMuxeR",
QStringList() << metaName << quoteStr(ui.outFileName->text()));
tsMuxerExecute(QStringList() << metaName << quoteStr(ui.outFileName->text()));
}
void TsMuxerWindow::saveMetaFileBtnClick() {

2
tsMuxerGUI/tsmuxerwindow.h
View File

@ -184,7 +184,7 @@ private:
};
bool checkFileDuplicate(const QString& fileName);
void shellExecute(const QString& process, const QStringList& args);
void tsMuxerExecute(const QStringList& args);
void addLines(const QByteArray& arr, QList<QString>& outList, bool isError);
void doAppendInt(const QString& fileName, const QString& parentFileName, double duration, bool doublePrefix, MplsType mplsRole);
bool isDiskOutput() const;