Merge pull request #1 from MasGaNo/master

chrisweb · chrisweb · commit f15816a0f0f0 · 2014-11-14T10:50:12.000+01:00
Add plugin + onPlay method.
diff --git a/source/scripts/library/core.js b/source/scripts/library/core.js
@@ -31,6 +31,7 @@ define([
         this.waveLayoutOptions;
         this.firstDrawing = true;
         this.latestRange;
+        this._plugins = [];
         
         if (options !== undefined) {
             
@@ -70,8 +71,6 @@ define([
 
             fps = count;
             
-            console.log('fps: ' + fps);
-            
             count = 1;
 
         } else {
@@ -364,6 +363,38 @@ define([
         this.waveLayoutOptions = layoutOptions;
         
     };
+    
+    function callPlugin(method, datas, breakValue) {
+        
+        for (var i = 0, len = this._plugins.length; i < len; ++i) {
+            
+            if (!(method in this._plugins[i])) {
+                
+                continue;
+                
+            }
+            
+            var returnValue = this._plugins[i][method].apply(this, datas);
+            
+            if (breakValue !== undefined && returnValue === breakValue) {
+                
+                return false;
+                
+            }
+            
+        }
+        
+        return true;
+        
+    }
+    
+    waveform.prototype.addPlugin = function addPluginFunction(plugin) {
+        
+        this._plugins.push(plugin);
+        
+    };
+    
+    waveform.prototype._plugins = null;
 
     var drawStop = false;
     var frameHandle;
@@ -378,11 +409,13 @@ define([
         
         var that = this;
 
-        var frameHandle = requestFrame(function() {
+        frameHandle = requestFrame(function() {
 
             if (!drawStop) {
                 
-                that.events.once(that.events.constants.progressEvent, function(range) {
+                that.events.once(that.events.constants.progressEvent, function(data) {
+
+                    var range = (data.position/data.duration)*100;
 
                     // redraw wave with different color until song progress
                     that.draw(range);
@@ -436,16 +469,24 @@ define([
         var that = this;
 
         // on play listen for progress
-        this.events.on(this.events.constants.playEvent, function() {
+        this.events.on(this.events.constants.playEvent, function waveformPlayerPlayListener(isPlaying) {
+            
+            if (isPlaying && callPlugin.call(that, 'onPlay', arguments, false)) {
             
-            that.updateRangeStart();
+                that.updateRangeStart();
+                
+            }
             
         });
         
         // on stop, stop listening for progress
-        this.events.on(this.events.constants.stopEvent, function() {
+        this.events.on(this.events.constants.stopEvent, function waveformPlayerStopListener(isPlaying) {
             
-            that.updateRangeStop();
+            if (!isPlaying) {
+            
+                that.updateRangeStop();
+                
+            }
             
         });
         
