Commit 337d4f1a3cc956def15533bb2d51ab3dea46587c
1 parent
c543cf8e67
Exists in
master
and in
2 other branches
음원 추가
Showing
10 changed files
with
57 additions
and
0 deletions
Show diff stats
app/gui/oven_control/inputoverwatcher.cpp
app/gui/oven_control/inputoverwatcher.h
@@ -0,0 +1,17 @@ | @@ -0,0 +1,17 @@ | ||
1 | +#ifndef INPUTOVERWATCHER_H | ||
2 | +#define INPUTOVERWATCHER_H | ||
3 | + | ||
4 | +#include <QObject> | ||
5 | + | ||
6 | +class InputOverwatcher : public QObject | ||
7 | +{ | ||
8 | + Q_OBJECT | ||
9 | +public: | ||
10 | + explicit InputOverwatcher(QObject *parent = 0); | ||
11 | + | ||
12 | +signals: | ||
13 | + | ||
14 | +public slots: | ||
15 | +}; | ||
16 | + | ||
17 | +#endif // INPUTOVERWATCHER_H | ||
0 | \ No newline at end of file | 18 | \ No newline at end of file |
app/gui/oven_control/resources.qrc
@@ -533,5 +533,10 @@ | @@ -533,5 +533,10 @@ | ||
533 | <file>images/config/102_icon_play_ov.png</file> | 533 | <file>images/config/102_icon_play_ov.png</file> |
534 | <file>images/config/102_icon_play.png</file> | 534 | <file>images/config/102_icon_play.png</file> |
535 | <file>images/config/102_usb_icon.png</file> | 535 | <file>images/config/102_usb_icon.png</file> |
536 | + <file>sounds/error1.wav</file> | ||
537 | + <file>sounds/error2.wav</file> | ||
538 | + <file>sounds/start.wav</file> | ||
539 | + <file>sounds/stop.wav</file> | ||
540 | + <file>sounds/button.wav</file> | ||
536 | </qresource> | 541 | </qresource> |
537 | </RCC> | 542 | </RCC> |
app/gui/oven_control/soundplayer.cpp
@@ -19,3 +19,27 @@ void SoundPlayer::play(const QString &filename) | @@ -19,3 +19,27 @@ void SoundPlayer::play(const QString &filename) | ||
19 | current->play(); | 19 | current->play(); |
20 | } | 20 | } |
21 | 21 | ||
22 | +void SoundPlayer::playClick() | ||
23 | +{ | ||
24 | + play(":/sounds/button.wav"); | ||
25 | +} | ||
26 | + | ||
27 | +void SoundPlayer::playStart() | ||
28 | +{ | ||
29 | + play(":/sounds/start.wav"); | ||
30 | +} | ||
31 | + | ||
32 | +void SoundPlayer::playStop() | ||
33 | +{ | ||
34 | + play(":/sounds/stop.wav"); | ||
35 | +} | ||
36 | + | ||
37 | +void SoundPlayer::playError1() | ||
38 | +{ | ||
39 | + play(":/sounds/error1.wav"); | ||
40 | +} | ||
41 | + | ||
42 | +void SoundPlayer::playError2() | ||
43 | +{ | ||
44 | + play(":/sounds/error2.wav"); | ||
45 | +} |
app/gui/oven_control/soundplayer.h
@@ -10,6 +10,11 @@ class SoundPlayer : public QObject | @@ -10,6 +10,11 @@ class SoundPlayer : public QObject | ||
10 | Q_OBJECT | 10 | Q_OBJECT |
11 | public: | 11 | public: |
12 | static void play(const QString &filename); | 12 | static void play(const QString &filename); |
13 | + static void playClick(); | ||
14 | + static void playStart(); | ||
15 | + static void playStop(); | ||
16 | + static void playError1(); | ||
17 | + static void playError2(); | ||
13 | 18 | ||
14 | signals: | 19 | signals: |
15 | 20 |
app/gui/oven_control/sounds/button.wav
No preview for this file type
app/gui/oven_control/sounds/error1.wav
No preview for this file type
app/gui/oven_control/sounds/error2.wav
No preview for this file type
app/gui/oven_control/sounds/start.wav
No preview for this file type
app/gui/oven_control/sounds/stop.wav
No preview for this file type