음향 효과 개선

- QSound, QSoundEffect 대신 aplay 사용. 해당 클래스는 음향이 깨지는 문제가 있음

음향 효과 개선
- QSound, QSoundEffect 대신 aplay 사용. 해당 클래스는 음향이 깨지는 문제가 있음
김태훈
1 parent 1d848d8450
Showing 5 changed files with 141 additions and 46 deletions Show diff stats
app/gui/oven_control/manualcookwindow.cpp
app/gui/oven_control/oven_control.pro
app/gui/oven_control/resources.qrc
app/gui/oven_control/soundplayer.cpp
app/gui/oven_control/soundplayer.h
@@ -154,7 +154,8 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) :
     updateViewTimer.start(100);
     foreach (QPushButton *button, findChildren<QPushButton *>())
-        connect(button, &QPushButton::pressed, SoundPlayer::playClick);
+        if (button != ui->runStopButton)
+            connect(button, &QPushButton::pressed, SoundPlayer::playClick);
     QTimer::singleShot(0, this, SLOT(setupAnimation()));
@@ -906,6 +907,8 @@ void ManualCookWindow::on_runStopButton_clicked()
         stop();
     else if (oven->time() > 0)
         start();
+    else
+        SoundPlayer::playClick();
     updateView();
 }
@@ -329,3 +329,10 @@ TRANSLATIONS += lang_en.ts lang_zh.ts
 target.path = /falinux/dev
 INSTALLS += target
+
+DISTFILES += \
+    sounds/button.wav \
+    sounds/error1.wav \
+    sounds/error2.wav \
+    sounds/start.wav \
+    sounds/stop.wav
@@ -533,11 +533,6 @@
         <file>images/config/102_icon_play_ov.png</file>
         <file>images/config/102_icon_play.png</file>
         <file>images/config/102_usb_icon.png</file>
-        <file>sounds/error1.wav</file>
-        <file>sounds/error2.wav</file>
-        <file>sounds/start.wav</file>
-        <file>sounds/stop.wav</file>
-        <file>sounds/button.wav</file>
         <file>images/config/100_fav_pannel_icon_ov.png</file>
         <file>images/config/100_fav_pannel_icon.png</file>
         <file>images/config/105_icon_cancel_ov.png</file>
@@ -2,6 +2,7 @@
 #include "system.h"
 #include "config.h"
+#include "unistd.h"
 namespace {
 QThread playThread;
@@ -9,50 +10,54 @@ QThread playThread;
 SoundPlayWorker::SoundPlayWorker()
 {
-    current = 0;
-    click = 0;
+    repeat_ = false;
+    proc = new QProcess(this);
+
+    connect(proc, SIGNAL(finished(int)), SLOT(onFinished()));
 }
 void SoundPlayWorker::play(const QString &filename)
 {
-    if (current && !current->isFinished())
-        current->stop();
-
-    if (click && click->isPlaying())
-        click->stop();
-
-    if (map.contains(filename))
-        current = map.value(filename);
-    else
+    if (proc->state() != QProcess::NotRunning)
     {
-        current = new QSound(filename);
-        map[filename] = current;
+        proc->terminate();
+        proc->waitForFinished();
     }
-    current->play();
+    proc->start(QString("aplay"), QStringList(filename));
+    proc->waitForStarted();
 }
 void SoundPlayWorker::playClick()
 {
-    if (current && !current->isFinished())
-        current->stop();
+    play("/falinux/sounds/button.wav");
+}
-    if (click && click->isPlaying())
-        click->stop();
+void SoundPlayWorker::setVolume(int volume)
+{
+    System::setVolume(volume);
+}
+
+void SoundPlayWorker::repeat(const QString &filename)
+{
+    repeat_ = true;
+    play(filename);
+}
-    if (click == 0)
+void SoundPlayWorker::stop()
+{
+    repeat_ = false;
+    if (proc->state() != QProcess::NotRunning)
     {
-        click = new QSoundEffect;
-        click->setSource(QUrl::fromLocalFile(":/sounds/button.wav"));
-        click->setVolume(1.0);
+        proc->terminate();
+        proc->waitForFinished();
     }
-
-    click->play();
 }
-void SoundPlayWorker::setVolume(int volume)
+void SoundPlayWorker::onFinished()
 {
-    System::setVolume(volume);
+    if (repeat_)
+        proc->start();
 }
 SoundPlayer *SoundPlayer::instance = 0;
@@ -65,6 +70,8 @@ SoundPlayer::SoundPlayer()
     connect(this, SIGNAL(setVolume(int)), w, SLOT(setVolume(int)));
     connect(this, SIGNAL(operate(QString)), w, SLOT(play(QString)));
     connect(this, SIGNAL(click()), w, SLOT(playClick()));
+    connect(this, SIGNAL(operateRepeat(QString)), w, SLOT(repeat(QString)));
+    connect(this, SIGNAL(operateStop()), w, SLOT(stop()));
     playThread.start();
 }
@@ -78,22 +85,22 @@ void SoundPlayer::play(const QString &amp;filename)
         emit setVolume(0);
         break;
     case 1:
-        emit setVolume(40);
+        emit setVolume(60);
         break;
     case 2:
-        emit setVolume(50);
+        emit setVolume(70);
         break;
     case 3:
-        emit setVolume(60);
+        emit setVolume(80);
         break;
     case 4:
