[Dunelegacy-commit] SF.net SVN: dunelegacy: [206] branches/dunks

[<dv...@us...>]

Revision: 206
          http://dunelegacy.svn.sourceforge.net/dunelegacy/?rev=206&view=rev
Author:   dvalin
Date:     2008-04-29 17:41:30 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
make constructor minimal to ensure that class is fast to initialize and won't be referenced before initialized when using threads

Modified Paths:
--------------
    branches/dunks/include/DataCache.h
    branches/dunks/src/DataCache.cpp

Modified: branches/dunks/include/DataCache.h
===================================================================
--- branches/dunks/include/DataCache.h	2008-04-30 00:11:04 UTC (rev 205)
+++ branches/dunks/include/DataCache.h	2008-04-30 00:41:30 UTC (rev 206)
@@ -403,6 +403,7 @@
 	~DataCache();
 
 	public:
+		void Init();
         void addObjPic(ObjPic_enum ID, Image * tmp, HOUSETYPE house = HOUSE_HARKONNEN);
         void addGuiPic(GuiPic_enum ID, Image * tmp, HOUSETYPE house = HOUSE_HARKONNEN);
 		void addAnimation(Animation_enum ID, std::string filename, double frameRate = 0);

Modified: branches/dunks/src/DataCache.cpp
===================================================================
--- branches/dunks/src/DataCache.cpp	2008-04-30 00:11:04 UTC (rev 205)
+++ branches/dunks/src/DataCache.cpp	2008-04-30 00:41:30 UTC (rev 206)
@@ -3,7 +3,10 @@
 #include "pakfile/sound/adl/adl.h"
 #include <string>
 #include <iostream>
-DataCache::DataCache() {
+
+DataCache::DataCache() {}
+
+void DataCache::Init(){
     for (uint8_t i=0; i< NUM_HOUSES; i++)
     {
         m_objImg.push_back(new images());
@@ -335,6 +338,7 @@
 	BriefingStrings[1] = new Stringfile("ENGLISH:TEXTO.ENG");
 	BriefingStrings[2] = new Stringfile("ENGLISH:TEXTH.ENG");
 	delete data;
+
 }
 
 void DataCache::addObjPic(ObjPic_enum ID, Image * tmp, HOUSETYPE house) {
@@ -390,6 +394,9 @@
 void DataCache::addMusic(MUSICTYPE musicType, std::string filename, uint16_t trackNum)
 {
 	songFiles[musicType].push_back(songFile(filename, trackNum));
+#ifdef __linux__
+	addMusic(musicType, songFiles[musicType].size()-1);
+#endif
 }
 
 Mix_Chunk* DataCache::addMusic(MUSICTYPE musicType, uint16_t ID)
@@ -401,6 +408,7 @@
 	CadlPlayer *p = new CadlPlayer(test);
 	Mix_Chunk* tmp = p->getUpsampledSubsong(song.second, 22050, AUDIO_S16LSB, 1);
 	SDL_RWclose(test);
+	std::cout << "ferdig" << std::endl;
     m_music[musicType]->insert(std::pair<uint16_t, Mix_Chunk*>(ID, tmp));
 	delete data;
 	delete p;
@@ -418,7 +426,12 @@
     }
     else
     {
-		return addMusic(musicType, ID);
+#ifdef	__linux__
+		std::cout << "NULL" << std::endl;
+		exit(1);
+		return NULL;
+#endif
+//		return addMusic(musicType, ID);
     }
 }
 


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