please android_test now ;D

This commit is contained in:
doitux
2012-12-22 19:08:23 +01:00
parent 60f35815b0
commit dc11a850dc
3 changed files with 26 additions and 24 deletions
+3 -2
View File
@@ -655,8 +655,9 @@ maemo{
} }
android_test{ android_test{
#switch of android audio
CONFIG += android_api8
DEFINES += ANDROID DEFINES += ANDROID
DEFINES += ANDROID_TEST DEFINES += ANDROID_TEST
DEFINES += ANDROID_API8
HEADERS += src/gui/qt/sound/androidapi8dummy.h
SOURCES += src/gui/qt/sound/androidapi8dummy.cpp
} }
+11 -11
View File
@@ -1,13 +1,13 @@
#include "soundevents.h" #include "soundevents.h"
#ifdef ANDROID #ifdef ANDROID
#ifdef ANDROID_API8 #ifdef ANDROID_API8
#include "androidapi8dummy.h" #include "androidapi8dummy.h"
#else
#include "androidaudio.h"
#endif
#else #else
#include "androidaudio.h" #include "sdlplayer.h"
#endif
#else
#include "sdlplayer.h"
#endif #endif
@@ -22,11 +22,11 @@ SoundEvents::SoundEvents(ConfigFile *c): myConfig(c), lastSBValue(0), lastSBLeve
{ {
#ifdef ANDROID #ifdef ANDROID
#ifdef ANDROID_API8 #ifdef ANDROID_API8
myPlayer = new AndroidApi8Dummy(myConfig); myPlayer = new AndroidApi8Dummy(myConfig);
#else #else
myPlayer = new AndroidAudio(myConfig); myPlayer = new AndroidAudio(myConfig);
#endif #endif
#else #else
myPlayer = new SDLPlayer(myConfig); myPlayer = new SDLPlayer(myConfig);
#endif #endif
+12 -11
View File
@@ -4,13 +4,13 @@
#include <string> #include <string>
#ifdef ANDROID #ifdef ANDROID
#ifdef ANDROID_API8 #ifdef ANDROID_API8
class AndroidApi8Dummy; class AndroidApi8Dummy;
#else
class AndroidAudio;
#endif
#else #else
class AndroidAudio; class SDLPlayer;
#endif
#else
class SDLPlayer;
#endif #endif
@@ -34,14 +34,15 @@ protected:
private: private:
#ifdef ANDROID #ifdef ANDROID
#ifdef ANDROID_API8 #ifdef ANDROID_API8
AndroidApi8Dummy *myPlayer; AndroidApi8Dummy *myPlayer;
#else #else
AndroidAudio *myPlayer; AndroidAudio *myPlayer;
#endif #endif
#else #else
SDLPlayer *myPlayer; SDLPlayer *myPlayer;
#endif #endif
ConfigFile *myConfig; ConfigFile *myConfig;
int lastSBValue; int lastSBValue;
unsigned int lastSBLevel; unsigned int lastSBLevel;