LibreMediaServer/lms-audio
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed pd not closing on exit

Browse source 
Set Window Title to VERSION define
This commit is contained in:
Santi Noreña 2014-07-16 18:49:24 +02:00
parent a45234bc68
commit 7900559501
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/audiomotor.cpp
View file

@ -97,7 +97,8 @@ bool AudioMotor::close()
// disconnect(m_pd_audio, SIGNAL(readyReadStandardError()), this, SLOT(stdout())); // disconnect(m_pd_audio, SIGNAL(readyReadStandardError()), this, SLOT(stdout()));
disconnect(m_pd_audio, SIGNAL(finished(int)), this, SLOT(restartAudio())); disconnect(m_pd_audio, SIGNAL(finished(int)), this, SLOT(restartAudio()));
// m_pd_audio->terminate(); // m_pd_audio->terminate();
m_pd_audio->waitForFinished(3000); if (!m_pd_audio->waitForFinished(1000))
m_pd_audio->terminate();
// delete m_pd_audio; // delete m_pd_audio;
// m_pd_audio = NULL; // m_pd_audio = NULL;
if (m_writePD != NULL) if (m_writePD != NULL)

2
src/libremediaserver-audio.cpp
View file

@ -33,7 +33,7 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
// Inicia el User Interface // Inicia el User Interface
ui.setupUi(this); ui.setupUi(this);
this->setWindowTitle(VERSION);
// Inicia el widget Terminal // Inicia el widget Terminal
textEdit = new QTextEdit(this); textEdit = new QTextEdit(this);
textEdit->append(QString::fromAscii(VERSION)); textEdit->append(QString::fromAscii(VERSION));

4
src/libremediaserver-audio.pro
View file

@ -1,7 +1,7 @@
TEMPLATE = app TEMPLATE = app
TARGET = libremediaserver-audio TARGET = libremediaserver-audio
QT += network script webkit QT += network script webkit
CONFIG += debug CONFIG += release
DESTDIR = ./debug DESTDIR = ./debug
HEADERS += libremediaserver-audio.h \ HEADERS += libremediaserver-audio.h \
@ -30,7 +30,7 @@ FORMS += \
#INCLUDEPATH += ./ #INCLUDEPATH += ./
LIBS += -L./debug -lola -lolacommon LIBS += -lola -lolacommon
#win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../debug/release/ -lcitp #win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../debug/release/ -lcitp
#else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../debug/debug/ -lcitp #else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../debug/debug/ -lcitp