|
|
|
@ -119,9 +119,9 @@ GAudioOutput::GAudioOutput(QObject* parent) : QObject(parent),
@@ -119,9 +119,9 @@ GAudioOutput::GAudioOutput(QObject* parent) : QObject(parent),
|
|
|
|
|
} |
|
|
|
|
#endif |
|
|
|
|
// Initialize audio output
|
|
|
|
|
m_media = new Phonon::MediaObject(this); |
|
|
|
|
Phonon::AudioOutput *audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this); |
|
|
|
|
createPath(m_media, audioOutput); |
|
|
|
|
//m_media = new Phonon::MediaObject(this);
|
|
|
|
|
//Phonon::AudioOutput *audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this);
|
|
|
|
|
//createPath(m_media, audioOutput);
|
|
|
|
|
|
|
|
|
|
// Prepare regular emergency signal, will be fired off on calling startEmergency()
|
|
|
|
|
emergencyTimer = new QTimer(); |
|
|
|
@ -228,8 +228,8 @@ void GAudioOutput::notifyPositive()
@@ -228,8 +228,8 @@ void GAudioOutput::notifyPositive()
|
|
|
|
|
if (!muted) { |
|
|
|
|
// Use QFile to transform path for all OS
|
|
|
|
|
QFile f(QCoreApplication::applicationDirPath()+QString("/audio/double_notify.wav")); |
|
|
|
|
m_media->setCurrentSource(Phonon::MediaSource(f.fileName().toStdString().c_str())); |
|
|
|
|
m_media->play(); |
|
|
|
|
//m_media->setCurrentSource(Phonon::MediaSource(f.fileName().toStdString().c_str()));
|
|
|
|
|
//m_media->play();
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -238,8 +238,8 @@ void GAudioOutput::notifyNegative()
@@ -238,8 +238,8 @@ void GAudioOutput::notifyNegative()
|
|
|
|
|
if (!muted) { |
|
|
|
|
// Use QFile to transform path for all OS
|
|
|
|
|
QFile f(QCoreApplication::applicationDirPath()+QString("/audio/flat_notify.wav")); |
|
|
|
|
m_media->setCurrentSource(Phonon::MediaSource(f.fileName().toStdString().c_str())); |
|
|
|
|
m_media->play(); |
|
|
|
|
//m_media->setCurrentSource(Phonon::MediaSource(f.fileName().toStdString().c_str()));
|
|
|
|
|
//m_media->play();
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -283,8 +283,8 @@ void GAudioOutput::beep()
@@ -283,8 +283,8 @@ void GAudioOutput::beep()
|
|
|
|
|
// Use QFile to transform path for all OS
|
|
|
|
|
QFile f(QCoreApplication::applicationDirPath()+QString("/audio/alert.wav")); |
|
|
|
|
qDebug() << "FILE:" << f.fileName(); |
|
|
|
|
m_media->setCurrentSource(Phonon::MediaSource(f.fileName().toStdString().c_str())); |
|
|
|
|
m_media->play(); |
|
|
|
|
//m_media->setCurrentSource(Phonon::MediaSource(f.fileName().toStdString().c_str()));
|
|
|
|
|
//m_media->play();
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|