Commit badbcf27 authored by Jeff's avatar Jeff
Browse files

Fix sound test button

parent d6398477
...@@ -766,7 +766,7 @@ SoundSettingsPage::SoundSettingsPage() ...@@ -766,7 +766,7 @@ SoundSettingsPage::SoundSettingsPage()
connect(soundPathClearButton, SIGNAL(clicked()), this, SLOT(soundPathClearButtonClicked())); connect(soundPathClearButton, SIGNAL(clicked()), this, SLOT(soundPathClearButtonClicked()));
QPushButton *soundPathButton = new QPushButton("..."); QPushButton *soundPathButton = new QPushButton("...");
connect(soundPathButton, SIGNAL(clicked()), this, SLOT(soundPathButtonClicked())); connect(soundPathButton, SIGNAL(clicked()), this, SLOT(soundPathButtonClicked()));
connect(&soundTestButton, SIGNAL(clicked()), soundEngine, SLOT(playerJoined())); connect(&soundTestButton, SIGNAL(clicked()), soundEngine, SLOT(testSound()));
masterVolumeSlider = new QSlider(Qt::Horizontal); masterVolumeSlider = new QSlider(Qt::Horizontal);
masterVolumeSlider->setMinimum(0); masterVolumeSlider->setMinimum(0);
......
...@@ -123,3 +123,8 @@ void SoundEngine::playSound(QString fileName) ...@@ -123,3 +123,8 @@ void SoundEngine::playSound(QString fileName)
audioData[fileName]->play(); audioData[fileName]->play();
#endif #endif
} }
void SoundEngine::testSound()
{
playSound("player_join");
}
\ No newline at end of file
...@@ -30,6 +30,8 @@ private slots: ...@@ -30,6 +30,8 @@ private slots:
public: public:
SoundEngine(QObject *parent = 0); SoundEngine(QObject *parent = 0);
void playSound(QString fileName); void playSound(QString fileName);
public slots:
void testSound();
}; };
extern SoundEngine *soundEngine; extern SoundEngine *soundEngine;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment