Kill some debug noise.

Fix painting of themed input editor under some styles (hm.. do we *REALLY* need to theme this ? under some themes it's ugly)
Some work on the sound module: fixes for the Oss+Audiofile and Phonon systems.
Add support for testing the sound system from the option dialog.
Add a basic jingle sound that can be used for the test above (maybe we could find something nicer and smaller ?)



git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4371 17fca916-40b9-46aa-a4ea-0a15b648b75c

4 files changed, 308 insertions, 147 deletions

diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index 6dc85013e..f47179a88 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -32,12 +32,13 @@
 #include "kvi_string.h"
 #include "kvi_tal_hbox.h"
 #include "kvi_tal_tooltip.h"
+#include "kvi_app.h"
 
 #include <QLabel>
 #include <QPushButton>
 
 
-// FIXME: This module doesn't Cancel properly when auto-detection is performed!
+// FIXME: This module doesn't ???? properly when auto-detection is performed!
 
 
 
@@ -54,6 +55,8 @@ KviSoundOptionsWidget::~KviSoundOptionsWidget()
 KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent)
 {
+	m_bFirstShow = true;
+
 	setObjectName("sound_system_options_widget");
 	createLayout();
 
@@ -86,10 +89,6 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 	m_pMediaTestButton = new QPushButton(__tr2qs_ctx("Test","options"),h);
 	connect(m_pMediaTestButton,SIGNAL(clicked()),this,SLOT(mediaTest()));
 
-	soundFillBox();
-	mediaFillBox();
-	// FIXME!
-	m_pSoundTestButton->setEnabled(false);
 	m_pMediaTestButton->setEnabled(false);
 
 	g = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("ID3 tags' encoding","options"),true);
@@ -148,8 +147,45 @@ KviSoundGeneralOptionsWidget::~KviSoundGeneralOptionsWidget()
 {
 }
 
+void KviSoundGeneralOptionsWidget::showEvent(QShowEvent *)
+{
+	if(!m_bFirstShow)
+		return;
+
+	// We fill these boxes only before the first show since the soundFillBox()
+	// is likely to trigger sound system-detection which may take time...
+	
+	g_pApp->setOverrideCursor(Qt::WaitCursor);
+	
+	soundFillBox();
+	mediaFillBox();
+	
+	g_pApp->restoreOverrideCursor();
+	
+	m_bFirstShow = false;
+}
+
 void KviSoundGeneralOptionsWidget::soundTest()
 {
+	QString szSavedSoundSystem = KVI_OPTION_STRING(KviOption_stringSoundSystem);
+	KVI_OPTION_STRING(KviOption_stringSoundSystem) = m_pSoundSystemBox->currentText();
+
+	KviModule * m = g_pModuleManager->getModule("snd");
+
+	if(!m)
+		return; // doh
+
+	QString szFileName;
+	
+	if(!g_pApp->findAudioFile(szFileName,QString::fromUtf8("jingle.wav")))
+	{
+		qDebug("Can't find the jingle.wav file: was it shipped with your kvirc installation?");
+		return;
+	}
+
+	m->ctrl("play",&szFileName);
+
+	KVI_OPTION_STRING(KviOption_stringSoundSystem) = szSavedSoundSystem;
 }
 
 void KviSoundGeneralOptionsWidget::mediaTest()
@@ -159,17 +195,29 @@ void KviSoundGeneralOptionsWidget::mediaTest()
 void KviSoundGeneralOptionsWidget::soundAutoDetect()
 {
 	KviModule * m = g_pModuleManager->getModule("snd");
-	if(!m)return;
+	if(!m)
+		return;
+
+	g_pApp->setOverrideCursor(Qt::WaitCursor);
+
 	m->ctrl("detectSoundSystem",0);
 	soundFillBox();
+
+	g_pApp->restoreOverrideCursor();
 }
 
 void KviSoundGeneralOptionsWidget::mediaAutoDetect()
 {
 	KviModule * m = g_pModuleManager->getModule("mediaplayer");
-	if(!m)return;
+	if(!m)
+		return;
+
+	g_pApp->setOverrideCursor(Qt::WaitCursor);
+
 	m->ctrl("detectMediaPlayer",0);
 	mediaFillBox();
+
+	g_pApp->restoreOverrideCursor();
 }
 
 void KviSoundGeneralOptionsWidget::soundFillBox()
