issue #168

natural-law · natural-law · commit 7df52f2463e1 · 2010-10-11T08:21:20.000Z
diff --git a/CocosDenshion/CocosDenshion.vcproj b/CocosDenshion/CocosDenshion.vcproj
@@ -49,7 +49,6 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4251"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/CocosDenshion/SimpleAudioEngine/SimpleAudioEngine.cpp b/CocosDenshion/SimpleAudioEngine/SimpleAudioEngine.cpp
@@ -23,7 +23,8 @@ SimpleAudioEngine::SimpleAudioEngine()
 , m_bWillPlayBackgroundMusic(false)
 , m_pEffects(NULL)
 {
-    m_EffectPlayers.resize(0);
+    //m_pEffectPlayers->resize(0);
+    m_pEffectPlayers = new PlayerArray();
 }
 
 SimpleAudioEngine::~SimpleAudioEngine()
@@ -100,7 +101,7 @@ void SimpleAudioEngine::SetEffectsVolume(int volume)
 {
     PlayerArrayIterator iter;
 
-    for (iter = m_EffectPlayers.begin(); iter != m_EffectPlayers.end(); ++iter)
+    for (iter = m_pEffectPlayers->begin(); iter != m_pEffectPlayers->end(); ++iter)
     {
         if (*iter)
         {
@@ -220,9 +221,9 @@ void SimpleAudioEngine::playPreloadedEffect(int nSoundId)
         SoundPlayer* pPlayer = pElement->pPlayer;
         if (!pPlayer)
         {
-            // find the not playing player in m_EffectPlayers
+            // find the not playing player in m_pEffectPlayers
             PlayerArrayIterator iter;
-            for (iter = m_EffectPlayers.begin(); iter != m_EffectPlayers.end(); ++iter)
+            for (iter = m_pEffectPlayers->begin(); iter != m_pEffectPlayers->end(); ++iter)
             {
                 if ((*iter) && !(*iter)->IsPlaying())
                 {
@@ -235,7 +236,7 @@ void SimpleAudioEngine::playPreloadedEffect(int nSoundId)
             if (!pPlayer)
             {
                 pPlayer = new SoundPlayer();
-                m_EffectPlayers.push_back(pPlayer);
+                m_pEffectPlayers->push_back(pPlayer);
 
                 // set the player volume
                 pPlayer->SetVolumeValue(m_nEffectsVolume);
@@ -262,13 +263,14 @@ void SimpleAudioEngine::removeAllEffectPlayers()
 {
     PlayerArrayIterator iter;
 
-    for (iter = m_EffectPlayers.begin(); iter != m_EffectPlayers.end(); ++iter)
+    for (iter = m_pEffectPlayers->begin(); iter != m_pEffectPlayers->end(); ++iter)
     {
         if (*iter)
         {
             delete *iter;
         }
     }
 
-    m_EffectPlayers.clear();
+    m_pEffectPlayers->clear();
+    delete m_pEffectPlayers;
 }
diff --git a/CocosDenshion/SimpleAudioEngine/SimpleAudioEngine.h b/CocosDenshion/SimpleAudioEngine/SimpleAudioEngine.h
@@ -102,7 +102,7 @@ class EXPORT_DLL SimpleAudioEngine
     bool    m_bWillPlayBackgroundMusic;
 
     SoundPlayer m_obBackPlayer;
-    PlayerArray m_EffectPlayers;
+    PlayerArray* m_pEffectPlayers;
 
     // use hash map to save the effects loaded
     typedef struct _hashElement
diff --git a/TestAudioEngine/TestAudioEngine.vcproj b/TestAudioEngine/TestAudioEngine.vcproj
@@ -50,7 +50,6 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4251"
 				ForcedIncludeFiles=""
 			/>
 			<Tool
@@ -97,7 +96,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="mkdir d:\Work7\NEWPLUS\TDA_DATA\UserData&#x0D;&#x0A;mkdir d:\Work7\NEWPLUS\TDA_DATA\UserData&#x0D;&#x0A;copy .\Res\sounds\background.mp3 D:\Work7\NEWPLUS\TDA_DATA\UserData&#x0D;&#x0A;copy .\Res\sounds\Effect1.mp3 D:\Work7\NEWPLUS\TDA_DATA\UserData&#x0D;&#x0A;copy .\Res\sounds\Effect2.mp3 D:\Work7\NEWPLUS\TDA_DATA\UserData"
+				CommandLine="mkdir d:\Work7\NEWPLUS\TDA_DATA\UserData&#x0D;&#x0A;mkdir d:\Work7\NEWPLUS\TDA_DATA\UserData&#x0D;&#x0A;copy .\Res\sounds\background.mp3 D:\Work7\NEWPLUS\TDA_DATA\UserData&#x0D;&#x0A;copy .\Res\sounds\Effect1.mp3 D:\Work7\NEWPLUS\TDA_DATA\UserData&#x0D;&#x0A;copy .\Res\sounds\Effect2.mp3 D:\Work7\NEWPLUS\TDA_DATA\UserData&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ SimpleAudioEngine::SimpleAudioEngine()`
`23`	`23`	`, m_bWillPlayBackgroundMusic(false)`
`24`	`24`	`, m_pEffects(NULL)`
`25`	`25`	`{`
`26`		`- m_EffectPlayers.resize(0);`
	`26`	`+ //m_pEffectPlayers->resize(0);`
	`27`	`+ m_pEffectPlayers = new PlayerArray();`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`SimpleAudioEngine::~SimpleAudioEngine()`
`@@ -100,7 +101,7 @@ void SimpleAudioEngine::SetEffectsVolume(int volume)`
`100`	`101`	`{`
`101`	`102`	`PlayerArrayIterator iter;`
`102`	`103`
`103`		`- for (iter = m_EffectPlayers.begin(); iter != m_EffectPlayers.end(); ++iter)`
	`104`	`+ for (iter = m_pEffectPlayers->begin(); iter != m_pEffectPlayers->end(); ++iter)`
`104`	`105`	`{`
`105`	`106`	`if (*iter)`
`106`	`107`	`{`
`@@ -220,9 +221,9 @@ void SimpleAudioEngine::playPreloadedEffect(int nSoundId)`
`220`	`221`	`SoundPlayer* pPlayer = pElement->pPlayer;`
`221`	`222`	`if (!pPlayer)`
`222`	`223`	`{`
`223`		`- // find the not playing player in m_EffectPlayers`
	`224`	`+ // find the not playing player in m_pEffectPlayers`
`224`	`225`	`PlayerArrayIterator iter;`
`225`		`- for (iter = m_EffectPlayers.begin(); iter != m_EffectPlayers.end(); ++iter)`
	`226`	`+ for (iter = m_pEffectPlayers->begin(); iter != m_pEffectPlayers->end(); ++iter)`
`226`	`227`	`{`
`227`	`228`	`if ((iter) && !(iter)->IsPlaying())`
`228`	`229`	`{`
`@@ -235,7 +236,7 @@ void SimpleAudioEngine::playPreloadedEffect(int nSoundId)`
`235`	`236`	`if (!pPlayer)`
`236`	`237`	`{`
`237`	`238`	`pPlayer = new SoundPlayer();`
`238`		`- m_EffectPlayers.push_back(pPlayer);`
	`239`	`+ m_pEffectPlayers->push_back(pPlayer);`
`239`	`240`
`240`	`241`	`// set the player volume`
`241`	`242`	`pPlayer->SetVolumeValue(m_nEffectsVolume);`
`@@ -262,13 +263,14 @@ void SimpleAudioEngine::removeAllEffectPlayers()`
`262`	`263`	`{`
`263`	`264`	`PlayerArrayIterator iter;`
`264`	`265`
`265`		`- for (iter = m_EffectPlayers.begin(); iter != m_EffectPlayers.end(); ++iter)`
	`266`	`+ for (iter = m_pEffectPlayers->begin(); iter != m_pEffectPlayers->end(); ++iter)`
`266`	`267`	`{`
`267`	`268`	`if (*iter)`
`268`	`269`	`{`
`269`	`270`	`delete *iter;`
`270`	`271`	`}`
`271`	`272`	`}`
`272`	`273`
`273`		`- m_EffectPlayers.clear();`
	`274`	`+ m_pEffectPlayers->clear();`
	`275`	`+ delete m_pEffectPlayers;`
`274`	`276`	`}`