-        emit setVolume(70);
+        emit setVolume(85);
         break;
     case 5:
-        emit setVolume(80);
+        emit setVolume(90);
         break;
     case 6:
-        emit setVolume(90);
+        emit setVolume(95);
         break;
     case 7:
         emit setVolume(100);
@@ -115,17 +122,54 @@ void SoundPlayer::emitClick()
         emit setVolume(0);
         break;
     case 1:
-        emit setVolume(50);
+        emit setVolume(75);
         break;
     case 2:
-        emit setVolume(60);
+        emit setVolume(80);
         break;
     case 3:
-        emit setVolume(70);
+        emit setVolume(85);
         break;
     case 4:
+        emit setVolume(90);
+        break;
+    case 5:
+        emit setVolume(95);
+        break;
+    case 6:
+        emit setVolume(98);
+        break;
+    case 7:
+        emit setVolume(100);
+        break;
+    default:
+        emit setVolume(0);
+        break;
+    }
+
+    emit click();
+}
+
+void SoundPlayer::repeat(const QString &filename)
+{
+    Define::config_item item = Config::getInstance()->getConfigValue(Define::config_marster_vol);
+    switch (item.d32)
+    {
+    case 0:
+        emit setVolume(0);
+        break;
+    case 1:
+        emit setVolume(60);
+        break;
+    case 2:
+        emit setVolume(70);
+        break;
+    case 3:
         emit setVolume(80);
         break;
+    case 4:
+        emit setVolume(85);
+        break;
     case 5:
         emit setVolume(90);
         break;
@@ -140,7 +184,12 @@ void SoundPlayer::emitClick()
         break;
     }
-    emit click();
+    emit operateRepeat(filename);
+}
+
+void SoundPlayer::stopPlay()
+{
+    emit operateStop();
 }
 void SoundPlayer::playClick()
@@ -156,7 +205,7 @@ void SoundPlayer::playStart()
     if (instance == 0)
         instance = new SoundPlayer;
-    instance->play(":/sounds/start.wav");
+    instance->play("/falinux/sounds/start.wav");
 }
 void SoundPlayer::playStop()
@@ -164,7 +213,7 @@ void SoundPlayer::playStop()
     if (instance == 0)
         instance = new SoundPlayer;
-    instance->play(":/sounds/stop.wav");
+    instance->play("/falinux/sounds/stop.wav");
 }
 void SoundPlayer::playError1()
@@ -172,7 +221,7 @@ void SoundPlayer::playError1()
     if (instance == 0)
         instance = new SoundPlayer;
-    instance->play(":/sounds/error1.wav");
+    instance->play("/falinux/sounds/error1.wav");
 }
 void SoundPlayer::playError2()
@@ -180,5 +229,29 @@ void SoundPlayer::playError2()
     if (instance == 0)
         instance = new SoundPlayer;
-    instance->play(":/sounds/error2.wav");
+    instance->play("/falinux/sounds/error2.wav");
+}
+
+void SoundPlayer::repeatError1()
+{
+    if (instance == 0)
+        instance = new SoundPlayer;
+
+    instance->repeat("/falinux/sounds/error1.wav");
+}
+
+void SoundPlayer::repeatError2()
+{
+    if (instance == 0)
+        instance = new SoundPlayer;
+
+    instance->repeat("/falinux/sounds/error2.wav");
+}
+
+void SoundPlayer::stop()
+{
+    if (instance == 0)
+        instance = new SoundPlayer;
+
+    instance->stopPlay();
 }
@@ -6,10 +6,14 @@
 #include <QSoundEffect>
 #include <QThread>
 #include <QMap>
+#include <QProcess>
 class SoundPlayWorker : public QObject
 {
     Q_OBJECT
+
+    bool repeat_;
+
 public:
     explicit SoundPlayWorker();
@@ -17,11 +21,17 @@ public slots:
     void play(const QString &filename);
     void playClick();
     void setVolume(int volume);
+    void repeat(const QString &filename);
+    void stop();
 private:
     QMap<QString, QSound *> map;
     QSound *current;
     QSoundEffect *click;
+    QProcess *proc;
+
+private slots:
+    void onFinished();
 };
 class SoundPlayer : public QObject
@@ -31,6 +41,8 @@ class SoundPlayer : public QObject
     explicit SoundPlayer();
     void play(const QString &filename);
     void emitClick();
+    void repeat(const QString &filename);
+    void stopPlay();
     static SoundPlayer *instance;
@@ -41,11 +53,16 @@ public:
     static void playStop();
     static void playError1();
     static void playError2();
+    static void repeatError1();
+    static void repeatError2();
+    static void stop();
 signals:
     void setVolume(int);
     void operate(const QString &);
     void click();
+    void operateRepeat(const QString &);
+    void operateStop();
 };
 #endif // SOUNDPLAYER_H
	@@ -329,3 +329,10 @@ TRANSLATIONS += lang_en.ts lang_zh.ts		@@ -329,3 +329,10 @@ TRANSLATIONS += lang_en.ts lang_zh.ts
329		329
330	target.path = /falinux/dev	330	target.path = /falinux/dev
331	INSTALLS += target	331	INSTALLS += target
		332	+
		333	+DISTFILES += \
		334	+ sounds/button.wav \
		335	+ sounds/error1.wav \
		336	+ sounds/error2.wav \
		337	+ sounds/start.wav \
		338	+ sounds/stop.wav