X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fresources%2Fresourcemanager.cpp;h=f25e6ad1db1b53e609b68cf8d8d9559848da7b66;hp=91acb3d0baf623e89fea7777cd022006ec847401;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=5b311d10d50aa1fe0eb4ed4b8e41f0c58e9e7cbf

diff --git a/source/resources/resourcemanager.cpp b/source/resources/resourcemanager.cpp
index 91acb3d0..f25e6ad1 100644
--- a/source/resources/resourcemanager.cpp
+++ b/source/resources/resourcemanager.cpp
@@ -21,17 +21,6 @@ resource_load_error::resource_load_error(const string &name, const exception &ex
 { }
 
 
-ResourceManager::ResourceManager():
-	policy(LOAD_ON_DEMAND),
-	async_loads(true),
-	total_data_size(0),
-	size_limit(0),
-	frame(0),
-	min_retain_frames(30),
-	max_retain_frames(0),
-	next_unload(0)
-{ }
-
 ResourceManager::~ResourceManager()
 {
 	thread.terminate();
@@ -50,7 +39,7 @@ void ResourceManager::set_async_loads(bool a)
 	async_loads = a;
 }
 
-void ResourceManager::set_size_limit(UInt64 s)
+void ResourceManager::set_size_limit(uint64_t s)
 {
 	size_limit = s;
 }
@@ -251,11 +240,11 @@ void ResourceManager::unload_by_size()
 	while(total_data_size>size_limit)
 	{
 		ManagedResource *best = 0;
-		UInt64 best_impact = 0;
+		uint64_t best_impact = 0;
 		for(auto &kvp: resources)
 			if(kvp.second.state==ManagedResource::LOADED && kvp.second.last_used<unload_limit)
 			{
-				UInt64 impact = kvp.second.data_size*(frame-kvp.second.last_used);
+				uint64_t impact = kvp.second.data_size*(frame-kvp.second.last_used);
 				if(!best || impact>best_impact)
 				{
 					best = &kvp.second;
@@ -530,10 +519,10 @@ bool ResourceManager::LoadingThread::sync()
 	return any_finished;
 }
 
-UInt64 ResourceManager::LoadingThread::get_and_reset_loaded_data_size()
+uint64_t ResourceManager::LoadingThread::get_and_reset_loaded_data_size()
 {
 	MutexLock lock(data_size_mutex);
-	UInt64 result = loaded_data_size;
+	uint64_t result = loaded_data_size;
 	loaded_data_size = 0;
 	return result;
 }