From 1a6c940ed9d7f6136da0e13148314072665342c5 Mon Sep 17 00:00:00 2001 From: manuel Date: Tue, 10 May 2011 22:28:58 +0200 Subject: - refactorized audio once more: audio is now a plugin which gets loaded at runtime - thus server has no dependency to phonon any more - remove client dependency to qtnetwork - fix enet deinitialization on windows --- pacman-c++/server/server.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'pacman-c++/server/server.cpp') diff --git a/pacman-c++/server/server.cpp b/pacman-c++/server/server.cpp index 65db87d..f9502ba 100644 --- a/pacman-c++/server/server.cpp +++ b/pacman-c++/server/server.cpp @@ -760,7 +760,7 @@ void Server::initRoundMap() disconnect(AudioManager::self()->audioPlayer(), NULL, this, NULL); connect(AudioManager::self()->audioPlayer(), SIGNAL(finished()), this, SLOT(startGame())); - AudioManager::self()->play(Sound::Intro, true); + AudioManager::self()->audioPlayer()->play(Sound::Intro); m_tickTimer->start(); } @@ -782,7 +782,7 @@ void Server::stopGame(bool delay) { disconnect(AudioManager::self()->audioPlayer(), NULL, this, NULL); connect(AudioManager::self()->audioPlayer(), SIGNAL(finished()), this, SLOT(stopGame())); - AudioManager::self()->play(Sound::Die, true); + AudioManager::self()->audioPlayer()->play(Sound::Die); return; } @@ -962,14 +962,17 @@ int main(int argc, char **argv) qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); int ret = 0; - Server server; - if (!ret && !server.parseCommandline()) + Server *server = new Server; + if (!ret && !server->parseCommandline()) ret = 1; - if (!ret && !server.run()) + if (!ret && !server->run()) ret = 1; if (!ret) ret = app.exec(); + /* delete server so that we'll disconnect all clients before enet deinitialize */ + delete server; + enet_deinitialize(); /* Delete all global objects allocated by libprotobuf */ -- cgit v1.2.3