@@ -180,11 +228,11 @@ void KviSoundGeneralOptionsWidget::soundFillBox()
 	int i;
 	KviModule * m = g_pModuleManager->getModule("snd");
 
+	if(!m)
+		goto disable;
 
-	if(!m)goto disable;
-
-
-	if(!m->ctrl("getAvailableSoundSystems",&l))goto disable;
+	if(!m->ctrl("getAvailableSoundSystems",&l))
+		goto disable;
 
 	m_pSoundSystemBox->clear();
 
diff --git a/src/modules/options/optw_sound.h b/src/modules/options/optw_sound.h
index dc4603046..f7aeb17c7 100644
--- a/src/modules/options/optw_sound.h
+++ b/src/modules/options/optw_sound.h
@@ -67,10 +67,12 @@ protected:
 	QComboBox * m_pWinampEncodingCombo;
 #endif
 	QComboBox * m_pTagsEncodingCombo;
+	bool m_bFirstShow;
 protected:
 	void soundFillBox();
 	void mediaFillBox();
 	virtual void commit();
+	virtual void showEvent(QShowEvent *e);
 protected slots:
 	void soundTest();
 	void soundAutoDetect();
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index d7f53ecdd..0a4441239 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -40,7 +40,6 @@
 	#include <phonon/mediaobject.h>
 	#include <phonon/mediasource.h>
 	#include <phonon/path.h>
-	Phonon::MediaObject * g_pPhononPlayer=0;
 	#include <QUrl>
 #endif //!COMPILE_PHONON_SUPPORT
 
@@ -87,49 +86,85 @@ KviSoundPlayer::KviSoundPlayer()
 	m_pThreadList = new KviPointerList<KviSoundThread>;
 	m_pThreadList->setAutoDelete(true);
 
-	m_pSoundSystemDict = new KviPointerHashTable<QString,SoundSystemRoutine>(17,false);
+#ifdef COMPILE_PHONON_SUPPORT
+	m_pPhononPlayer = NULL;
+#endif //!COMPILE_PHONON_SUPPORT
+
+	m_pLastUsedSoundPlayerEntry = NULL;
+
+	m_pSoundSystemDict = new KviPointerHashTable<QString,KviSoundPlayerEntry>(17,false);
 	m_pSoundSystemDict->setAutoDelete(true);
+
 #ifdef COMPILE_PHONON_SUPPORT
-	m_pSoundSystemDict->insert("phonon",new SoundSystemRoutine(KVI_PTR2MEMBER(KviSoundPlayer::playPhonon)));
+	m_pSoundSystemDict->insert("phonon",new KviSoundPlayerEntry(KVI_PTR2MEMBER(KviSoundPlayer::playPhonon),KVI_PTR2MEMBER(KviSoundPlayer::cleanupPhonon)));
 #endif //!COMPILE_PHONON_SUPPORT
+
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	m_pSoundSystemDict->insert("winmm",new SoundSystemRoutine(KVI_PTR2MEMBER(KviSoundPlayer::playWinmm)));
+	m_pSoundSystemDict->insert("winmm",new KviSoundPlayerEntry(KVI_PTR2MEMBER(KviSoundPlayer::playWinmm),KVI_PTR2MEMBER(KviSoundPlayer::cleanupWinmm)));
 #else //!COMPILE_ON_WINDOWS
+
 	#ifdef COMPILE_OSS_SUPPORT
 		#ifdef COMPILE_AUDIOFILE_SUPPORT
-			m_pSoundSystemDict->insert("oss+audiofile",new SoundSystemRoutine(KVI_PTR2MEMBER(KviSoundPlayer::playOssAudiofile)));
+			m_pSoundSystemDict->insert("oss+audiofile",new KviSoundPlayerEntry(KVI_PTR2MEMBER(KviSoundPlayer::playOssAudiofile),KVI_PTR2MEMBER(KviSoundPlayer::cleanupOssAudiofile)));
 		#endif //COMPILE_AUDIOFILE_SUPPORT
