aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/snd/libkvisnd.cpp
diff options
context:
space:
mode:
authorGravatar Noldor2008-04-14 16:56:09 +0000
committerGravatar Noldor2008-04-14 16:56:09 +0000
commitf0c0a130de85303ff3acf3e2d4ddbffb303f5dad (patch)
treebcfcc3cef9fb9ee5be735da80f6adb36edc44017 /src/modules/snd/libkvisnd.cpp
parentfixing bug #127 (diff)
downloadKVIrc-f0c0a130de85303ff3acf3e2d4ddbffb303f5dad.tar.gz
KVIrc-f0c0a130de85303ff3acf3e2d4ddbffb303f5dad.tar.bz2
KVIrc-f0c0a130de85303ff3acf3e2d4ddbffb303f5dad.zip
QT4 port: QIconSet (completed), objects module (w.i.p.), code clean.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1480 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/snd/libkvisnd.cpp')
-rw-r--r--src/modules/snd/libkvisnd.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index acae9f89b..42f8378a9 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -232,7 +232,10 @@ bool KviSoundPlayer::playPhonon(const QString &szFileName)
#ifdef COMPILE_ON_WINDOWS
bool KviSoundPlayer::playWinmm(const QString &szFileName)
{
- if(isMuted()) return true;
+ sndPlaySound(szFileName.toLocal8Bit().data(),SND_ASYNC | SND_NODEFAULT);
+ return true;
+ // This does not compile on win!
+ /*if(isMuted()) return true;
KviArtsSoundThread * t = new KviArtsSoundThread(szFileName);
if(!t->start())
{
@@ -240,6 +243,7 @@ bool KviSoundPlayer::playPhonon(const QString &szFileName)
return false;
}
return true;
+ */
}
#else //!COMPILE_ON_WINDOWS
#ifdef COMPILE_OSS_SUPPORT
@@ -355,7 +359,7 @@ void KviSoundThread::run()
}
-#ifndef COMPILE_ON_WINDOWS
+#ifdef COMPILE_ON_WINDOWS
#ifdef COMPILE_OSS_SUPPORT
#ifdef COMPILE_AUDIOFILE_SUPPORT
KviOssAudiofileSoundThread::KviOssAudiofileSoundThread(const QString &szFileName)