diff -r 62aa418ed214 -r 6fe3e922246e QTfrontend/ui/widget/chatwidget.cpp --- a/QTfrontend/ui/widget/chatwidget.cpp Fri Oct 21 04:11:26 2011 +0200 +++ b/QTfrontend/ui/widget/chatwidget.cpp Fri Oct 21 07:00:49 2011 +0200 @@ -22,9 +22,8 @@ #include #include #include -#include +#include #include -#include #include #include #include @@ -32,9 +31,10 @@ #include #include +#include "HWDataManager.h" #include "hwconsts.h" -#include "SDLs.h" #include "gameuiconfig.h" + #include "chatwidget.h" ListWidgetNickItem::ListWidgetNickItem(const QString& nick, bool isFriend, bool isIgnored) : QListWidgetItem(nick) @@ -116,22 +116,20 @@ .Notice { color: #fefefe }\ "; -HWChatWidget::HWChatWidget(QWidget* parent, QSettings * gameSettings, SDLInteraction * sdli, bool notify) : +HWChatWidget::HWChatWidget(QWidget* parent, QSettings * gameSettings, bool notify) : QWidget(parent), mainLayout(this) { this->gameSettings = gameSettings; - this->sdli = sdli; this->notify = notify; if(notify && gameSettings->value("frontend/sound", true).toBool()) { - QFile tmpfile; - sdli->SDLMusicInit(); - for(int i=0;i<4;i++) { - tmpfile.setFileName(cfgdir->absolutePath() + "/Data/Sounds/voices/Classic/Hello.ogg"); - if (tmpfile.exists()) sound[i] = Mix_LoadWAV(QFileInfo(tmpfile).absoluteFilePath().toLocal8Bit().constData()); - else sound[i] = Mix_LoadWAV(QString(datadir->absolutePath() + - "/Sounds/voices/Classic/Hello.ogg").toLocal8Bit().constData()); - } + QFile * tmpFile = HWDataManager::instance().findFileForRead( + "Sounds/voices/Classic/Hello.ogg"); + + helloSound = tmpFile->fileName(); + + // this QFile isn't needed any further + delete tmpFile; } mainLayout.setSpacing(1); @@ -426,7 +424,7 @@ emit nickCountUpdate(chatNicks->count()); if(notifyNick && notify && gameSettings->value("frontend/sound", true).toBool()) { - Mix_PlayChannel(-1, sound[rand()%4], 0); + SDLInteraction::instance().playSoundFile(helloSound); } }