Browse Source

Fix beep API and unconnected slot

QGC4.4
Lorenz Meier 11 years ago
parent
commit
4bb161b88d
  1. 12
      src/GAudioOutput.cc
  2. 1
      src/GAudioOutput.h
  3. 15
      src/audio/QGCAudioWorker.cpp
  4. 3
      src/audio/QGCAudioWorker.h

12
src/GAudioOutput.cc

@ -65,6 +65,7 @@ GAudioOutput::GAudioOutput(QObject *parent) : QObject(parent), @@ -65,6 +65,7 @@ GAudioOutput::GAudioOutput(QObject *parent) : QObject(parent),
{
worker->moveToThread(thread);
connect(this, SIGNAL(textToSpeak(QString,int)), worker, SLOT(say(QString,int)));
connect(this, SIGNAL(beepOnce()), worker, SLOT(beep()));
thread->start();
}
@ -146,7 +147,6 @@ bool GAudioOutput::startEmergency() @@ -146,7 +147,6 @@ bool GAudioOutput::startEmergency()
// emergency = true;
// // Beep immediately and then start timer
// if (!muted) beep();
// emergencyTimer->start(1500);
// QTimer::singleShot(5000, this, SLOT(stopEmergency()));
@ -174,13 +174,5 @@ bool GAudioOutput::stopEmergency() @@ -174,13 +174,5 @@ bool GAudioOutput::stopEmergency()
void GAudioOutput::beep()
{
if (!muted)
{
// FIXME: Re-enable audio beeps
// Use QFile to transform path for all OS
//QFile f(QCoreApplication::applicationDirPath() + QString("/files/audio/alert.wav"));
//qDebug() << "FILE:" << f.fileName();
//m_media->setCurrentSource(Phonon::MediaSource(f.fileName().toStdString().c_str()));
//m_media->play();
}
emit beepOnce();
}

1
src/GAudioOutput.h

@ -86,6 +86,7 @@ public slots: @@ -86,6 +86,7 @@ public slots:
signals:
void mutedChanged(bool);
bool textToSpeak(QString text, int severity = 1);
void beepOnce();
protected:
bool muted;

15
src/audio/QGCAudioWorker.cpp

@ -136,6 +136,21 @@ void QGCAudioWorker::mute(bool mute) @@ -136,6 +136,21 @@ void QGCAudioWorker::mute(bool mute)
}
}
void QGCAudioWorker::beep()
{
// XXX beep beep
if (!muted)
{
// FIXME: Re-enable audio beeps
// Use QFile to transform path for all OS
//QFile f(QCoreApplication::applicationDirPath() + QString("/files/audio/alert.wav"));
//qDebug() << "FILE:" << f.fileName();
//m_media->setCurrentSource(Phonon::MediaSource(f.fileName().toStdString().c_str()));
//m_media->play();
}
}
bool QGCAudioWorker::isMuted()
{
return this->muted;

3
src/audio/QGCAudioWorker.h

@ -32,6 +32,9 @@ public slots: @@ -32,6 +32,9 @@ public slots:
/** @brief Say this text if current output priority matches */
void say(QString text, int severity = 1);
/** @brief Sound a single beep */
void beep();
protected:
#if defined Q_OS_MAC && defined QGC_SPEECH_ENABLED
//NSSpeechSynthesizer

Loading…
Cancel
Save