From d421540b592aa675b5393b8f35d3aa9612cded6d Mon Sep 17 00:00:00 2001
From: Sascha Kluger <frankyghost@googlemail.com>
Date: Tue, 5 Nov 2013 17:05:50 +0100
Subject: [PATCH] minor VLC / browser model fixes

---
 CHANGELOG.md                         |  5 ++-
 src/controller/projekktor.js         |  2 +-
 src/controller/projekktor.utils.js   | 57 +++++++++++++++-------------
 src/models/player.audio.video.vlc.js | 17 ++++-----
 src/models/player.image.html.js      |  2 +-
 5 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1aa565..3fa2556 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,13 @@
 PROJEKKTOR - simply mighty <video>
 http://www.projekktor.com
 
-V1.2.39
+V1.3.0
 =======
 
   addtions:
   * [core] added OSMF player model
   * [core] "streamType" can now be specified separately for each alternate media entry of a playlist item (allows mixing e.g. of RTMP, HTTP for one single playlist item)
+  * [core] made mJpeg multipart streams available for clients with VLC Web Plugin
   
   fixes:
   * [core] fixed jQuery 1.4 issues
@@ -15,7 +16,7 @@ V1.2.39
   changes:
   * [core] made OSMF player model default
   * [core] missing or broken plugins are now reported via an alert()
-  
+  * [core] set default duration for images to one second
   
 
 V1.2.38
diff --git a/src/controller/projekktor.js b/src/controller/projekktor.js
index 96a68b7..6335c2e 100644
--- a/src/controller/projekktor.js
+++ b/src/controller/projekktor.js
@@ -131,7 +131,7 @@ projekktor = $p = function() {
 
     function PPlayer(srcNode, cfg, onReady) {
 
-    this.config = new projekktorConfig('1.2.39');
+    this.config = new projekktorConfig('1.3.0');
 
     this.env = {
         muted: false,
diff --git a/src/controller/projekktor.utils.js b/src/controller/projekktor.utils.js
index bc3ba05..7f4e5fd 100644
--- a/src/controller/projekktor.utils.js
+++ b/src/controller/projekktor.utils.js
@@ -33,7 +33,7 @@ jQuery(function ($) {
 					.attr('unselectable', 'on')
 					.bind("selectstart", function () {
 						return false;
-					})
+					});
 			return dest;
 		},
 
@@ -59,7 +59,7 @@ jQuery(function ($) {
 				try {
 					if ($.inArray(array1[i], array2) > -1) result.push(array1[i]);
 				} catch (e) {}
-			})
+			});
 			return result;
 		},
 
