kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Future progress use two Ints instead of one Float

Browse Source
This commit is contained in:
Joshua Granick
2016-11-09 13:39:00 -08:00
parent 97285c4881
commit 11ca4a1bca
7 changed files with 12 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lime/_backend/flash/FlashHTTPRequest.hx
View File

@@ -125,15 +125,7 @@ class FlashHTTPRequest {
urlLoader.addEventListener (ProgressEvent.PROGRESS, function (event) { urlLoader.addEventListener (ProgressEvent.PROGRESS, function (event) {
if (event.bytesTotal == 0) { promise.progress (event.bytesLoaded, event.bytesTotal);
promise.progress (0);
} else {
promise.progress (event.bytesLoaded / event.bytesTotal);
}
}); });
@@ -180,15 +172,7 @@ class FlashHTTPRequest {
urlLoader.addEventListener (ProgressEvent.PROGRESS, function (event) { urlLoader.addEventListener (ProgressEvent.PROGRESS, function (event) {
if (event.bytesTotal == 0) { promise.progress (event.bytesLoaded, event.bytesTotal);
promise.progress (0);
} else {
promise.progress (event.bytesLoaded / event.bytesTotal);
}
}); });

4
lime/_backend/html5/HTML5HTTPRequest.hx
View File

@@ -127,7 +127,7 @@ class HTML5HTTPRequest {
var progress = function (event) { 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) { var progress = function (event) {
promise.progress (event.loaded / event.total); promise.progress (event.loaded, event.total);
} }

2
lime/_backend/native/NativeHTTPRequest.hx
View File

@@ -317,7 +317,7 @@ class NativeHTTPRequest {
if (uptotal > bytesTotal) bytesTotal = Std.int (uptotal); if (uptotal > bytesTotal) bytesTotal = Std.int (uptotal);
if (dltotal > bytesTotal) bytesTotal = Std.int (dltotal); if (dltotal > bytesTotal) bytesTotal = Std.int (dltotal);
promise.progress (bytesLoaded / bytesTotal); promise.progress (bytesLoaded, bytesTotal);
} }

4
lime/app/Future.hx
View File

@@ -18,7 +18,7 @@ import lime.utils.Log;
private var __completeListeners:Array<T->Void>; private var __completeListeners:Array<T->Void>;
private var __errorListeners:Array<Dynamic->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) { 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) { if (listener != null) {

4
lime/app/Promise.hx
View File

@@ -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) { if (!future.isError && !future.isComplete) {
@@ -92,7 +92,7 @@ class Promise<T> {
for (listener in future.__progressListeners) { for (listener in future.__progressListeners) {
listener (progress); listener (progress, total);
} }

10
lime/audio/AudioBuffer.hx
View File

@@ -291,15 +291,7 @@ class AudioBuffer {
audioBuffer.__srcSound.addEventListener (flash.events.ProgressEvent.PROGRESS, function (event) { audioBuffer.__srcSound.addEventListener (flash.events.ProgressEvent.PROGRESS, function (event) {
if (event.bytesTotal == 0) { promise.progress (event.bytesLoaded, event.bytesTotal);
promise.progress (0);
} else {
promise.progress (event.bytesLoaded / event.bytesTotal);
}
}); });

20
templates/haxe/DefaultAssetLibrary.hx
View File

@@ -510,15 +510,7 @@ class DefaultAssetLibrary extends AssetLibrary {
}); });
loader.addEventListener (ProgressEvent.PROGRESS, function (event) { loader.addEventListener (ProgressEvent.PROGRESS, function (event) {
if (event.bytesTotal == 0) { promise.progress (event.bytesLoaded, event.bytesTotal);
promise.progress (0);
} else {
promise.progress (event.bytesLoaded / event.bytesTotal);
}
}); });
loader.addEventListener (IOErrorEvent.IO_ERROR, promise.error); loader.addEventListener (IOErrorEvent.IO_ERROR, promise.error);
@@ -571,15 +563,7 @@ class DefaultAssetLibrary extends AssetLibrary {
}); });
loader.contentLoaderInfo.addEventListener (ProgressEvent.PROGRESS, function (event) { loader.contentLoaderInfo.addEventListener (ProgressEvent.PROGRESS, function (event) {
if (event.bytesTotal == 0) { promise.progress (event.bytesLoaded, event.bytesTotal);
promise.progress (0);
} else {
promise.progress (event.bytesLoaded / event.bytesTotal);
}
}); });
loader.contentLoaderInfo.addEventListener (IOErrorEvent.IO_ERROR, promise.error); loader.contentLoaderInfo.addEventListener (IOErrorEvent.IO_ERROR, promise.error);