[Scummvm-cvs-logs] SF.net SVN: scummvm:[43074] scummvm/branches/gsoc2009-mods/sound/mods

nolange at users.sourceforge.net nolange at users.sourceforge.net
Wed Aug 5 20:13:43 CEST 2009


Revision: 43074
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43074&view=rev
Author:   nolange
Date:     2009-08-05 18:13:42 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
fixed wrong indentation
moved notetable to static scope

Modified Paths:
--------------
    scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp
    scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h

Modified: scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp	2009-08-05 18:00:13 UTC (rev 43073)
+++ scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp	2009-08-05 18:13:42 UTC (rev 43074)
@@ -38,18 +38,18 @@
 namespace {
 	void displayPatternstep(const void *const vptr);
 	void displayMacroStep(const void *const vptr);
-}
 
-namespace Audio {
-
-const uint16 Tfmx::noteIntervalls[64] = {
+	const uint16 noteIntervalls[64] = {
 	1710, 1614, 1524, 1438, 1357, 1281, 1209, 1141, 1077, 1017,  960,  908,
 	 856,  810,  764,  720,  680,  642,  606,  571,  539,  509,  480,  454,
 	 428,  404,  381,  360,  340,  320,  303,  286,  270,  254,  240,  227,
 	 214,  202,  191,  180,  170,  160,  151,  143,  135,  127,  120,  113,
 	 214,  202,  191,  180,  170,  160,  151,  143,  135,  127,  120,  113,
 	 214,  202,  191,  180 };
+}
 
+namespace Audio {
+
 Tfmx::Tfmx(int rate, bool stereo)
 	: Paula(stereo, rate), 
 	  _resource(), 

Modified: scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h	2009-08-05 18:00:13 UTC (rev 43073)
+++ scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h	2009-08-05 18:13:42 UTC (rev 43074)
@@ -83,7 +83,6 @@
 private:
 	enum { kPalDefaultCiaVal = 11822, kNtscDefaultCiaVal = 14320, kCiaBaseInterval = 0x1B51F8 };
 	enum { kNumVoices = 4, kNumChannels = 8, kNumSubsongs = 32, kMaxPatternOffsets = 128, kMaxMacroOffsets = 128 };
-	static const uint16 noteIntervalls[64];
 
 	struct MdatResource {
 		const byte *mdatAlloc;	//!< allocated Block of Memory


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




More information about the Scummvm-git-logs mailing list