- Updated MSVC8 project files

- Renamed base/options.cpp to base/commandLine.cpp because of conflict
  with gui/options.cpp which sit in same directory in MSVC builds
- Moved AudioCDManager singleton declaration outside of Audio namespace
- Fixed numerous MSVC warning of potentially uninitialized variables and
  int <-> bool conversions.

svn-id: r22397

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/audiocd.cpp b/sound/audiocd.cpp
index 1487f4491a..15b16b5e45 100644
--- a/sound/audiocd.cpp
+++ b/sound/audiocd.cpp
@@ -31,6 +31,8 @@
 #include "common/util.h"
 #include "common/system.h"
 
+DECLARE_SINGLETON(Audio::AudioCDManager);
+
 namespace Audio {
 
 struct TrackFormat {
@@ -61,8 +63,6 @@ static const TrackFormat TRACK_FORMATS[] = {
 };
 
 
-DECLARE_SINGLETON(AudioCDManager);
-
 AudioCDManager::AudioCDManager() {
 	memset(&_cd, 0, sizeof(_cd));
 	memset(_cachedTracks, 0, sizeof(_cachedTracks));