Merge remote-tracking branch 'origin/master' into soltys_wip2

4 files changed, 217 insertions, 3 deletions

diff --git a/backends/timer/bada/timer.cpp b/backends/timer/bada/timer.cpp
new file mode 100755
index 0000000000..8f5620401f
--- /dev/null
+++ b/backends/timer/bada/timer.cpp
@@ -0,0 +1,115 @@
+/* ScummVM - Graphic Adventure Engine

+ *

+ * ScummVM is the legal property of its developers, whose names

+ * are too numerous to list here. Please refer to the COPYRIGHT

+ * file distributed with this source distribution.

+ *

+ * This program is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU General Public License

+ * as published by the Free Software Foundation; either version 2

+ * of the License, or (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

+ *

+ */

+

+#if defined (BADA)

+

+#include "backends/timer/bada/timer.h"

+

+//

+// TimerSlot

+//

+TimerSlot::TimerSlot(Common::TimerManager::TimerProc callback,

+										 uint32 interval, void *refCon) :

+	_timer(0),

+	_callback(callback),

+	_interval(interval),

+	_refCon(refCon) {

+}

+

+TimerSlot::~TimerSlot() {

+}

+

+bool TimerSlot::OnStart() {

+	_timer = new Osp::Base::Runtime::Timer();

+	if (!_timer || IsFailed(_timer->Construct(*this))) {

+		AppLog("Failed to create timer");

+		return false;

+	}

+

+	if (IsFailed(_timer->Start(_interval))) {

+		AppLog("failed to start timer");

+		return false;

+	}

+	

+	AppLog("started timer %d", _interval);

+	return true;

+}

+

+void TimerSlot::OnStop() {

+	AppLog("timer stopped");

+	if (_timer) {

+		_timer->Cancel();		 

+		delete _timer;

+		_timer = NULL;

+	}

+}

+

+void TimerSlot::OnTimerExpired(Timer &timer) {

+	_callback(_refCon);

+	timer.Start(_interval);

+}

+

+//

+// BadaTimerManager

+//

+BadaTimerManager::BadaTimerManager() {

+}

+

+BadaTimerManager::~BadaTimerManager() {

+	for (Common::List<TimerSlot>::iterator slot = _timers.begin();

+			 slot != _timers.end(); ++slot) {

+		slot->Stop();

+		slot = _timers.erase(slot);

+	}

+}

+

+bool BadaTimerManager::installTimerProc(TimerProc proc, int32 interval, void *refCon,

+																				const Common::String &id) {

+	TimerSlot *slot = new TimerSlot(proc, interval / 1000, refCon);

+

+	if (IsFailed(slot->Construct(THREAD_TYPE_EVENT_DRIVEN))) {

+		AppLog("Failed to create timer thread");

+		delete slot;

+		return false;

+	}

+

+	if (IsFailed(slot->Start())) {

+		delete slot;

+		AppLog("Failed to start timer thread");

+		return false;

+	}

+

+	_timers.push_back(*slot);

+	return true;

+}

+

+void BadaTimerManager::removeTimerProc(TimerProc proc) {

+	for (Common::List<TimerSlot>::iterator slot = _timers.begin();

+			 slot != _timers.end(); ++slot) {

+		if (slot->_callback == proc) {

+			slot->Stop();

+			slot = _timers.erase(slot);

+		}

+	}

+}

+

+#endif

diff --git a/backends/timer/bada/timer.h b/backends/timer/bada/timer.h
new file mode 100755
index 0000000000..04ca771c26
--- /dev/null
+++ b/backends/timer/bada/timer.h
@@ -0,0 +1,62 @@
+/* ScummVM - Graphic Adventure Engine

+ *

+ * ScummVM is the legal property of its developers, whose names

+ * are too numerous to list here. Please refer to the COPYRIGHT

+ * file distributed with this source distribution.

+ *

+ * This program is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU General Public License

+ * as published by the Free Software Foundation; either version 2

+ * of the License, or (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

+ *

+ */

+

+#ifndef BADA_TIMER_H

+#define BADA_TIMER_H

+

+#include <FBase.h>

+

+#include "common/timer.h"

+#include "common/list.h"

+

+using namespace Osp::Base::Runtime;

+

+struct TimerSlot: public ITimerEventListener, public Thread {

+	TimerSlot(Common::TimerManager::TimerProc callback,

+						uint32 interval,

+						void *refCon);

+	~TimerSlot();

+

+	bool OnStart(void);

+	void OnStop(void);

+	void OnTimerExpired(Timer &timer);

+

+	Timer *_timer;

+	Common::TimerManager::TimerProc _callback;

+	uint32 _interval;	// in microseconds

+	void *_refCon;

+};

