[Scummvm-cvs-logs] SF.net SVN: scummvm: [25418] scummvm/trunk/engines/parallaction/music.cpp

[peres001 at users.sourceforge.net]

Revision: 25418
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25418&view=rev
Author:   peres001
Date:     2007-02-07 12:28:59 -0800 (Wed, 07 Feb 2007)

Log Message:
-----------
changed multiplexed uint32 to const void* to avoid errors on 64 bits systems

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/music.cpp

Modified: scummvm/trunk/engines/parallaction/music.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/music.cpp	2007-02-07 19:51:19 UTC (rev 25417)
+++ scummvm/trunk/engines/parallaction/music.cpp	2007-02-07 20:28:59 UTC (rev 25418)
@@ -39,7 +39,7 @@
 
 // TODO
 // move this into a proper midi driver and decode the numeric commands
-void _music_command(int32, int32, int32, int32) {
+void _music_command(const void*, const void*, const void*, const void*) {
 
 }
 
@@ -49,8 +49,8 @@
 	if (_playing == false) return;
 	if (_allocated == false) return;
 
-	_music_command(4, 0, 0, 0);     // stop
-	_music_command(5, 0, 0, 0);     // reset timer
+	_music_command((const void*)4, (const void*)0, (const void*)0, (const void*)0);     // stop
+	_music_command((const void*)5, (const void*)0, (const void*)0, (const void*)0);     // reset timer
 
 	memFree(_musicBits);
 
@@ -67,12 +67,12 @@
 	if (_allocated == false) return;
 
 	_music_command(0, 0, 0, 0);     // init driver
-	_music_command(1, 0, 0, 0);     // init timer
-	_music_command(17, 1, 0, 0);    // set source segment
-	_music_command(7, 1, 0, 0);     // set source offset and do SOMETHING
+	_music_command((const void*)1, 0, 0, 0);     // init timer
+	_music_command((const void*)17, (const void*)1, 0, 0);    // set source segment
+	_music_command((const void*)7, (const void*)1, 0, 0);     // set source offset and do SOMETHING
 
 	// FIXME: casting pointer to uint32
-	_music_command(2, (uint32)_musicBits, 0, 0);    // play
+	_music_command((const void*)2, (const void*)_musicBits, 0, 0);    // play
 
 	_playing = true;
 


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