From b4c689a3c1fbf74e6286c320cfcd820a72745f57 Mon Sep 17 00:00:00 2001
From: Norbert Lange
Date: Sun, 9 Aug 2009 18:59:22 +0000
Subject: fixed up some missing newlines removed MSVC6 disable pragmas, the
 warnings are already disabled in the project files

svn-id: r43182
---
 sound/mods/maxtrax.cpp | 3 ++-
 sound/mods/paula.cpp   | 2 +-
 sound/mods/paula.h     | 4 +++-
 sound/mods/tfmx.cpp    | 1 -
 4 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'sound')

diff --git a/sound/mods/maxtrax.cpp b/sound/mods/maxtrax.cpp
index 80765913b3..17cf211c14 100644
--- a/sound/mods/maxtrax.cpp
+++ b/sound/mods/maxtrax.cpp
@@ -22,6 +22,7 @@
  * $Id$
  *
  */
+
 #include "common/scummsys.h"
 #include "common/endian.h"
 #include "common/stream.h"
@@ -977,4 +978,4 @@ void MaxTrax::outPutScore(const Score &sc, int num) {}
 
 }	// End of namespace Audio
 
-#endif // #if defined(SOUND_MODS_MAXTRAX_H)
\ No newline at end of file
+#endif // #if defined(SOUND_MODS_MAXTRAX_H)
diff --git a/sound/mods/paula.cpp b/sound/mods/paula.cpp
index e7a916f218..1f557e0ece 100644
--- a/sound/mods/paula.cpp
+++ b/sound/mods/paula.cpp
@@ -28,7 +28,7 @@
 namespace Audio {
 
 Paula::Paula(bool stereo, int rate, uint interruptFreq) :
-		_stereo(stereo), _rate(rate), _periodScale((kPalSystemClock / 2.0) / rate), _intFreq(interruptFreq) {
+		_stereo(stereo), _rate(rate), _periodScale((double)kPalPaulaClock / rate), _intFreq(interruptFreq) {
 
 	clearVoices();
 	_voice[0].panning = 191;
diff --git a/sound/mods/paula.h b/sound/mods/paula.h
index 72432395d6..647dc5fe56 100644
--- a/sound/mods/paula.h
+++ b/sound/mods/paula.h
@@ -44,7 +44,9 @@ public:
 		kPalSystemClock  = 7093790,
 		kNtscSystemClock = 7159090,
 		kPalCiaClock     = kPalSystemClock / 10,
-		kNtscCiaClock    = kNtscSystemClock / 10
+		kNtscCiaClock    = kNtscSystemClock / 10,
+		kPalPaulaClock   = kPalSystemClock / 2,
+		kNtscPauleClock  = kNtscSystemClock / 2
 	};
 
 	Paula(bool stereo = false, int rate = 44100, uint interruptFreq = 0);
diff --git a/sound/mods/tfmx.cpp b/sound/mods/tfmx.cpp
index eda536ba34..419dc34bef 100644
--- a/sound/mods/tfmx.cpp
+++ b/sound/mods/tfmx.cpp
@@ -1179,4 +1179,3 @@ void displayPatternstep(const void *const vptr) {}
 }	// End of namespace
 
 #endif // #if defined(SOUND_MODS_TFMX_H)
-
-- 
cgit v1.2.3