-		m_pSoundSystemDict->insert("oss",new SoundSystemRoutine(KVI_PTR2MEMBER(KviSoundPlayer::playOss)));
+		m_pSoundSystemDict->insert("oss",new KviSoundPlayerEntry(KVI_PTR2MEMBER(KviSoundPlayer::playOss),KVI_PTR2MEMBER(KviSoundPlayer::cleanupOss)));
 	#endif //COMPILE_OSS_SUPPORT
+
 	#ifdef COMPILE_ESD_SUPPORT
-		m_pSoundSystemDict->insert("esd",new SoundSystemRoutine(KVI_PTR2MEMBER(KviSoundPlayer::playEsd)));
+		m_pSoundSystemDict->insert("esd",new KviSoundPlayerEntry(KVI_PTR2MEMBER(KviSoundPlayer::playEsd),KVI_PTR2MEMBER(KviSoundPlayer::cleanupEsd)));
 	#endif //COMPILE_ESD_SUPPORT
-#endif //!COMPILE_ON_WINDOWS
 
-	if(QSound::isAvailable())
-		m_pSoundSystemDict->insert("qt",new SoundSystemRoutine(KVI_PTR2MEMBER(KviSoundPlayer::playQt)));
+#endif //!COMPILE_ON_WINDOWS
 
-	m_pSoundSystemDict->insert("null",new SoundSystemRoutine(KVI_PTR2MEMBER(KviSoundPlayer::playNull)));
+	m_pSoundSystemDict->insert("qt",new KviSoundPlayerEntry(KVI_PTR2MEMBER(KviSoundPlayer::playQt),KVI_PTR2MEMBER(KviSoundPlayer::cleanupQt)));
+	m_pSoundSystemDict->insert("null",new KviSoundPlayerEntry(KVI_PTR2MEMBER(KviSoundPlayer::playNull),KVI_PTR2MEMBER(KviSoundPlayer::cleanupNull)));
 }
 
 KviSoundPlayer::~KviSoundPlayer()
 {
-	m_pThreadList->setAutoDelete(false);
-	while(KviSoundThread * t = m_pThreadList->first())delete t;
+	if(m_pLastUsedSoundPlayerEntry)
+		cleanupAfterLastPlayerEntry();
+
+	stopAllSoundThreads();
 	delete m_pThreadList;
+
 	KviThreadManager::killPendingEvents(this);
+
 	delete m_pSoundSystemDict;
 
 #ifdef COMPILE_PHONON_SUPPORT
-	if(g_pPhononPlayer)
-		g_pPhononPlayer->deleteLater();
-#endif
+	if(m_pPhononPlayer)
+		delete m_pPhononPlayer;
+#endif //COMPILE_PHONON_SUPPORT
+
 	g_pSoundPlayer = 0;
 }
 