@@ -90,7 +90,7 @@ jQuery(function ($) {
 			}
 
 			h = l.protocol + '//' + l.host;
-			if (s.indexOf('/') == 0) {
+			if (s.indexOf('/')===0) {
 				return h + s;
 			}
 
@@ -123,8 +123,7 @@ jQuery(function ($) {
 		 * @return (Integer) Absolute seconds
 		 */
 		toSeconds: function (t) {
-
-			var s = 0.0
+			var s = 0.0;
 			if (typeof t != 'string') return t;
 			if (t) {
 				var p = t.split(':');
@@ -132,7 +131,7 @@ jQuery(function ($) {
 					p = p.slice(0, 3);
 
 				for (i = 0; i < p.length; i++)
-					s = s * 60 + parseFloat(p[i].replace(',', '.'))
+					s = s * 60 + parseFloat(p[i].replace(',', '.'));
 			}
 
 			return parseFloat(s);
@@ -232,7 +231,7 @@ jQuery(function ($) {
 						top: 0,
 						left: 0
 					})
-				)
+				);
 			}
 
 			return $('#' + domOptions.id);
@@ -285,8 +284,9 @@ jQuery(function ($) {
 			if (target == null)
 				return false;
 
-			if ((target instanceof $) == false)
-				target = $(target)
+			if ((target instanceof $)===false) {
+				target = $(target);
+			}
 
 			if (!target.data('od')) {
 				target.data('od', {
@@ -334,8 +334,9 @@ jQuery(function ($) {
 			wid = $p.utils.roundNumber((rw / wid) * 100, 0);
 			hei = $p.utils.roundNumber((rh / hei) * 100, 0);
 
-			if (wid == 0 || hei == 0)
+			if (wid===0 || hei===0) {
 				return false;
+			}
 
 			target.css({
 				'margin': 0,
@@ -388,8 +389,9 @@ jQuery(function ($) {
 		// http://paulirish.com/2009/log-a-lightweight-wrapper-for-consolelog/                
 		log: function () {
 
-			if (this.logging == false)
+			if (this.logging===false) {
 				return;
+			}
 
 			this.history = this.history || []; // store logs to an array for reference
 			this.history.push(arguments);
@@ -454,12 +456,13 @@ jQuery(function ($) {
         
         versionCompare: function (installed, required) {
             var a = installed.split('.'),
-                b = required.split('.');
+                b = required.split('.'),
+				i = 0;
     
-            for (var i = 0; i < a.length; ++i) {
+            for (i = 0; i < a.length; ++i) {
                 a[i] = Number(a[i]);
             }
-            for (var i = 0; i < b.length; ++i) {
+            for (i = 0; i < b.length; ++i) {
                 b[i] = Number(b[i]);
             }
             if (a.length == 2) {
@@ -499,17 +502,19 @@ jQuery(function ($) {
                 var n, v, json = [], arr = (obj && obj.constructor == Array);
     
                 for (n in obj) {
-                    v = obj[n];
-                    t = typeof(v);
-                    if (obj.hasOwnProperty(n)) {
-                        if (t == "string") {
-                            v = '"' + v + '"';
-                        } else if (t == "object" && v !== null){
-                            v = $p.utils.stringify(v);
-                        }
-    
-                        json.push((arr ? "" : '"' + n + '":') + String(v));
-                    }
+					if (obj.hasOwnProperty(n)) {
+						v = obj[n];
+						t = typeof(v);
+						if (obj.hasOwnProperty(n)) {
+							if (t == "string") {
+								v = '"' + v + '"';
+							} else if (t == "object" && v !== null){
+								v = $p.utils.stringify(v);
+							}
+		
+							json.push((arr ? "" : '"' + n + '":') + String(v));
+						}
+					}
                 }
     
                 return (arr ? "[" : "{") + String(json) + (arr ? "]" : "}");
@@ -517,7 +522,7 @@ jQuery(function ($) {
         },
         
 		logging: false
-	}
+	};
 });
 
 
diff --git a/src/models/player.audio.video.vlc.js b/src/models/player.audio.video.vlc.js
index 0be78e9..ba8c26d 100644
--- a/src/models/player.audio.video.vlc.js
+++ b/src/models/player.audio.video.vlc.js
@@ -43,7 +43,7 @@ $p.newModel({
                         var ref = navigator.plugins[i][j];
                         if (ref.suffixes!=null && ref.type!=null) {
                             $.each(ref.suffixes.split(','), function(key, value) {
-                                model.iLove.push( {ext:value, type: ref.type.replace(/x-/, ''), platform:['vlc'], streamType: ['rtsp', 'http', 'pseudo', 'httpVideo']} );
+                                model.iLove.push( {ext:value, type: ref.type.replace(/x-/, ''), platform:['vlc'], streamType: ['rtsp', 'http', 'pseudo', 'httpVideo', 'multipart']} );
                             })
                         }
                     }
@@ -124,21 +124,19 @@ $p.newModel({
      * Handle Events
      ****************************************/ 
     addListeners: function() {
-        if (this.mediaElement==null) return;
-    
         var ref = this;
 
         $.each(this._eventMap, function(event, value){
             try {
                 if (ref.mediaElement.get(0).attachEvent) {
                     // Microsoft
-                    ref.mediaElement.get(0).attachEvent (event, function(evt) {ref[value](this, evt)});
+                    ref.mediaElement.get(0).attachEvent (event, function(evt) {ref[value](this, evt);});
                 } else if ( ref.mediaElement.get(0).addEventListener) {
                     // Mozilla: DOM level 2            
-                    ref.mediaElement.get(0).addEventListener (event, function(evt) {ref[value](this, evt)}, false);
+                    ref.mediaElement.get(0).addEventListener (event, function(evt) {ref[value](this, evt);}, false);
                 } else {            
                     // DOM level 0            
-                    ref.mediaElement.get(0)["on" + event] = function(evt) {ref[value](this, evt)};
+                    ref.mediaElement.get(0)["on" + event] = function(evt) {ref[value](this, evt);};
                 }
             } catch(e){}
         });
@@ -146,7 +144,9 @@ $p.newModel({
     },
 
     removeListener: function(evt, subId) {        
-        if (this.mediaElement==null) return;
+        if (this.mediaElement==null) {
+            return;
+        }
         var id = (subId!=null) ? '.projekktor'+subId+this.pp.getId() : '.projekktor'+this.pp.getId(),
             ref = this;
 
@@ -161,7 +161,7 @@ $p.newModel({
         this.timeListener({
             position: this.mediaElement.get(0).input.time / 1000,
             duration: this.mediaElement.get(0).input.length / 1000
-        })
+        });
     },
     
     seekableListener: function() {
@@ -192,7 +192,6 @@ $p.newModel({
     },
       
 
-
     /*****************************************
      * Setters
      ****************************************/     
diff --git a/src/models/player.image.html.js b/src/models/player.image.html.js
index 707ddd9..26cec35 100644
--- a/src/models/player.image.html.js
+++ b/src/models/player.image.html.js
@@ -25,7 +25,7 @@ $p.newModel({
     
     applyMedia: function(destContainer) {
         this.mediaElement = this.applyImage(this.media.file[0].src, destContainer.html(''));
-        this._duration = this.pp.getConfig('duration');
+        this._duration = this.pp.getConfig('duration') || 1;
         this._position = -1;
         this.displayReady();
         this._position = -0.5;