From 4961e79ea1b68549a6bfb0da3cd61ad977757341 Mon Sep 17 00:00:00 2001 From: doitux Date: Fri, 23 Dec 2011 19:22:04 +0000 Subject: [PATCH] change stayontable-status handling from gui to engine code --- pokerth_game.pro | 8 ++++++-- src/gui/qt/gametable/gametableimpl.cpp | 12 +++--------- src/gui/qt/sound/soundevents.cpp | 8 ++++++++ src/gui/qt/sound/soundevents.h | 17 +++++++++++++++++ 4 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 src/gui/qt/sound/soundevents.cpp create mode 100644 src/gui/qt/sound/soundevents.h diff --git a/pokerth_game.pro b/pokerth_game.pro index 12418b43..d8136541 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -196,7 +196,8 @@ HEADERS += src/engine/game.h \ src/engine/local_engine/replay.h \ src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.h \ src/gui/qt/gametable/myslider.h \ - src/gui/qt/gametable/mycashlabel.h + src/gui/qt/gametable/mycashlabel.h \ + src/gui/qt/sound/soundevents.h !gui_800x480 { FORMS += src/gui/qt/gametable.ui \ @@ -270,7 +271,8 @@ SOURCES += src/pokerth.cpp \ src/engine/local_engine/replay.cpp \ src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.cpp \ src/net/common/servermanagerfactoryclient.cpp \ - src/gui/qt/gametable/mycashlabel.cpp + src/gui/qt/gametable/mycashlabel.cpp \ + src/gui/qt/sound/soundevents.cpp TRANSLATIONS = ts/pokerth_af.ts \ ts/pokerth_bg.ts \ ts/pokerth_zhcn.ts \ @@ -591,3 +593,5 @@ gui_800x480 { } + + diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 3811261c..4143e2d7 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -3768,17 +3768,11 @@ void gameTableImpl::restoreGameTableGeometry() } } -void gameTableImpl::netClientPlayerLeft(unsigned playerId) +void gameTableImpl::netClientPlayerLeft(unsigned /*playerId*/) { - if (myStartWindow->getSession()->getCurrentGame() && myStartWindow->getSession()->isNetworkClientRunning()) { - - boost::shared_ptr tmpPlayer = myStartWindow->getSession()->getCurrentGame()->getPlayerByUniqueId(playerId); - if (tmpPlayer.get()) { - tmpPlayer->setMyStayOnTableStatus(0); - refreshPlayerAvatar(); - refreshPlayerName(); - } + refreshPlayerAvatar(); + refreshPlayerName(); } } diff --git a/src/gui/qt/sound/soundevents.cpp b/src/gui/qt/sound/soundevents.cpp new file mode 100644 index 00000000..4d008966 --- /dev/null +++ b/src/gui/qt/sound/soundevents.cpp @@ -0,0 +1,8 @@ +#include "sdlplayer.h" +#include "configfile.h" +#include "soundevents.h" + +SoundEvents::SoundEvents(ConfigFile *c): myConfig(c) +{ + mySDLPlayer = new SDLPlayer(myConfig); +} diff --git a/src/gui/qt/sound/soundevents.h b/src/gui/qt/sound/soundevents.h new file mode 100644 index 00000000..1ab51d9d --- /dev/null +++ b/src/gui/qt/sound/soundevents.h @@ -0,0 +1,17 @@ +#ifndef SOUNDEVENTS_H +#define SOUNDEVENTS_H + +class SDLPlayer; +class ConfigFile; +class SoundEvents +{ +public: + SoundEvents(ConfigFile*); +private: + SDLPlayer *mySDLPlayer; + ConfigFile *myConfig; + + +}; + +#endif // SOUNDEVENTS_H