sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test case for #141

Browse Source
This commit is contained in:
doitux
2012-11-21 23:07:54 +01:00
parent 7a29cc59e2
commit 1159cbdf4d
2 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/sound/sdlplayer.cpp
+97 -97
View File
@@ -19,9 +19,9 @@
#ifndef ANDROID
#if (defined __APPLE__)
#include <SDL.h>
//#include <SDL.h>
#else
#include <SDL/SDL.h>
//#include <SDL/SDL.h>
#endif
#endif
@@ -29,11 +29,11 @@ using namespace std;
SDLPlayer::SDLPlayer(ConfigFile *c)
#ifndef ANDROID
: sound(NULL), soundData(NULL), currentChannel(0) , audioEnabled(0), myConfig(c)
//: sound(NULL), soundData(NULL), currentChannel(0) , audioEnabled(0), myConfig(c)
#endif
{
#ifndef ANDROID
myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
// myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
#endif
}
@@ -41,127 +41,127 @@ SDLPlayer::SDLPlayer(ConfigFile *c)
SDLPlayer::~SDLPlayer()
{
#ifndef ANDROID
closeAudio();
// closeAudio();
#endif
}
void SDLPlayer::initAudio()
{
#ifndef ANDROID
SDL_Init(SDL_INIT_AUDIO);
if (!audioEnabled && myConfig->readConfigInt("PlaySoundEffects")) {
int audio_rate = 44100;
Uint16 audio_format = AUDIO_S16; /* 16-bit stereo */
int audio_channels = 2;
int audio_buffers = 4096;
sound = NULL;
// SDL_Init(SDL_INIT_AUDIO);
// if (!audioEnabled && myConfig->readConfigInt("PlaySoundEffects")) {
// int audio_rate = 44100;
// Uint16 audio_format = AUDIO_S16; /* 16-bit stereo */
// int audio_channels = 2;
// int audio_buffers = 4096;
// sound = NULL;
if( Mix_OpenAudio(audio_rate, audio_format, audio_channels, audio_buffers) == 0) {
Mix_QuerySpec(&audio_rate, &audio_format, &audio_channels);
audioEnabled = 1;
}
else {
qDebug() << "Mix_OpenAudio() was not successfull, no sound possible :(";
}
}
// if( Mix_OpenAudio(audio_rate, audio_format, audio_channels, audio_buffers) == 0) {
// Mix_QuerySpec(&audio_rate, &audio_format, &audio_channels);
// audioEnabled = 1;
// }
// else {
// qDebug() << "Mix_OpenAudio() was not successfull, no sound possible :(";
// }
// }
#endif
}
void SDLPlayer::playSound(string audioString, int playerID)
{
#ifndef ANDROID
initAudio();
if(audioEnabled && myConfig->readConfigInt("PlaySoundEffects")) {
// initAudio();
// if(audioEnabled && myConfig->readConfigInt("PlaySoundEffects")) {
QFile myFile(myAppDataPath + "sounds/default/" + QString::fromStdString(audioString)+".wav");
// QFile myFile(myAppDataPath + "sounds/default/" + QString::fromStdString(audioString)+".wav");
if(myFile.open(QIODevice::ReadOnly)) {
// if(myFile.open(QIODevice::ReadOnly)) {
//set 3d position for player
int position = 0;
int distance = 0;
// //set 3d position for player
// int position = 0;
// int distance = 0;
switch (playerID) {
// switch (playerID) {
case 0: {
position = 180;
distance = 10;
}
break;
case 1: {
position = 281;
distance = 50;
}
break;
case 2: {
position = 315;
distance = 120;
}
break;
case 3: {
position = 338;
distance = 160;
}
break;
case 4: {
position = 23;
distance = 160;
}
break;
case 5: {
position = 45;
distance = 120;
}
break;
case 6: {
position = 79;
distance = 50;
}
break;
default: {
position = 0;
distance = 0;
}
break;
}
// case 0: {
// position = 180;
// distance = 10;
// }
// break;
// case 1: {
// position = 281;
// distance = 50;
// }
// break;
// case 2: {
// position = 315;
// distance = 120;
// }
// break;
// case 3: {
// position = 338;
// distance = 160;
// }
// break;
// case 4: {
// position = 23;
// distance = 160;
// }
// break;
// case 5: {
// position = 45;
// distance = 120;
// }
// break;
// case 6: {
// position = 79;
// distance = 50;
// }
// break;
// default: {
// position = 0;
// distance = 0;
// }
// break;
// }
QDataStream in(&myFile);
soundData = new Uint8[(int)myFile.size()];
in.readRawData( (char*)soundData, (int)myFile.size() );
sound = Mix_QuickLoad_WAV(soundData);
// QDataStream in(&myFile);
// soundData = new Uint8[(int)myFile.size()];
// in.readRawData( (char*)soundData, (int)myFile.size() );
// sound = Mix_QuickLoad_WAV(soundData);
// set channel 0 to settings volume
Mix_Volume(-1,myConfig->readConfigInt("SoundVolume")*10);
// // set channel 0 to settings volume
// Mix_Volume(-1,myConfig->readConfigInt("SoundVolume")*10);
// set 3d effect
if(!Mix_SetPosition(0, position, distance)) {
printf("Mix_SetPosition: %s\n", Mix_GetError());
// no position effect, is it ok?
}
currentChannel = Mix_PlayChannel(-1, sound,0);
}
// // set 3d effect
// if(!Mix_SetPosition(0, position, distance)) {
// printf("Mix_SetPosition: %s\n", Mix_GetError());
// // no position effect, is it ok?
// }
// currentChannel = Mix_PlayChannel(-1, sound,0);
// }
//TESTING: release audio after every sound when there is no other sound currently played
if(SDL_GetAudioStatus() != SDL_AUDIO_PLAYING) {
closeAudio();
}
}
// //TESTING: release audio after every sound when there is no other sound currently played
// if(SDL_GetAudioStatus() != SDL_AUDIO_PLAYING) {
// closeAudio();
// }
// }
#endif
}
void SDLPlayer::closeAudio()
{
#ifndef ANDROID
if(audioEnabled) {
Mix_HaltChannel(currentChannel);
Mix_FreeChunk(sound);
sound = NULL;
delete[] soundData;
soundData = NULL;
Mix_CloseAudio();
audioEnabled = false;
}
// if(audioEnabled) {
// Mix_HaltChannel(currentChannel);
// Mix_FreeChunk(sound);
// sound = NULL;
// delete[] soundData;
// soundData = NULL;
// Mix_CloseAudio();
// audioEnabled = false;
// }
SDL_Quit();
// SDL_Quit();
#endif
}
src/gui/qt/sound/sdlplayer.h
+3 -3
View File
@@ -25,9 +25,9 @@
#ifndef ANDROID
#ifdef __APPLE__
#include <SDL_mixer.h>
//#include <SDL_mixer.h>
#else
#include <SDL/SDL_mixer.h>
//#include <SDL/SDL_mixer.h>
#endif
#endif
@@ -52,7 +52,7 @@ public:
private:
#ifndef ANDROID
Mix_Chunk *sound;
// Mix_Chunk *sound;
unsigned char *soundData;
int currentChannel;