+void KviSoundPlayer::stopAllSoundThreads()
+{
+	// kill any running sound thread
+	m_pThreadList->setAutoDelete(false);
+
+	while(KviSoundThread * t = m_pThreadList->first())
+		delete t;
+
+	m_pThreadList->setAutoDelete(true);
+}
+
+void KviSoundPlayer::cleanupAfterLastPlayerEntry()
+{
+	stopAllSoundThreads();
+	if(!m_pLastUsedSoundPlayerEntry)
+		return;
+	SoundSystemCleanupRoutine r = m_pLastUsedSoundPlayerEntry->cleanupRoutine();
+	if(r)
+		(this->*r)();
+	m_pLastUsedSoundPlayerEntry = NULL;
+}
+
 void KviSoundPlayer::getAvailableSoundSystems(QStringList *l)
 {
-	KviPointerHashTableIterator<QString,SoundSystemRoutine> it(*m_pSoundSystemDict);
+	KviPointerHashTableIterator<QString,KviSoundPlayerEntry> it(*m_pSoundSystemDict);
 	while(it.current())
 	{
 		l->append(it.currentKey());
@@ -139,7 +174,13 @@ void KviSoundPlayer::getAvailableSoundSystems(QStringList *l)
 
 bool KviSoundPlayer::havePlayingSounds()
 {
-	return (m_pThreadList->count() > 0);
+	if(m_pThreadList->count() > 0)
+		return true;
+#ifdef COMPILE_PHONON_SUPPORT
+	if(m_pPhononPlayer->state() == Phonon::PlayingState)
+		return true;
+#endif //COMPILE_PHONON_SUPPORT
+	return false;
 }
 
 void KviSoundPlayer::registerSoundThread(KviSoundThread * t)
@@ -167,8 +208,9 @@ bool KviSoundPlayer::event(QEvent * e)
 void KviSoundPlayer::detectSoundSystem()
 {
 #ifdef COMPILE_PHONON_SUPPORT
-	if(!g_pPhononPlayer) g_pPhononPlayer= Phonon::createPlayer(Phonon::MusicCategory);
-	if(g_pPhononPlayer->state() != Phonon::ErrorState)
+	if(!m_pPhononPlayer)
+		m_pPhononPlayer = Phonon::createPlayer(Phonon::MusicCategory);
+	if(m_pPhononPlayer->state() != Phonon::ErrorState)
 	{
 		KVI_OPTION_STRING(KviOption_stringSoundSystem) = "phonon";
 		return;
@@ -207,24 +249,52 @@ void KviSoundPlayer::detectSoundSystem()
 #ifdef COMPILE_PHONON_SUPPORT
 bool KviSoundPlayer::playPhonon(const QString &szFileName)
 {
-	if(isMuted()) return true;
+	if(isMuted())
+		return true;
+
 	Phonon::MediaSource media(szFileName);
-        if(!g_pPhononPlayer)
-		g_pPhononPlayer= Phonon::createPlayer(Phonon::MusicCategory,media);
-	else g_pPhononPlayer->setCurrentSource(media);
-	if(g_pPhononPlayer->state()!=Phonon::ErrorState)
-        {
-                g_pPhononPlayer->play();
-        }
+
+	if(!m_pPhononPlayer)
+		m_pPhononPlayer = Phonon::createPlayer(Phonon::MusicCategory,media);
+	else
+		m_pPhononPlayer->setCurrentSource(media);
+
+	if(m_pPhononPlayer->state() == Phonon::ErrorState)
+	{
+		QString szError = m_pPhononPlayer->errorString();
+		if(szError.isEmpty())
+			qDebug("Phonon player in error state: can't play media '%s'",szFileName.isEmpty() ? "" : szFileName.toUtf8().data());
+		else
+			qDebug("Phonon player in error state: %s (can't play media '%s')",szError.toUtf8().data(),szFileName.isEmpty() ? "" : szFileName.toUtf8().data());
+
+		return false;
+	}
+
+	m_pPhononPlayer->play();
+
 	return true;
 }
+
+void KviSoundPlayer::cleanupPhonon()
+{
+	if(!m_pPhononPlayer)
+		return;
+	delete m_pPhononPlayer; // must be stopped
+	m_pPhononPlayer = NULL;
+}
 #endif //!COMPILE_PHONON_SUPPORT
+
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	bool KviSoundPlayer::playWinmm(const QString &szFileName)
 	{
 		sndPlaySound(szFileName.toLocal8Bit().data(),SND_ASYNC | SND_NODEFAULT);
 		return true;
 	}
+	
+	void KviSoundPlayer::cleanupWinmm()
+	{
+		// FIXME: how to stop playing on windows ?
+	}
 #else //!COMPILE_ON_WINDOWS
 	#ifdef COMPILE_OSS_SUPPORT
 		#ifdef COMPILE_AUDIOFILE_SUPPORT
@@ -239,6 +309,10 @@ bool KviSoundPlayer::playPhonon(const QString &szFileName)
 				}
 				return true;
 			}
+			
+			void KviSoundPlayer::cleanupOssAudiofile()
+			{
+			}
 		#endif //COMPILE_AUDIOFILE_SUPPORT
 		bool KviSoundPlayer::playOss(const QString &szFileName)
 		{
@@ -251,11 +325,16 @@ bool KviSoundPlayer::playPhonon(const QString &szFileName)
 			}
 			return true;
 		}
+
+		void KviSoundPlayer::cleanupOss()
+		{
+		}
 	#endif //COMPILE_OSS_SUPPORT
 	#ifdef COMPILE_ESD_SUPPORT
 		bool KviSoundPlayer::playEsd(const QString &szFileName)
 		{
-			if(isMuted()) return true;
+			if(isMuted())
+				return true;
 			KviEsdSoundThread * t = new KviEsdSoundThread(szFileName);
 			if(!t->start())
 			{
@@ -264,40 +343,75 @@ bool KviSoundPlayer::playPhonon(const QString &szFileName)
 			}
 			return true;
 		}
+
+		void KviSoundPlayer::cleanupEsd()
+		{
+		}
 	#endif //COMPILE_ESD_SUPPORT
 #endif //!COMPILE_ON_WINDOWS
 
 bool KviSoundPlayer::playQt(const QString &szFileName)
 {
-	if(isMuted()) return true;
+	if(isMuted())
+		return true;
 	QSound::play(szFileName);
 	return true;
 }
 
+void KviSoundPlayer::cleanupQt()
+{
+	// how to stop Qt sounds ?
+}
+
 bool KviSoundPlayer::playNull(const QString &)
 {
 	// null sound system
 	return true;
 }
 
+void KviSoundPlayer::cleanupNull()
+{
+}
+
 bool KviSoundPlayer::play(const QString &szFileName)
 {
-	if(isMuted()) return true;
-	SoundSystemRoutine * r = m_pSoundSystemDict->find(KVI_OPTION_STRING(KviOption_stringSoundSystem));
+	if(isMuted())
+		return true;
 
-	if(!r)
+	KviSoundPlayerEntry * e = m_pSoundSystemDict->find(KVI_OPTION_STRING(KviOption_stringSoundSystem));
+
+	if(!e)
 	{
-		if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringSoundSystem),"unknown"))
+		if(
+				(!KVI_OPTION_STRING(KviOption_stringSoundSystem).isEmpty()) &&
+				(!KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringSoundSystem),"unknown"))
+			)
 		{
-			detectSoundSystem();
-			r = m_pSoundSystemDict->find(KVI_OPTION_STRING(KviOption_stringSoundSystem));
-			if(!r)return false;
-		} else {
-			return false;
+			qDebug(
+					"Sound system '%s' is not valid, you may want to re-configure it in the options dialog...",
+					KVI_OPTION_STRING(KviOption_stringSoundSystem).toUtf8().data()
+				);
+			return false; // detection already attempted (and failed?)
 		}
