diff --git a/lime/audio/ALAudioContext.hx b/lime/audio/ALAudioContext.hx deleted file mode 100644 index 193f6f509..000000000 --- a/lime/audio/ALAudioContext.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef ALAudioContext = lime.media.openal.ALAudioContext; -#end \ No newline at end of file diff --git a/lime/audio/ALCAudioContext.hx b/lime/audio/ALCAudioContext.hx deleted file mode 100644 index 616e64415..000000000 --- a/lime/audio/ALCAudioContext.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef ALCAudioContext = lime.media.openal.ALCAudioContext; -#end \ No newline at end of file diff --git a/lime/audio/AudioBuffer.hx b/lime/audio/AudioBuffer.hx deleted file mode 100644 index 9182d5d46..000000000 --- a/lime/audio/AudioBuffer.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef AudioBuffer = lime.media.AudioBuffer; -#end \ No newline at end of file diff --git a/lime/audio/AudioContext.hx b/lime/audio/AudioContext.hx deleted file mode 100644 index b92f4beba..000000000 --- a/lime/audio/AudioContext.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef AudioContext = lime.media.AudioContext; -#end \ No newline at end of file diff --git a/lime/audio/AudioManager.hx b/lime/audio/AudioManager.hx deleted file mode 100644 index cfd2f2f3f..000000000 --- a/lime/audio/AudioManager.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef AudioManager = lime.media.AudioManager; -#end \ No newline at end of file diff --git a/lime/audio/AudioSource.hx b/lime/audio/AudioSource.hx deleted file mode 100644 index de5e86b1d..000000000 --- a/lime/audio/AudioSource.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef AudioSource = lime.media.AudioSource; -#end \ No newline at end of file diff --git a/lime/audio/FlashAudioContext.hx b/lime/audio/FlashAudioContext.hx deleted file mode 100644 index 8c67eb9e3..000000000 --- a/lime/audio/FlashAudioContext.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef FlashAudioContext = lime.media.FlashAudioContext; -#end \ No newline at end of file diff --git a/lime/audio/HTML5AudioContext.hx b/lime/audio/HTML5AudioContext.hx deleted file mode 100644 index 5ee6cac13..000000000 --- a/lime/audio/HTML5AudioContext.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef HTML5AudioContext = lime.media.HTML5AudioContext; -#end \ No newline at end of file diff --git a/lime/audio/WebAudioContext.hx b/lime/audio/WebAudioContext.hx deleted file mode 100644 index 62ce2f274..000000000 --- a/lime/audio/WebAudioContext.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef WebAudioContext = lime.media.WebAudioContext; -#end \ No newline at end of file diff --git a/lime/audio/fmod/FMODChannel.hx b/lime/audio/fmod/FMODChannel.hx deleted file mode 100644 index 567f87b53..000000000 --- a/lime/audio/fmod/FMODChannel.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio.fmod; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef FMODChannel = lime.media.fmod.FMODChannel; -#end \ No newline at end of file diff --git a/lime/audio/fmod/FMODMode.hx b/lime/audio/fmod/FMODMode.hx deleted file mode 100644 index 948d88845..000000000 --- a/lime/audio/fmod/FMODMode.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio.fmod; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef FMODMode = lime.media.fmod.FMODMode; -#end \ No newline at end of file diff --git a/lime/audio/fmod/FMODSound.hx b/lime/audio/fmod/FMODSound.hx deleted file mode 100644 index fb1352b49..000000000 --- a/lime/audio/fmod/FMODSound.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio.fmod; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef FMODSound = lime.media.fmod.FMODSound; -#end \ No newline at end of file diff --git a/lime/audio/howlerjs/Howl.hx b/lime/audio/howlerjs/Howl.hx deleted file mode 100644 index b1efef571..000000000 --- a/lime/audio/howlerjs/Howl.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio.howlerjs; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef Howl = lime.media.howlerjs.Howl; -#end \ No newline at end of file diff --git a/lime/audio/howlerjs/Howler.hx b/lime/audio/howlerjs/Howler.hx deleted file mode 100644 index 677b3f138..000000000 --- a/lime/audio/howlerjs/Howler.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio.howlerjs; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef Howler = lime.media.howlerjs.Howler; -#end \ No newline at end of file diff --git a/lime/audio/openal/AL.hx b/lime/audio/openal/AL.hx deleted file mode 100644 index 3b0a82d07..000000000 --- a/lime/audio/openal/AL.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio.openal; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef AL = lime.media.openal.AL; -#end \ No newline at end of file diff --git a/lime/audio/openal/ALBuffer.hx b/lime/audio/openal/ALBuffer.hx deleted file mode 100644 index 8055619da..000000000 --- a/lime/audio/openal/ALBuffer.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio.openal; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef ALBuffer = lime.media.openal.ALBuffer; -#end \ No newline at end of file diff --git a/lime/audio/openal/ALC.hx b/lime/audio/openal/ALC.hx deleted file mode 100644 index ddda3ced3..000000000 --- a/lime/audio/openal/ALC.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio.openal; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef ALC = lime.media.openal.ALC; -#end \ No newline at end of file diff --git a/lime/audio/openal/ALContext.hx b/lime/audio/openal/ALContext.hx deleted file mode 100644 index 2a1491561..000000000 --- a/lime/audio/openal/ALContext.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio.openal; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef ALContext = lime.media.openal.ALContext; -#end \ No newline at end of file diff --git a/lime/audio/openal/ALDevice.hx b/lime/audio/openal/ALDevice.hx deleted file mode 100644 index ab08d9871..000000000 --- a/lime/audio/openal/ALDevice.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio.openal; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef ALDevice = lime.media.openal.ALDevice; -#end \ No newline at end of file diff --git a/lime/audio/openal/ALSource.hx b/lime/audio/openal/ALSource.hx deleted file mode 100644 index 25a8877d3..000000000 --- a/lime/audio/openal/ALSource.hx +++ /dev/null @@ -1,6 +0,0 @@ -package lime.audio.openal; - - -#if (lime < "4.0.0") -@:deprecated("The lime.audio package has been moved to lime.media.*") typedef ALSource = lime.media.openal.ALSource; -#end \ No newline at end of file diff --git a/lime/graphics/Image.hx b/lime/graphics/Image.hx index 610b0bdb4..1a58f2eff 100644 --- a/lime/graphics/Image.hx +++ b/lime/graphics/Image.hx @@ -478,11 +478,11 @@ class Image { } - public static function fromBase64 (base64:String, type:String #if (lime < "4.0.0"), onload:Image->Void #end):Image { + public static function fromBase64 (base64:String, type:String):Image { if (base64 == null) return null; var image = new Image (); - image.__fromBase64 (base64, type, onload); + image.__fromBase64 (base64, type); return image; } @@ -506,11 +506,11 @@ class Image { } - public static function fromBytes (bytes:Bytes #if (lime < "4.0.0"), onload:Image->Void = null #end):Image { + public static function fromBytes (bytes:Bytes):Image { if (bytes == null) return null; var image = new Image (); - image.__fromBytes (bytes, onload); + image.__fromBytes (bytes); return image; } @@ -532,11 +532,11 @@ class Image { } - public static function fromFile (path:String #if (lime < "4.0.0"), onload:Image -> Void = null, onerror:Void -> Void = null #end):Image { + public static function fromFile (path:String):Image { if (path == null) return null; var image = new Image (); - image.__fromFile (path, onload, onerror); + image.__fromFile (path); return image; } @@ -1304,7 +1304,7 @@ class Image { } - private function __fromBase64 (base64:String, type:String, onload:Image -> Void = null):Void { + private function __fromBase64 (base64:String, type:String, onload:Image->Void = null):Void { #if (js && html5) var image = new JSImage (); @@ -1334,7 +1334,7 @@ class Image { } - private function __fromBytes (bytes:Bytes, onload:Image -> Void):Void { + private function __fromBytes (bytes:Bytes, onload:Image->Void = null):Void { #if (js && html5) @@ -1398,7 +1398,7 @@ class Image { } - private function __fromFile (path:String, onload:Image -> Void, onerror:Void -> Void):Void { + private function __fromFile (path:String, onload:Image->Void = null, onerror:Void->Void = null):Void { #if (js && html5) diff --git a/lime/media/AudioBuffer.hx b/lime/media/AudioBuffer.hx index 2dd7797eb..91ac0b2d1 100644 --- a/lime/media/AudioBuffer.hx +++ b/lime/media/AudioBuffer.hx @@ -235,60 +235,6 @@ class AudioBuffer { } - #if (lime < "4.0.0") - public static function fromURL (url:String, handler:AudioBuffer->Void):Void { - - #if (js && html5 && howlerjs) - - var audioBuffer = new AudioBuffer (); - audioBuffer.__srcHowl = new Howl ({ src: [ url ] }); - audioBuffer.__srcHowl.on ("load", function () { handler (audioBuffer); }); - audioBuffer.__srcHowl.on ("loaderror", function () { handler (null); }); - audioBuffer.__srcHowl.load (); - - #else - - if (url != null && url.indexOf ("http://") == -1 && url.indexOf ("https://") == -1) { - - handler (AudioBuffer.fromFile (url)); - - } else { - - // TODO: Support streaming sound - - #if flash - - var loader = new flash.net.URLLoader (); - loader.addEventListener (flash.events.Event.COMPLETE, function (_) { - handler (AudioBuffer.fromBytes (cast loader.data)); - }); - loader.addEventListener (flash.events.IOErrorEvent.IO_ERROR, function (_) { - handler (null); - }); - loader.load (new flash.net.URLRequest (url)); - - #else - - //var loader = new URLLoader (); - //loader.onComplete.add (function (_) { - //var bytes = Bytes.ofString (loader.data); - //handler (AudioBuffer.fromBytes (bytes)); - //}); - //loader.onIOError.add (function (_, msg) { - //handler (null); - //}); - //loader.load (new URLRequest (url)); - - #end - - } - - #end - - } - #end - - #if lime_vorbis public static function fromVorbisFile (vorbisFile:VorbisFile):AudioBuffer { diff --git a/lime/project/ProjectXMLParser.hx b/lime/project/ProjectXMLParser.hx index ba8bf7111..339ff34b2 100644 --- a/lime/project/ProjectXMLParser.hx +++ b/lime/project/ProjectXMLParser.hx @@ -1808,10 +1808,6 @@ class ProjectXMLParser extends HXProject { var dependency = new Dependency (name, path); - #if (lime < "4.0.0") - dependency.forceLoad = true; - #end - if (element.has.resolve ("force-load")) { dependency.forceLoad = (substitute (element.att.resolve ("force-load")) == "true"); diff --git a/lime/utils/AssetManifest.hx b/lime/utils/AssetManifest.hx index ac78ff358..bffa94a03 100644 --- a/lime/utils/AssetManifest.hx +++ b/lime/utils/AssetManifest.hx @@ -226,11 +226,4 @@ class AssetManifest { } - #if (lime < "4.0.0") - @:deprecated public var basePath (get, set):String; - private function get_basePath ():String { return rootPath; } - private function set_basePath (value:String):String { return rootPath = value; } - #end - - } \ No newline at end of file diff --git a/lime/utils/Assets.hx b/lime/utils/Assets.hx index e772ff07c..2c4b19a9d 100644 --- a/lime/utils/Assets.hx +++ b/lime/utils/Assets.hx @@ -44,10 +44,10 @@ class Assets { public static var cache:AssetCache = new AssetCache (); - #if (lime < "4.0.0") @:noCompletion public #else private #end static var libraries (default, null) = new Map (); public static var onChange = new EventVoid> (); private static var defaultRootPath:String; + private static var libraries (default, null) = new Map (); private static var libraryPaths = new Map ();