From dc11a850dc04385a1fc827ed786780c5ced31de0 Mon Sep 17 00:00:00 2001 From: doitux Date: Sat, 22 Dec 2012 19:08:23 +0100 Subject: [PATCH] please android_test now ;D --- pokerth_game.pro | 5 +++-- src/gui/qt/sound/soundevents.cpp | 22 +++++++++++----------- src/gui/qt/sound/soundevents.h | 23 ++++++++++++----------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/pokerth_game.pro b/pokerth_game.pro index a6bfdc48..45411407 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -655,8 +655,9 @@ maemo{ } android_test{ - #switch of android audio - CONFIG += android_api8 DEFINES += ANDROID DEFINES += ANDROID_TEST + DEFINES += ANDROID_API8 + HEADERS += src/gui/qt/sound/androidapi8dummy.h + SOURCES += src/gui/qt/sound/androidapi8dummy.cpp } diff --git a/src/gui/qt/sound/soundevents.cpp b/src/gui/qt/sound/soundevents.cpp index d31acc93..1226b694 100644 --- a/src/gui/qt/sound/soundevents.cpp +++ b/src/gui/qt/sound/soundevents.cpp @@ -1,13 +1,13 @@ #include "soundevents.h" #ifdef ANDROID -#ifdef ANDROID_API8 -#include "androidapi8dummy.h" + #ifdef ANDROID_API8 + #include "androidapi8dummy.h" + #else + #include "androidaudio.h" + #endif #else -#include "androidaudio.h" -#endif -#else -#include "sdlplayer.h" + #include "sdlplayer.h" #endif @@ -22,11 +22,11 @@ SoundEvents::SoundEvents(ConfigFile *c): myConfig(c), lastSBValue(0), lastSBLeve { #ifdef ANDROID -#ifdef ANDROID_API8 - myPlayer = new AndroidApi8Dummy(myConfig); -#else - myPlayer = new AndroidAudio(myConfig); -#endif + #ifdef ANDROID_API8 + myPlayer = new AndroidApi8Dummy(myConfig); + #else + myPlayer = new AndroidAudio(myConfig); + #endif #else myPlayer = new SDLPlayer(myConfig); #endif diff --git a/src/gui/qt/sound/soundevents.h b/src/gui/qt/sound/soundevents.h index a584b4f4..1f7849da 100644 --- a/src/gui/qt/sound/soundevents.h +++ b/src/gui/qt/sound/soundevents.h @@ -4,13 +4,13 @@ #include #ifdef ANDROID -#ifdef ANDROID_API8 -class AndroidApi8Dummy; + #ifdef ANDROID_API8 + class AndroidApi8Dummy; + #else + class AndroidAudio; + #endif #else -class AndroidAudio; -#endif -#else -class SDLPlayer; + class SDLPlayer; #endif @@ -34,14 +34,15 @@ protected: private: #ifdef ANDROID -#ifdef ANDROID_API8 - AndroidApi8Dummy *myPlayer; -#else - AndroidAudio *myPlayer; -#endif + #ifdef ANDROID_API8 + AndroidApi8Dummy *myPlayer; + #else + AndroidAudio *myPlayer; + #endif #else SDLPlayer *myPlayer; #endif + ConfigFile *myConfig; int lastSBValue; unsigned int lastSBLevel;