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

hopefully fix blocking soundcards bug ;)

Browse Source
This commit is contained in:
doitux
2007-05-30 22:03:40 +00:00
parent 526639bfef
commit 830e7dc6ee
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/mainwindow/mainwindowimpl.cpp
+17 -12
View File
@@ -561,7 +561,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
connect( actionSettings, SIGNAL( triggered() ), this, SLOT( callSettingsDialog() ) ); connect( actionSettings, SIGNAL( triggered() ), this, SLOT( callSettingsDialog() ) );
connect( actionJoin_network_Game, SIGNAL( triggered() ), this, SLOT( callJoinNetworkGameDialog() ) ); connect( actionJoin_network_Game, SIGNAL( triggered() ), this, SLOT( callJoinNetworkGameDialog() ) );
connect( actionCreate_network_Game, SIGNAL( triggered() ), this, SLOT( callCreateNetworkGameDialog() ) ); connect( actionCreate_network_Game, SIGNAL( triggered() ), this, SLOT( callCreateNetworkGameDialog() ) );
connect( actionQuit, SIGNAL( triggered() ), qApp, SLOT( quit() ) ); connect( actionQuit, SIGNAL( triggered() ), this, SLOT( quitPokerTH() ) );
connect( actionFullScreen, SIGNAL( triggered() ), this, SLOT( switchFullscreen() ) ); connect( actionFullScreen, SIGNAL( triggered() ), this, SLOT( switchFullscreen() ) );
connect( pushButton_BetRaise, SIGNAL( clicked() ), this, SLOT( myBetRaise() ) ); connect( pushButton_BetRaise, SIGNAL( clicked() ), this, SLOT( myBetRaise() ) );
@@ -655,9 +655,6 @@ mainWindowImpl::~mainWindowImpl() {
delete myConfig; delete myConfig;
myConfig = 0; myConfig = 0;
//SOUND TESTING
Mix_CloseAudio();
SDL_Quit();
} }
void mainWindowImpl::callNewGameDialog() { void mainWindowImpl::callNewGameDialog() {
@@ -2522,6 +2519,7 @@ void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
if (event->key() == Qt::Key_D) { setLabelArray[0]->startTimeOutAnimation(myConfig->readConfigInt("NetTimeOutPlayerAction")); } //f if (event->key() == Qt::Key_D) { setLabelArray[0]->startTimeOutAnimation(myConfig->readConfigInt("NetTimeOutPlayerAction")); } //f
if (event->key() == Qt::Key_E) { setLabelArray[0]->stopTimeOutAnimation(); } //f if (event->key() == Qt::Key_E) { setLabelArray[0]->stopTimeOutAnimation(); } //f
if (event->key() == Qt::Key_S) { playSound(); } //s if (event->key() == Qt::Key_S) { playSound(); } //s
if (event->key() == Qt::Key_W) { qApp->quit(); } //s
if (event->key() == 16777249) { if (event->key() == 16777249) {
pushButton_break->click(); pushButton_break->click();
ctrlPressed = TRUE; ctrlPressed = TRUE;
@@ -2590,14 +2588,6 @@ void mainWindowImpl::tabSwitchAction() {
} }
} }
void mainWindowImpl::closeEvent(QCloseEvent *event) {
mySession->terminateNetworkClient();
if (myServerGuiInterface.get()) myServerGuiInterface->getSession().terminateNetworkServer();
event->accept();
}
void mainWindowImpl::localGameModification() { void mainWindowImpl::localGameModification() {
@@ -2641,3 +2631,18 @@ void mainWindowImpl::playSound() {
} }
void mainWindowImpl::closeEvent(QCloseEvent *event) { quitPokerTH(); }
void mainWindowImpl::quitPokerTH() {
mySession->terminateNetworkClient();
if (myServerGuiInterface.get()) myServerGuiInterface->getSession().terminateNetworkServer();
//SOUND close
Mix_CloseAudio();
SDL_Quit();
// cout << "PokerTH finished" << endl;
qApp->quit();
}
src/gui/qt/mainwindow/mainwindowimpl.h
+1
View File
@@ -257,6 +257,7 @@ public slots:
void playSound(); void playSound();
void musicDone(); void musicDone();
void quitPokerTH();
private: private: