Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
badbcf27
Commit
badbcf27
authored
Sep 09, 2015
by
Jeff
Browse files
Fix sound test button
parent
d6398477
Changes
3
Show whitespace changes
Inline
Side-by-side
cockatrice/src/dlg_settings.cpp
View file @
badbcf27
...
...
@@ -766,7 +766,7 @@ SoundSettingsPage::SoundSettingsPage()
connect
(
soundPathClearButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
soundPathClearButtonClicked
()));
QPushButton
*
soundPathButton
=
new
QPushButton
(
"..."
);
connect
(
soundPathButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
soundPathButtonClicked
()));
connect
(
&
soundTestButton
,
SIGNAL
(
clicked
()),
soundEngine
,
SLOT
(
playerJoine
d
()));
connect
(
&
soundTestButton
,
SIGNAL
(
clicked
()),
soundEngine
,
SLOT
(
testSoun
d
()));
masterVolumeSlider
=
new
QSlider
(
Qt
::
Horizontal
);
masterVolumeSlider
->
setMinimum
(
0
);
...
...
cockatrice/src/soundengine.cpp
View file @
badbcf27
...
...
@@ -123,3 +123,8 @@ void SoundEngine::playSound(QString fileName)
audioData
[
fileName
]
->
play
();
#endif
}
void
SoundEngine
::
testSound
()
{
playSound
(
"player_join"
);
}
\ No newline at end of file
cockatrice/src/soundengine.h
View file @
badbcf27
...
...
@@ -30,6 +30,8 @@ private slots:
public:
SoundEngine
(
QObject
*
parent
=
0
);
void
playSound
(
QString
fileName
);
public
slots
:
void
testSound
();
};
extern
SoundEngine
*
soundEngine
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment