[Scummvm-cvs-logs] SF.net SVN: scummvm:[38231] scummvm/trunk/engines/sci

[sev at users.sourceforge.net]

Revision: 38231
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38231&view=rev
Author:   sev
Date:     2009-02-15 12:23:54 +0000 (Sun, 15 Feb 2009)

Log Message:
-----------
Make MSVC happy and rename timer/scummvm.cpp to timer/timer_scummvm.cpp

Modified Paths:
--------------
    scummvm/trunk/engines/sci/module.mk

Added Paths:
-----------
    scummvm/trunk/engines/sci/sfx/timer/timer_scummvm.cpp

Removed Paths:
-------------
    scummvm/trunk/engines/sci/sfx/timer/scummvm.cpp

Modified: scummvm/trunk/engines/sci/module.mk
===================================================================
--- scummvm/trunk/engines/sci/module.mk	2009-02-15 12:23:16 UTC (rev 38230)
+++ scummvm/trunk/engines/sci/module.mk	2009-02-15 12:23:54 UTC (rev 38231)
@@ -88,7 +88,7 @@
 	sfx/softseq/pcspeaker.o \
 	sfx/softseq/SN76496.o \
 	sfx/softseq/softsequencers.o \
-	sfx/timer/scummvm.o \
+	sfx/timer/timer_scummvm.o \
 	sfx/timer/timers.o
 
 # FIXME: The following is supposed to be a set of *temporary* hacks

Deleted: scummvm/trunk/engines/sci/sfx/timer/scummvm.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/timer/scummvm.cpp	2009-02-15 12:23:16 UTC (rev 38230)
+++ scummvm/trunk/engines/sci/sfx/timer/scummvm.cpp	2009-02-15 12:23:54 UTC (rev 38231)
@@ -1,52 +0,0 @@
-#include "common/timer.h"
-#include "engines/engine.h"
-#include "sci/include/sfx_timer.h"
-
-
-#define FREQ 60
-#define DELAY (1000000 / FREQ)
-
-typedef void (*scummvm_timer_callback_t)(void *);
-static scummvm_timer_callback_t scummvm_timer_callback = NULL;
-static void *scummvm_timer_callback_data = NULL;
-extern ::Engine *g_engine;
-
-void scummvm_timer_update_internal(void *ptr) {
-	if (scummvm_timer_callback)
-		scummvm_timer_callback(scummvm_timer_callback_data);
-}
-
-int scummvm_timer_start(void (*func)(void *), void *data) {
-	if (scummvm_timer_callback) {
-		fprintf(stderr,
-				"Error: Attempt to initialize gametick timer more than once\n");
-		return SFX_ERROR;
-	}
-
-	if (!func) {
-		fprintf(stderr,
-				"Error: Attempt to initialize gametick timer w/o callback\n");
-		return SFX_ERROR;
-	}
-
-	scummvm_timer_callback = func;
-	scummvm_timer_callback_data = data;
-
-	::g_engine->getTimerManager()->installTimerProc(&scummvm_timer_update_internal, DELAY, NULL);
-	return SFX_OK;
-}
-
-int scummvm_timer_stop() {
-	scummvm_timer_callback = NULL;
-	return SFX_OK;
-}
-
-
-sfx_timer_t sfx_timer_scummvm = {
-	"ScummVM",
-	"0.1",
-	DELAY/1000, 0,
-	NULL,
-	&scummvm_timer_start,
-	&scummvm_timer_stop
-	};

Copied: scummvm/trunk/engines/sci/sfx/timer/timer_scummvm.cpp (from rev 38224, scummvm/trunk/engines/sci/sfx/timer/scummvm.cpp)
===================================================================
--- scummvm/trunk/engines/sci/sfx/timer/timer_scummvm.cpp	                        (rev 0)
+++ scummvm/trunk/engines/sci/sfx/timer/timer_scummvm.cpp	2009-02-15 12:23:54 UTC (rev 38231)
@@ -0,0 +1,52 @@
+#include "common/timer.h"
+#include "engines/engine.h"
+#include "sci/include/sfx_timer.h"
+
+
+#define FREQ 60
+#define DELAY (1000000 / FREQ)
+
+typedef void (*scummvm_timer_callback_t)(void *);
+static scummvm_timer_callback_t scummvm_timer_callback = NULL;
+static void *scummvm_timer_callback_data = NULL;
+extern ::Engine *g_engine;
+
+void scummvm_timer_update_internal(void *ptr) {
+	if (scummvm_timer_callback)
+		scummvm_timer_callback(scummvm_timer_callback_data);
+}
+
+int scummvm_timer_start(void (*func)(void *), void *data) {
+	if (scummvm_timer_callback) {
+		fprintf(stderr,
+				"Error: Attempt to initialize gametick timer more than once\n");
+		return SFX_ERROR;
+	}
+
+	if (!func) {
+		fprintf(stderr,
+				"Error: Attempt to initialize gametick timer w/o callback\n");
+		return SFX_ERROR;
+	}
+
+	scummvm_timer_callback = func;
+	scummvm_timer_callback_data = data;
+
+	::g_engine->getTimerManager()->installTimerProc(&scummvm_timer_update_internal, DELAY, NULL);
+	return SFX_OK;
+}
+
+int scummvm_timer_stop() {
+	scummvm_timer_callback = NULL;
+	return SFX_OK;
+}
+
+
+sfx_timer_t sfx_timer_scummvm = {
+	"ScummVM",
+	"0.1",
+	DELAY/1000, 0,
+	NULL,
+	&scummvm_timer_start,
+	&scummvm_timer_stop
+	};


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.