[Scummvm-cvs-logs] SF.net SVN: scummvm: [24374] scummvm/trunk/sound/mods

[lordhoto at users.sourceforge.net]

Revision: 24374
          http://svn.sourceforge.net/scummvm/?rev=24374&view=rev
Author:   lordhoto
Date:     2006-10-18 11:34:40 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
some cleanup.

Modified Paths:
--------------
    scummvm/trunk/sound/mods/module.cpp
    scummvm/trunk/sound/mods/module.h
    scummvm/trunk/sound/mods/protracker.cpp
    scummvm/trunk/sound/mods/protracker.h

Modified: scummvm/trunk/sound/mods/module.cpp
===================================================================
--- scummvm/trunk/sound/mods/module.cpp	2006-10-18 15:55:10 UTC (rev 24373)
+++ scummvm/trunk/sound/mods/module.cpp	2006-10-18 18:34:40 UTC (rev 24374)
@@ -161,9 +161,9 @@
 }
 
 Module::Module() {
-	pattern = NULL;
+	pattern = 0;
 	for (int i = 0; i < 31; ++i) {
-		sample[i].data = NULL;
+		sample[i].data = 0;
 	}
 }
 

Modified: scummvm/trunk/sound/mods/module.h
===================================================================
--- scummvm/trunk/sound/mods/module.h	2006-10-18 15:55:10 UTC (rev 24373)
+++ scummvm/trunk/sound/mods/module.h	2006-10-18 18:34:40 UTC (rev 24374)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef __SOUND_MODS_MODULE_H__
-#define __SOUND_MODS_MODULE_H__
+#ifndef SOUND_MODS_MODULE_H
+#define SOUND_MODS_MODULE_H
 
 namespace Modules {
 
@@ -34,15 +34,15 @@
  * like they are in the file.
  */
 
-typedef struct {
+struct note_t {
 	byte sample;
 	uint16 period;
 	uint16 effect;
-} note_t;
+};
 
 typedef note_t pattern_t[64][4];
 
-typedef struct {
+struct sample_t {
 	byte name[23];
 	uint16 len;
 	byte finetune;
@@ -50,7 +50,7 @@
 	uint16 repeat;
 	uint16 replen;
 	byte *data;
-} sample_t;
+};
 
 class Module {
 public:

Modified: scummvm/trunk/sound/mods/protracker.cpp
===================================================================
--- scummvm/trunk/sound/mods/protracker.cpp	2006-10-18 15:55:10 UTC (rev 24373)
+++ scummvm/trunk/sound/mods/protracker.cpp	2006-10-18 18:34:40 UTC (rev 24374)
@@ -106,7 +106,7 @@
 			static bool did_warn_about_finetune = false;
 			if (!did_warn_about_finetune && _module->sample[sample].finetune != 0) {
 				did_warn_about_finetune = true;
-				puts("Warning! Finetuning not implemented!");
+				warning("Finetuning not implemented!");
 			}
 
 			if (_module->sample[sample].replen > 2) {

Modified: scummvm/trunk/sound/mods/protracker.h
===================================================================
--- scummvm/trunk/sound/mods/protracker.h	2006-10-18 15:55:10 UTC (rev 24373)
+++ scummvm/trunk/sound/mods/protracker.h	2006-10-18 18:34:40 UTC (rev 24374)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef __SOUND_MODS_PROTRACKER_H__
-#define __SOUND_MODS_PROTRACKER_H__
+#ifndef SOUND_MODS_PROTRACKER_H
+#define SOUND_MODS_PROTRACKER_H
 
 #include "common/stdafx.h"
 #include "common/system.h"
@@ -32,7 +32,7 @@
 namespace Modules {
 
 class SoundBuffer {
-      private:
+private:
 	int _capacity;
 	int _size;
 	int16 *_data;
@@ -82,6 +82,7 @@
 };
 
 class ProtrackerPlayer {
+private:
 	OSystem *_system;
 	Module *_module;
 
@@ -129,7 +130,7 @@
 	} _track[4];
 
 public:
-	ProtrackerPlayer() : _system(NULL), _module(NULL) { };
+	ProtrackerPlayer() : _system(0), _module(0) { };
 
 	void init(OSystem *system);
 


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