From c6dd03260e3c9a7fce9ba677a147c051f223c89e Mon Sep 17 00:00:00 2001 From: victor Date: Fri, 2 Jun 2017 17:12:12 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9A=94=EB=A6=AC=20=EC=8B=9C=EC=9E=91/?= =?UTF-8?q?=EC=A2=85=EB=A3=8C=20=EA=B4=80=EB=A0=A8=20=EC=9D=8C=ED=96=A5=20?= =?UTF-8?q?=ED=9A=A8=EA=B3=BC=20=EC=88=98=EC=A0=95=20&=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20-=20=EC=88=98=EB=8F=99=20=EC=9A=94=EB=A6=AC=20?= =?UTF-8?q?=EC=8B=9C=EC=9E=91=20=ED=9A=A8=EA=B3=BC=EB=A5=BC=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=EC=9D=B4=200=EB=B3=B4=EB=8B=A4=20=ED=81=B4=20?= =?UTF-8?q?=EB=95=8C=EB=A7=8C=20=EC=B6=9C=EB=A0=A5=20-=20=EC=9E=90?= =?UTF-8?q?=EB=8F=99=20=EC=9A=94=EB=A6=AC=20=EC=8B=9C=EC=9E=91/=EC=A2=85?= =?UTF-8?q?=EB=A3=8C=20=ED=9A=A8=EA=B3=BC=20=EC=B6=94=EA=B0=80=20-=20?= =?UTF-8?q?=EC=9E=90=EB=8F=99=20=EC=9A=94=EB=A6=AC=20=ED=9B=84=EC=86=8D=20?= =?UTF-8?q?=EA=B3=B5=EC=A0=95=20=EC=A4=91=20=EB=B0=94=EC=82=AD=ED=95=A8=20?= =?UTF-8?q?=EC=A3=BC=EA=B8=B0=20=EC=8B=9C=EC=9E=91/=EC=A2=85=EB=A3=8C?= =?UTF-8?q?=EC=97=90=20=EC=9A=94=EB=A6=AC=20=EC=8B=9C=EC=9E=91/=EC=A2=85?= =?UTF-8?q?=EB=A3=8C=20=ED=9A=A8=EA=B3=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gui/oven_control/autocook.cpp | 5 +++++ app/gui/oven_control/autocookwindow.cpp | 6 ++++++ app/gui/oven_control/manualcookwindow.cpp | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/gui/oven_control/autocook.cpp b/app/gui/oven_control/autocook.cpp index 6459875..0ecf7c6 100644 --- a/app/gui/oven_control/autocook.cpp +++ b/app/gui/oven_control/autocook.cpp @@ -1,4 +1,5 @@ #include "autocook.h" +#include "soundplayer.h" AutoCook::AutoCook() : currentStepIndex(0), done_(false), doorOpened(false), checkingCoreTemp(false) { @@ -314,6 +315,8 @@ bool AutoCook::advance() { done_ = true; + SoundPlayer::playStop(); + if (currentStep.dehumidification) { if (currentStep.dehumidificationRepeatDelay) @@ -357,6 +360,8 @@ bool AutoCook::advance() { done_ = true; + SoundPlayer::playStop(); + if (currentStep.dehumidification) { if (currentStep.dehumidificationRepeatDelay) diff --git a/app/gui/oven_control/autocookwindow.cpp b/app/gui/oven_control/autocookwindow.cpp index 8317691..b640075 100644 --- a/app/gui/oven_control/autocookwindow.cpp +++ b/app/gui/oven_control/autocookwindow.cpp @@ -64,6 +64,8 @@ AutoCookWindow::AutoCookWindow(QWidget *parent, Cook cook) : connect(&updateViewTimer, SIGNAL(timeout()), SLOT(updateView())); updateViewTimer.start(100); + + SoundPlayer::playStart(); } AutoCookWindow::~AutoCookWindow() @@ -601,6 +603,9 @@ void AutoCookWindow::startProcess(int process) oven->startCooking(); checkProcessTimer.start(100); + + SoundPlayer::playStart(); + break; } case Define::KeepWarm: @@ -630,6 +635,7 @@ void AutoCookWindow::checkProcess() Oven *oven = Oven::getInstance(); if (oven->currentTemp() >= oven->temp()) { + SoundPlayer::playStop(); oven->stopCooking(); checkProcessTimer.stop(); processSelected = false; diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp index f5c3719..7e46fb7 100644 --- a/app/gui/oven_control/manualcookwindow.cpp +++ b/app/gui/oven_control/manualcookwindow.cpp @@ -351,10 +351,10 @@ void ManualCookWindow::start() if (oven->cooking()) return; - SoundPlayer::playStart(); - if (oven->time() > 0) { + SoundPlayer::playStart(); + if (startCookingTimer.isActive()) startCookingTimer.stop(); -- 2.1.4