next steps on #141 (just init sdl)

This commit is contained in:
doitux
2012-11-24 09:36:11 +01:00
parent c1224ab162
commit 342c11615e
2 changed files with 11 additions and 9 deletions
+2 -2
View File
@@ -841,8 +841,8 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog)
}
// Re-init audio.
mySDLPlayer->closeAudio();
mySDLPlayer->initAudio();
mySDLPlayer->initAudio();
mySDLPlayer->closeAudio();
}
void gameTableImpl::initGui(int speed)
+9 -7
View File
@@ -41,14 +41,15 @@ SDLPlayer::SDLPlayer(ConfigFile *c)
SDLPlayer::~SDLPlayer()
{
#ifndef ANDROID
// closeAudio();
closeAudio();
#endif
}
void SDLPlayer::initAudio()
{
#ifndef ANDROID
// SDL_Init(SDL_INIT_AUDIO);
SDL_Init(SDL_INIT_AUDIO);
qDebug() << "SDL_Init()";
// if (!audioEnabled && myConfig->readConfigInt("PlaySoundEffects")) {
// int audio_rate = 44100;
// Uint16 audio_format = AUDIO_S16; /* 16-bit stereo */
@@ -70,7 +71,7 @@ void SDLPlayer::initAudio()
void SDLPlayer::playSound(string audioString, int playerID)
{
#ifndef ANDROID
// initAudio();
initAudio();
// if(audioEnabled && myConfig->readConfigInt("PlaySoundEffects")) {
// QFile myFile(myAppDataPath + "sounds/default/" + QString::fromStdString(audioString)+".wav");
@@ -142,9 +143,9 @@ void SDLPlayer::playSound(string audioString, int playerID)
// }
// //TESTING: release audio after every sound when there is no other sound currently played
// if(SDL_GetAudioStatus() != SDL_AUDIO_PLAYING) {
// closeAudio();
// }
if(SDL_GetAudioStatus() != SDL_AUDIO_PLAYING) {
closeAudio();
}
// }
#endif
}
@@ -162,6 +163,7 @@ void SDLPlayer::closeAudio()
// audioEnabled = false;
// }
// SDL_Quit();
SDL_Quit();
qDebug() << "SDL_Quit()";
#endif
}