+

+class BadaTimerManager : public Common::TimerManager {

+public:

+	BadaTimerManager();

+	~BadaTimerManager();

+

+	bool installTimerProc(TimerProc proc, int32 interval, void *refCon, 

+												const Common::String &id);

+	void removeTimerProc(TimerProc proc);

+

+private:

+	Common::List<TimerSlot> _timers;

+};

+

+#endif

diff --git a/backends/timer/default/default-timer.cpp b/backends/timer/default/default-timer.cpp
index 8480fcc7ee..e1aadb62b8 100644
--- a/backends/timer/default/default-timer.cpp
+++ b/backends/timer/default/default-timer.cpp
@@ -24,10 +24,10 @@
 #include "common/util.h"
 #include "common/system.h"
 
-
 struct TimerSlot {
 	Common::TimerManager::TimerProc callback;
 	void *refCon;
+	Common::String id;
 	uint32 interval;	// in microseconds
 
 	uint32 nextFireTime;	// in milliseconds
@@ -109,13 +109,28 @@ void DefaultTimerManager::handler() {
 	}
 }
 
-bool DefaultTimerManager::installTimerProc(TimerProc callback, int32 interval, void *refCon) {
+bool DefaultTimerManager::installTimerProc(TimerProc callback, int32 interval, void *refCon, const Common::String &id) {
 	assert(interval > 0);
 	Common::StackLock lock(_mutex);
 
+	if (_callbacks.contains(id)) {
+		if (_callbacks[id] != callback) {
+			error("Different callbacks are referred by same name (%s)", id.c_str());
+		}
+	}
+	TimerSlotMap::const_iterator i;
+
+	for (i = _callbacks.begin(); i != _callbacks.end(); ++i) {
+		if (i->_value == callback) {
+			error("Same callback is referred by different names (%s vs %s)", i->_key.c_str(), id.c_str());
+		}
+	}
+	_callbacks[id] = callback;
+
 	TimerSlot *slot = new TimerSlot;
 	slot->callback = callback;
 	slot->refCon = refCon;
+	slot->id = id;
 	slot->interval = interval;
 	slot->nextFireTime = g_system->getMillis() + interval / 1000;
 	slot->nextFireTimeMicro = interval % 1000;
@@ -146,4 +161,21 @@ void DefaultTimerManager::removeTimerProc(TimerProc callback) {
 			slot = slot->next;
 		}
 	}
+
+	// We need to remove all names referencing the timer proc here.
+	// 
+	// Else we run into troubles, when the client code removes and readds timer
+	// callbacks.
+	//
+	// Another issues occurs when one plays a game with ALSA as music driver,
+	// does RTL and starts a different engine game with ALSA as music driver.
+	// In this case the MPU401 code will add different timer procs with the
+	// same name, resulting in two different callbacks added with the same
+	// name and causing installTimerProc to error out.
+	// A good test case is running a SCUMM with ALSA output and then a KYRA
+	// game for example.
+	for (TimerSlotMap::iterator i = _callbacks.begin(), end = _callbacks.end(); i != end; ++i) {
+		if (i->_value == callback)
+			_callbacks.erase(i);
+	}
 }
diff --git a/backends/timer/default/default-timer.h b/backends/timer/default/default-timer.h
index 66d2e3b091..e5a9dada79 100644
--- a/backends/timer/default/default-timer.h
+++ b/backends/timer/default/default-timer.h
@@ -22,6 +22,8 @@
 #ifndef BACKENDS_TIMER_DEFAULT_H
 #define BACKENDS_TIMER_DEFAULT_H
 
+#include "common/str.h"
+#include "common/hash-str.h"
 #include "common/timer.h"
 #include "common/mutex.h"
 
@@ -29,14 +31,17 @@ struct TimerSlot;
 
 class DefaultTimerManager : public Common::TimerManager {
 private:
+	typedef Common::HashMap<Common::String, TimerProc, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> TimerSlotMap;
+
 	Common::Mutex _mutex;
 	void *_timerHandler;
 	TimerSlot *_head;
+	TimerSlotMap _callbacks;
 
 public:
 	DefaultTimerManager();
 	virtual ~DefaultTimerManager();
-	virtual bool installTimerProc(TimerProc proc, int32 interval, void *refCon);
+	virtual bool installTimerProc(TimerProc proc, int32 interval, void *refCon, const Common::String &id);
 	virtual void removeTimerProc(TimerProc proc);
 
 	/**