+
+		detectSoundSystem();
+		e = m_pSoundSystemDict->find(KVI_OPTION_STRING(KviOption_stringSoundSystem));
+		if(!e)
+			return false;
+	}
+
+	if(e != m_pLastUsedSoundPlayerEntry)
+	{
+		// if the sound player changed, cleanup after the previous one
+		if(m_pLastUsedSoundPlayerEntry)
+			cleanupAfterLastPlayerEntry();
+		m_pLastUsedSoundPlayerEntry = e;
 	}
 
-	return (this->*(*r))(szFileName);
+	SoundSystemPlayRoutine r = e->playRoutine();
+	Q_ASSERT(r); // MUST BE THERE
+
+	return (this->*r)(szFileName);
 }
 
 
@@ -306,13 +420,20 @@ KviSoundThread::KviSoundThread(const QString &szFileName)
 {
 	g_pSoundPlayer->registerSoundThread(this);
 	m_szFileName = szFileName;
+	m_bTerminate = false;
 }
 
 KviSoundThread::~KviSoundThread()
 {
+	m_bTerminate = true; // force a termination request (since the base class will wait())
 	g_pSoundPlayer->unregisterSoundThread(this);
 }
 
+void KviSoundThread::terminate()
+{
+	m_bTerminate = true;
+}
+
 void KviSoundThread::play()
 {
 }
@@ -372,7 +493,7 @@ void KviSoundThread::run()
 				channelCount = afGetVirtualChannels(file, AF_DEFAULT_TRACK);
 				buffer = kvi_malloc(int(BUFFER_FRAMES * frameSize));
 
