diff --git a/pokerth_game.pro b/pokerth_game.pro
index 4fc0c3b5..16fd881d 100644
--- a/pokerth_game.pro
+++ b/pokerth_game.pro
@@ -509,7 +509,12 @@ unix:!mac {
LIBS += -ltinyxml
LIBS += $$BOOST_LIBS
LIBS += -lgsasl -lidn
- LIBS += -lssl -lcrypto -lgcrypt -lgpg-error -lprotobuf-lite -lOpenSLES
+ LIBS += -lssl -lcrypto -lgcrypt -lgpg-error -lprotobuf-lite
+
+ !android_api8 {
+ #android sound lib for api9 and higher
+ LIBS += -lOpenSLES
+ }
}
TARGETDEPS += ./lib/libpokerth_lib.a \
./lib/libpokerth_db.a \
@@ -627,11 +632,19 @@ android{
# sqlite3 is included directly.
INCLUDEPATH += src/third_party/sqlite3
- HEADERS += src/gui/qt/sound/androidaudio.h \
- src/gui/qt/sound/androidsoundeffect.h
+ # sound system switches
+ !android_api8 {
+ HEADERS += src/gui/qt/sound/androidaudio.h \
+ src/gui/qt/sound/androidsoundeffect.h
- SOURCES += src/gui/qt/sound/androidaudio.cpp \
- src/gui/qt/sound/androidsoundeffect.cpp
+ SOURCES += src/gui/qt/sound/androidaudio.cpp \
+ src/gui/qt/sound/androidsoundeffect.cpp
+ }
+ android_api8 {
+ DEFINES += ANDROID_API8
+ HEADERS += src/gui/qt/sound/androidapi8dummy.h
+ SOURCES += src/gui/qt/sound/androidapi8dummy.cpp
+ }
}
!android{
diff --git a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp
index d0cc66f7..081cbce3 100644
--- a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp
+++ b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp
@@ -28,7 +28,7 @@ changeCompleteBlindsDialogImpl::changeCompleteBlindsDialogImpl(QWidget *parent,
setWindowModality(Qt::ApplicationModal);
setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
#endif
- setupUi(this);
+ setupUi(this);
connect( pushButton_add, SIGNAL( clicked() ), this, SLOT( addBlindValueToList() ) );
connect( pushButton_delete, SIGNAL( clicked() ), this, SLOT( removeBlindFromList() ) );
diff --git a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.h b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.h
index dbce130d..4dc784a4 100644
--- a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.h
+++ b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.h
@@ -35,8 +35,7 @@ class changeCompleteBlindsDialogImpl: public QDialog, public Ui::changeCompleteB
public:
changeCompleteBlindsDialogImpl(QWidget *parent = 0, ConfigFile *c = 0);
- void exec();
-
+ void exec();
public slots:
bool getSettingsCorrect() const {
diff --git a/src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui b/src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui
index 5eb340cc..8789bdcc 100644
--- a/src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui
+++ b/src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui
@@ -28,10 +28,7 @@
QObject {font: 24px}
-
-
- 8
-
+
-
-
@@ -171,19 +168,6 @@
- -
-
-
- QObject {font: bold 20px}
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Ok
-
-
-
-
@@ -196,50 +180,6 @@
0
-
-
-
-
- 4
-
-
-
-
-
- -
-
-
- Delete
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 121
-
-
-
-
- -
-
-
- 20000
-
-
-
- -
-
-
- Add
-
-
-
-
-
-
@@ -300,9 +240,106 @@
+ -
+
+
+ 4
+
+
-
+
+
+ -
+
+
+ Delete
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 121
+
+
+
+
+ -
+
+
+ 20000
+
+
+
+ -
+
+
+ Add
+
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ OK
+
+
+
+ :/gfx/dialog_ok_apply.png:/gfx/dialog_ok_apply.png
+
+
+
+ 24
+ 24
+
+
+
+ false
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 20
+
+
+
+
+
+
@@ -318,42 +355,11 @@
radioButton_afterThisAlwaysRaiseAbout
spinBox_afterThisAlwaysRaiseValue
radioButton_afterThisStayAtLastBlind
- buttonBox
-
+
+
+
-
- buttonBox
- accepted()
- changeCompleteBlindsDialog
- accept()
-
-
- 237
- 387
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- changeCompleteBlindsDialog
- reject()
-
-
- 279
- 387
-
-
- 286
- 274
-
-
-
radioButton_afterThisAlwaysRaiseAbout
toggled(bool)
@@ -361,12 +367,12 @@
setEnabled(bool)
- 327
- 302
+ 663
+ 349
- 389
- 304
+ 763
+ 353
@@ -377,12 +383,28 @@
setEnabled(bool)
- 297
- 116
+ 706
+ 154
- 306
- 164
+ 310
+ 337
+
+
+
+
+ pushButton
+ clicked()
+ changeCompleteBlindsDialog
+ accept()
+
+
+ 716
+ 465
+
+
+ 628
+ 467
diff --git a/src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui b/src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui
index fcfec0a3..e32d750a 100644
--- a/src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui
+++ b/src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui
@@ -131,12 +131,19 @@
-
-
- QObject {font: bold 30px}
-
Login
+
+
+ :/gfx/dialog_ok_apply.png:/gfx/dialog_ok_apply.png
+
+
+
+ 24
+ 24
+
+
false
@@ -206,7 +213,9 @@
checkBox_guest
pushButton_login
-
+
+
+
pushButton_login
diff --git a/src/gui/qt/sound/androidapi8dummy.cpp b/src/gui/qt/sound/androidapi8dummy.cpp
new file mode 100644
index 00000000..ed653532
--- /dev/null
+++ b/src/gui/qt/sound/androidapi8dummy.cpp
@@ -0,0 +1,11 @@
+#include "configfile.h"
+#include "androidapi8dummy.h"
+
+AndroidApi8Dummy::AndroidApi8Dummy(ConfigFile *c, QObject *parent) :
+ QObject(parent), myConfig(c)
+{
+}
+
+AndroidApi8Dummy::~AndroidApi8Dummy()
+{
+}
diff --git a/src/gui/qt/sound/androidapi8dummy.h b/src/gui/qt/sound/androidapi8dummy.h
new file mode 100644
index 00000000..4f1bb2dc
--- /dev/null
+++ b/src/gui/qt/sound/androidapi8dummy.h
@@ -0,0 +1,30 @@
+#ifndef ANDROIDAPI8DUMMY_H
+#define ANDROIDAPI8DUMMY_H
+
+#include
+class ConfigFile;
+
+class AndroidApi8Dummy : public QObject
+{
+ Q_OBJECT
+public:
+ explicit AndroidApi8Dummy(ConfigFile *c, QObject *parent = 0);
+ ~AndroidApi8Dummy();
+
+signals:
+
+public slots:
+
+ void registerSound(const QString&, const QString&){}
+ void reallyPlaySound(const QString&){}
+ void playSound(const std::string&, int){}
+ void initAudio(){}
+ void closeAudio(){}
+ void reInit(){}
+
+private:
+ ConfigFile *myConfig;
+
+};
+
+#endif // ANDROIDAPI8DUMMY
diff --git a/src/gui/qt/sound/soundevents.cpp b/src/gui/qt/sound/soundevents.cpp
index a7cfd1fd..9e6d0ccb 100644
--- a/src/gui/qt/sound/soundevents.cpp
+++ b/src/gui/qt/sound/soundevents.cpp
@@ -1,7 +1,11 @@
#include "soundevents.h"
#ifdef ANDROID
- #include "androidaudio.h"
+ #ifdef ANDROID_API8
+ #include "androidapi8dummy.h"
+ #else
+ #include "androidaudio.h"
+ #endif
#else
#include "sdlplayer.h"
#endif
@@ -18,7 +22,11 @@ SoundEvents::SoundEvents(ConfigFile *c): myConfig(c), lastSBValue(0), lastSBLeve
{
#ifdef ANDROID
- myPlayer = new AndroidAudio(myConfig);
+ #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 d559625a..ed5ef9a8 100644
--- a/src/gui/qt/sound/soundevents.h
+++ b/src/gui/qt/sound/soundevents.h
@@ -3,9 +3,12 @@
#include
-
#ifdef ANDROID
- class AndroidAudio;
+ #ifdef ANDROID_API8
+ class AndroidApi8Dummy;
+ #else
+ class AndroidAudio;
+ #endif
#else
class SDLPlayer;
#endif
@@ -31,7 +34,11 @@ protected:
private:
#ifdef ANDROID
- AndroidAudio *myPlayer;
+ #ifdef ANDROID_API8
+ AndroidApi8Dummy *myPlayer;
+ #else
+ AndroidAudio *myPlayer;
+ #endif
#else
SDLPlayer *myPlayer;
#endif