From 11ca4a1bcad9f7cfb0a3714b9c7ba4546976dc35 Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Wed, 9 Nov 2016 13:39:00 -0800
Subject: [PATCH] Make Future progress use two Ints instead of one Float

---
 lime/_backend/flash/FlashHTTPRequest.hx   | 20 ++------------------
 lime/_backend/html5/HTML5HTTPRequest.hx   |  4 ++--
 lime/_backend/native/NativeHTTPRequest.hx |  2 +-
 lime/app/Future.hx                        |  4 ++--
 lime/app/Promise.hx                       |  4 ++--
 lime/audio/AudioBuffer.hx                 | 10 +---------
 templates/haxe/DefaultAssetLibrary.hx     | 20 ++------------------
 7 files changed, 12 insertions(+), 52 deletions(-)

diff --git a/lime/_backend/flash/FlashHTTPRequest.hx b/lime/_backend/flash/FlashHTTPRequest.hx
index e90324e9d..f38d57446 100644
--- a/lime/_backend/flash/FlashHTTPRequest.hx
+++ b/lime/_backend/flash/FlashHTTPRequest.hx
@@ -125,15 +125,7 @@ class FlashHTTPRequest {
 		
 		urlLoader.addEventListener (ProgressEvent.PROGRESS, function (event) {
 			
-			if (event.bytesTotal == 0) {
-				
-				promise.progress (0);
-				
-			} else {
-				
-				promise.progress (event.bytesLoaded / event.bytesTotal);
-				
-			}
+			promise.progress (event.bytesLoaded, event.bytesTotal);
 			
 		});
 		
@@ -180,15 +172,7 @@ class FlashHTTPRequest {
 		
 		urlLoader.addEventListener (ProgressEvent.PROGRESS, function (event) {
 			
-			if (event.bytesTotal == 0) {
-				
-				promise.progress (0);
-				
-			} else {
-				
-				promise.progress (event.bytesLoaded / event.bytesTotal);
-				
-			}
+			promise.progress (event.bytesLoaded, event.bytesTotal);
 			
 		});
 		
diff --git a/lime/_backend/html5/HTML5HTTPRequest.hx b/lime/_backend/html5/HTML5HTTPRequest.hx
index 4d0a027f7..dbe66b963 100644
--- a/lime/_backend/html5/HTML5HTTPRequest.hx
+++ b/lime/_backend/html5/HTML5HTTPRequest.hx
@@ -127,7 +127,7 @@ class HTML5HTTPRequest {
 		
 		var progress = function (event) {
 			
-			promise.progress (event.loaded / event.total);
+			promise.progress (event.loaded, event.total);
 			
 		}
 		
@@ -175,7 +175,7 @@ class HTML5HTTPRequest {
 		
 		var progress = function (event) {
 			
-			promise.progress (event.loaded / event.total);
+			promise.progress (event.loaded, event.total);
 			
 		}
 		
diff --git a/lime/_backend/native/NativeHTTPRequest.hx b/lime/_backend/native/NativeHTTPRequest.hx
index 13245cab0..3559dfe96 100644
--- a/lime/_backend/native/NativeHTTPRequest.hx
+++ b/lime/_backend/native/NativeHTTPRequest.hx
@@ -317,7 +317,7 @@ class NativeHTTPRequest {
 			if (uptotal > bytesTotal) bytesTotal = Std.int (uptotal);
 			if (dltotal > bytesTotal) bytesTotal = Std.int (dltotal);
 			
-			promise.progress (bytesLoaded / bytesTotal);
+			promise.progress (bytesLoaded, bytesTotal);
 			
 		}
 		
diff --git a/lime/app/Future.hx b/lime/app/Future.hx
index c92c4d249..a0b737f95 100644
--- a/lime/app/Future.hx
+++ b/lime/app/Future.hx
@@ -18,7 +18,7 @@ import lime.utils.Log;
 	
 	private var __completeListeners:Array<T->Void>;
 	private var __errorListeners:Array<Dynamic->Void>;
-	private var __progressListeners:Array<Float->Void>;
+	private var __progressListeners:Array<Int->Int->Void>;
 	
 	
 	public function new (work:Void->T = null, async:Bool = false) {
@@ -107,7 +107,7 @@ import lime.utils.Log;
 	}
 	
 	
-	public function onProgress (listener:Float->Void):Future<T> {
+	public function onProgress (listener:Int->Int->Void):Future<T> {
 		
 		if (listener != null) {
 			
diff --git a/lime/app/Promise.hx b/lime/app/Promise.hx
index 63b0d5cc9..8ab24102c 100644
--- a/lime/app/Promise.hx
+++ b/lime/app/Promise.hx
@@ -84,7 +84,7 @@ class Promise<T> {
 	}
 	
 	
-	public function progress (progress:Float):Promise<T> {
+	public function progress (progress:Int, total:Int):Promise<T> {
 		
 		if (!future.isError && !future.isComplete) {
 			
@@ -92,7 +92,7 @@ class Promise<T> {
 				
 				for (listener in future.__progressListeners) {
 					
-					listener (progress);
+					listener (progress, total);
 					
 				}
 				
diff --git a/lime/audio/AudioBuffer.hx b/lime/audio/AudioBuffer.hx
index ff3e97a5f..ffd5e8796 100644
--- a/lime/audio/AudioBuffer.hx
+++ b/lime/audio/AudioBuffer.hx
@@ -291,15 +291,7 @@ class AudioBuffer {
 			
 			audioBuffer.__srcSound.addEventListener (flash.events.ProgressEvent.PROGRESS, function (event) {
 				
-				if (event.bytesTotal == 0) {
-					
-					promise.progress (0);
-					
-				} else {
-					
-					promise.progress (event.bytesLoaded / event.bytesTotal);
-					
-				}
+				promise.progress (event.bytesLoaded, event.bytesTotal);
 				
 			});
 			
diff --git a/templates/haxe/DefaultAssetLibrary.hx b/templates/haxe/DefaultAssetLibrary.hx
index 013cea81d..dff9e6a84 100644
--- a/templates/haxe/DefaultAssetLibrary.hx
+++ b/templates/haxe/DefaultAssetLibrary.hx
@@ -510,15 +510,7 @@ class DefaultAssetLibrary extends AssetLibrary {
 			});
 			loader.addEventListener (ProgressEvent.PROGRESS, function (event) {
 				
-				if (event.bytesTotal == 0) {
-					
-					promise.progress (0);
-					
-				} else {
-					
-					promise.progress (event.bytesLoaded / event.bytesTotal);
-					
-				}
+				promise.progress (event.bytesLoaded, event.bytesTotal);
 				
 			});
 			loader.addEventListener (IOErrorEvent.IO_ERROR, promise.error);
@@ -571,15 +563,7 @@ class DefaultAssetLibrary extends AssetLibrary {
 			});
 			loader.contentLoaderInfo.addEventListener (ProgressEvent.PROGRESS, function (event) {
 				
-				if (event.bytesTotal == 0) {
-					
-					promise.progress (0);
-					
-				} else {
-					
-					promise.progress (event.bytesLoaded / event.bytesTotal);
-					
-				}
+				promise.progress (event.bytesLoaded, event.bytesTotal);
 				
 			});
 			loader.contentLoaderInfo.addEventListener (IOErrorEvent.IO_ERROR, promise.error);