-				int audiofd_c = open("/dev/dsp", O_WRONLY | /*O_EXCL |*/ O_NDELAY);
+				int audiofd_c = open("/dev/dsp", O_WRONLY /*| O_EXCL | O_NDELAY*/);
 
 				QFile audiofd;
 
@@ -385,16 +506,18 @@ void KviSoundThread::run()
 
 				audiofd.open(audiofd_c,QIODevice::WriteOnly); // ???? what the heck is this for ?
 
-				if (sampleWidth == 8) format = AFMT_U8;
-				else if (sampleWidth == 16)format = AFMT_S16_NE;
+				if (sampleWidth == 8)
+					format = AFMT_U8;
+				else if(sampleWidth == 16)
+					format = AFMT_S16_NE;
 
-				if (ioctl(audiofd.handle(),SNDCTL_DSP_SETFMT, &format) == -1)
+				if(ioctl(audiofd.handle(),SNDCTL_DSP_SETFMT, &format) == -1)
 				{
 					debug("Could not set format width to DSP! [OSS]");
 					goto exit_thread;
 				}
 
-				if (ioctl(audiofd.handle(), SNDCTL_DSP_CHANNELS, &channelCount) == -1)
+				if (ioctl(audiofd.handle(),SNDCTL_DSP_CHANNELS, &channelCount) == -1)
 				{
 					debug("Could not set DSP channels! [OSS]");
 					goto exit_thread;
@@ -409,7 +532,7 @@ void KviSoundThread::run()
 
 				framesRead = afReadFrames(file, AF_DEFAULT_TRACK, buffer, BUFFER_FRAMES);
 
-				while(framesRead > 0)
+				while(!m_bTerminate && (framesRead > 0))
 				{
 					audiofd.write((char *)buffer,(int)(framesRead * frameSize));
 					framesRead = afReadFrames(file, AF_DEFAULT_TRACK, buffer,BUFFER_FRAMES);
@@ -437,6 +560,12 @@ void KviSoundThread::run()
 		{
 			#define OSS_BUFFER_SIZE 16384
 
+			if(!m_szFileName.endsWith(QString(".au")))
+			{
+				debug("Oss only player supports only *.au files");
+				return;
+			}
+
 			QFile f(m_szFileName);
 			int fd = -1;
 			char buf[OSS_BUFFER_SIZE];
@@ -465,7 +594,7 @@ void KviSoundThread::run()
 
 			iSize -= 24;
 
-			fd = open("/dev/audio",  O_WRONLY | /*O_EXCL |*/ O_NDELAY);
+			fd = open("/dev/audio",  O_WRONLY /* | O_EXCL | O_NDELAY*/);
 			if(fd < 0)
 			{
 				debug("Could not open device file /dev/audio!");
@@ -474,7 +603,7 @@ void KviSoundThread::run()
 			}
 
 
-			while(iSize > 0)
+			while(!m_bTerminate && (iSize > 0))
 			{
 				int iCanRead = OSS_BUFFER_SIZE - iDataLen;
 				if(iCanRead > 0)
@@ -529,7 +658,7 @@ void KviSoundThread::run()
 		void KviEsdSoundThread::play()
 		{
 			// ESD has a really nice API
-			if(!esd_play_file(NULL,m_szFileName.toUtf8().data(),1))
+			if(!esd_play_file(NULL,m_szFileName.toUtf8().data(),1)) // this is sync.. FIXME: it can't be stopped!
 				debug("Could not play sound %s! [ESD]",m_szFileName.toUtf8().data());
 		}
 
@@ -569,13 +698,15 @@ static bool snd_kvs_cmd_play(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_END(c)
 	if(szFile.isEmpty() || (!KviFileUtils::fileExists(szFile)))
 	{
-		if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs("Sound file '%Q' not found"),&szFile);
+		if(!c->hasSwitch('q',"quiet"))
+			c->warning(__tr2qs("Sound file '%Q' not found"),&szFile);
 		return true;
 	}
 
 	if(!g_pSoundPlayer->play(szFile))
 	{
-		if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs("Unable to play sound '%Q'"),&szFile);
+		if(!c->hasSwitch('q',"quiet"))
+			c->warning(__tr2qs("Unable to play sound '%Q'"),&szFile);
 	}
 
 	return true;
@@ -699,6 +830,13 @@ static bool snd_module_ctrl(KviModule *,const char * operation,void * param)
 		g_pSoundPlayer->detectSoundSystem();
 		return true;
 	}
+	if(kvi_strEqualCI(operation,"play"))
+	{
+		QString * pszFileName = (QString *)param;
+		if(pszFileName)
+			return g_pSoundPlayer->play(*pszFileName);
+		return false;
+	}
 	return false;
 }
 
diff --git a/src/modules/snd/libkvisnd.h b/src/modules/snd/libkvisnd.h
index 4535bc359..762d0ec3a 100644
--- a/src/modules/snd/libkvisnd.h
+++ b/src/modules/snd/libkvisnd.h
@@ -36,98 +36,21 @@
 
 class KviSoundPlayer;
 
-//class KviWavSoundFileReader
-//{
-//public:
-//	KviWavSoundFileReader(QFile * f);
-//	~KviWavSoundFileReader();
-//protected:
-//	QFile * m_pFile;
-//public:
-//	static bool recognize(KviFile * f);
-//	bool readHeader();
-//};
-
-
-//bool KviWavSoundFileReader::recognize(KviFile * f)
-//{
-//	kvi_u32_t tag;
-//	if(!f->load(tag))return false;
-//
-//	f->at(0);
-//}
-
-//bool KviWavSoundFileReader::readHeader()
-//{
-//
-//
-//    tag = get_le32(pb);
-//
-//    if (tag != MKTAG('R', 'I', 'F', 'F'))
-//        return -1;
-//    get_le32(pb); /* file size */
-//    tag = get_le32(pb);
-//    if (tag != MKTAG('W', 'A', 'V', 'E'))
-//        return -1;
-//
-//    size = find_tag(pb, MKTAG('f', 'm', 't', ' '));
-//    if (size < 0)
-//        return -1;
-//    id = get_le16(pb);
-//    channels = get_le16(pb);
-//    rate = get_le32(pb);
-//    bit_rate = get_le32(pb) * 8;
-//    get_le16(pb); /* block align */
-//    get_le16(pb); /* bits per sample */
-//    if (size >= 18) {
-//        /* wav_extra_size */
-//        extra_size = get_le16(pb);
-//        /* skip unused data */
-//        url_fseek(pb, size - 18, SEEK_CUR);
-//    }
-//
-//    size = find_tag(pb, MKTAG('d', 'a', 't', 'a'));
-//    if (size < 0)
-//        return -1;
-//
-//    /* now we are ready: build format streams */
-//    st = malloc(sizeof(AVStream));
-//    if (!st)
-//        return -1;
-//    s->nb_streams = 1;
-//    s->streams[0] = st;
-//
-//    st->id = 0;
-//
-//    st->codec.codec_type = CODEC_TYPE_AUDIO;
-//    st->codec.codec_tag = id;
-//    st->codec.codec_id = codec_get_id(codec_wav_tags, id);
-//    st->codec.channels = channels;
-//    st->codec.sample_rate = rate;
-//}
-
 class KviSoundThread : public KviThread
 {
 public:
 	KviSoundThread(const QString &szFileName);
 	virtual ~KviSoundThread();
 protected:
+	bool m_bTerminate;
 	QString m_szFileName;
+public:
+	void terminate();
 protected:
 	virtual void play();
 	virtual void run();
 };
 
-#ifdef COMPILE_PHONON_SUPPORT
-class KviPhononSoundThread : public KviSoundThread
-{
-	public:
-		KviPhononSoundThread(const QString &szFileName);
-		virtual ~KviPhononSoundThread();
-	protected:
-		virtual void play();
-};
-#endif
 
 #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
 	#ifdef COMPILE_OSS_SUPPORT
@@ -176,7 +99,38 @@ class KviPhononSoundThread : public KviSoundThread
 #endif //!COMPILE_ON_WINDOWS
 
 
-typedef bool (KviSoundPlayer::*SoundSystemRoutine)(const QString &szFileName);
+#ifdef COMPILE_PHONON_SUPPORT
+namespace Phonon
+{
+	class MediaObject;
+}
+#endif //!COMPILE_PHONON_SUPPORT
+
+typedef bool (KviSoundPlayer::*SoundSystemPlayRoutine)(const QString &szFileName);
+typedef void (KviSoundPlayer::*SoundSystemCleanupRoutine)();
+
+class KviSoundPlayerEntry
+{
+private:
+	SoundSystemPlayRoutine m_pPlayRoutine;
+	SoundSystemCleanupRoutine m_pCleanupRoutine;
+public:
+	KviSoundPlayerEntry(SoundSystemPlayRoutine pPlayRoutine,SoundSystemCleanupRoutine pCleanupRoutine)
+		: m_pPlayRoutine(pPlayRoutine), m_pCleanupRoutine(pCleanupRoutine)
+	{
+	}
+
+	SoundSystemPlayRoutine playRoutine()
+	{
+		return m_pPlayRoutine;
+	}
+	
+	SoundSystemCleanupRoutine cleanupRoutine()
+	{
+		return m_pCleanupRoutine;
+	}
+	
+};
 
 class KviSoundPlayer : public QObject
 {
@@ -189,39 +143,58 @@ public:
 	bool play(const QString &szFileName);
 	void detectSoundSystem();
 	bool havePlayingSounds();
-	//void getAvailableSoundSystems(KviPointerList<QString> * l);
 	void getAvailableSoundSystems(QStringList * l);
-	bool isMuted() {return KVI_OPTION_BOOL(KviOption_boolMuteAllSounds); };
-	void setMuted(bool muted) {KVI_OPTION_BOOL(KviOption_boolMuteAllSounds)=muted;};
+	bool isMuted()
+	{
+		return KVI_OPTION_BOOL(KviOption_boolMuteAllSounds);
+	}
+	void setMuted(bool muted)
+	{
+		KVI_OPTION_BOOL(KviOption_boolMuteAllSounds) = muted;
+	}
 protected:
 	KviPointerList<KviSoundThread> * m_pThreadList;
-	KviPointerHashTable<QString,SoundSystemRoutine> * m_pSoundSystemDict;
+	KviPointerHashTable<QString,KviSoundPlayerEntry> * m_pSoundSystemDict;
+#ifdef COMPILE_PHONON_SUPPORT
+	Phonon::MediaObject * m_pPhononPlayer;
+#endif //!COMPILE_PHONON_SUPPORT
+	KviSoundPlayerEntry * m_pLastUsedSoundPlayerEntry;
 protected:
 	void registerSoundThread(KviSoundThread * t);
 	void unregisterSoundThread(KviSoundThread * t);
 	virtual bool event(QEvent *e);
 protected:
+	void stopAllSoundThreads();
+	void cleanupAfterLastPlayerEntry();
 #ifdef COMPILE_PHONON_SUPPORT
 	bool playPhonon(const QString &szFileName);
+	void cleanupPhonon();
 #endif //!COMPILE_PHONON_SUPPORT
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	bool playWinmm(const QString &szFileName);
+	void cleanupWinmm();
 #else //!COMPILE_ON_WINDOWS
 	#ifdef COMPILE_OSS_SUPPORT
 		bool playOss(const QString &szFileName);
+		void cleanupOss();
 		#ifdef COMPILE_AUDIOFILE_SUPPORT
 			bool playOssAudiofile(const QString &szFileName);
+			void cleanupOssAudiofile();
 		#endif //COMPILE_AUDIOFILE_SUPPORT
 	#endif //COMPILE_OSS_SUPPORT
 	#ifdef COMPILE_ARTS_SUPPORT
 		bool playArts(const QString &szFileName);
+		void cleanupArts();
 	#endif //COMPILE_ARTS_SUPPORT
 	#ifdef COMPILE_ESD_SUPPORT
 		bool playEsd(const QString &szFileName);
+		void cleanupEsd();
 	#endif //COMPILE_ESD_SUPPORT
 #endif //!COMPILE_ON_WINDOWS
 	bool playQt(const QString &szFileName);
+	void cleanupQt();
 	bool playNull(const QString &szFileName);
+	void cleanupNull();
 };