Merge branch 'v0.04'
This commit is contained in:
commit
1ceaa574a5
4 changed files with 13 additions and 32 deletions
|
@ -507,10 +507,15 @@ void libreMediaServer::initMSEX()
|
|||
// Generates the thumbs to transmit by CITP/MSEx
|
||||
void libreMediaServer::makeThumbs()
|
||||
{
|
||||
QProcess *script = new QProcess ();
|
||||
QString s = "Creating thumbs in ";
|
||||
s.append(m_pathmedia);
|
||||
s.append(" This operation can take some time...");
|
||||
ui.textEdit->appendPlainText(s);
|
||||
QProcess *script;
|
||||
QStringList arguments;
|
||||
arguments << m_pathmedia;
|
||||
script->execute("../scripts/make_thumbs.sh", arguments);
|
||||
qDebug() << s.toAscii();
|
||||
script->execute("./scripts/make_thumbs.sh", arguments);
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#include "MSEXDefines.h"
|
||||
#include "ui_libremediaserver.h"
|
||||
|
||||
#define VERSION "LibreMediaServer Version 0.04-1"
|
||||
#define VERSION "LibreMediaServer Version 0.04-2"
|
||||
#define COPYRIGHT "(C) 2012-2013 Santi Norena libremediaserver@gmail.com"
|
||||
#define LICENSE "GPL 3 License. See LICENSE.txt and credits.txt for details"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue