Version 1.0.18 (4.0.21)

app/php/include/configutils.php

@@ -60,7 +60,7 @@ function config_defaults($config = array()) {
     $config['cgi_directory'] = (empty($config['cgi_directory']) ? substr(dirname(dirname(__FILE__)), strlen(path_add_slash_end(path_concat($config['web_root_directory'], $config['install_directory'])))) : $config['cgi_directory']);
     $config['user_media_directory'] = (isset($config['user_media_directory']) ? $config['user_media_directory'] : path_concat(substr(dirname(dirname(dirname(__FILE__))), strlen(path_add_slash_end(path_concat($config['web_root_directory'], $config['install_directory'])))), 'user'));
     $config['user_media_url'] = (isset($config['user_media_url']) ? $config['user_media_url'] : $config['user_media_directory']);
-    $config['user_media_protocol'] = (isset($config['user_media_protocol']) ? 'http' : $config['user_media_protocol']);
+    $config['user_media_protocol'] = (empty($config['user_media_protocol']) ? 'http' : $config['user_media_protocol']);
     $config['user_data_directory'] = (isset($config['user_data_directory']) ? $config['user_data_directory'] : path_concat(substr(dirname(dirname(dirname(__FILE__))), strlen(path_add_slash_end($config['web_root_directory']))), 'user'));
     $config['s3_bucket'] = (empty($config['s3_bucket']) ? '' : $config['s3_bucket']);
     $config['s3_region'] = (empty($config['s3_region']) ? '' : $config['s3_region']);

bower.json

@@ -4,7 +4,7 @@
   "homepage": "http://www.moviemasher.com",
   "authors": [ {"name": "Movie Masher", "email": "[email protected]" }],
   "description": "Example deployment of moviemasher.js and moviemasher.rb utilizing AngularJS, Bootstrap and PHP",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "ignore": [
     "**/.*",
     "node_modules",
@@ -20,7 +20,7 @@
     "bootstrap": "~3.3.6",
     "angular-bootstrap": "~1.3.3",
     "angular-bootstrap-colorpicker": "~3.0.25",
-    "moviemasher.js": "4.0.20"
+    "moviemasher.js": "4.0.21"
   },
   "devDependencies": {
     "grunt": "^0.4.5",

bower_components/moviemasher.js/.bower.json

@@ -1,7 +1,7 @@
 {
   "name": "moviemasher.js",
   "main": "dist/moviemasher.js",
-  "version": "4.0.20",
+  "version": "4.0.21",
   "homepage": "http://www.moviemasher.com",
   "authors": [
     {
@@ -40,13 +40,13 @@
     "grunt-contrib-uglify": "^0.4.0",
     "jshint-stylish": "^0.2.0"
   },
-  "_release": "4.0.20",
+  "_release": "4.0.21",
   "_resolution": {
     "type": "version",
-    "tag": "4.0.20",
-    "commit": "a4286113a8185561c921c8ba23aea38351136383"
+    "tag": "4.0.21",
+    "commit": "d75ce6472037c4d34e8b3d93b3009a1da501e945"
   },
   "_source": "https://github.com/moviemasher/moviemasher.js.git",
-  "_target": "4.0.20",
+  "_target": "4.0.21",
   "_originalSource": "moviemasher.js"
 }

bower_components/moviemasher.js/bower.json

@@ -1,7 +1,7 @@
 {
   "name": "moviemasher.js",
   "main": "dist/moviemasher.js",
-  "version": "4.0.20",
+  "version": "4.0.21",
   "homepage": "http://www.moviemasher.com",
   "authors": [ {"name": "Movie Masher", "email": "[email protected]" }],
   "moduleType": ["amd"],

bower_components/moviemasher.js/dist/moviemasher.js

@@ -1,5 +1,5 @@
-/*! moviemasher.js - v4.0.20 - 2016-09-11
-* Copyright (c) 2016 Movie Masher; Licensed  */
+/*! moviemasher.js - v4.0.21 - 2017-02-25
+* Copyright (c) 2017 Movie Masher; Licensed  */
 /*global module:true,define:true*/
 (function (name, context, definition) { 
 'use strict';
@@ -134,8 +134,9 @@ var Action = function(player, redo_func, undo_func, destroy_func){
     delete this.undo_add_objects;
     delete this.redo_delete_objects;
   };
-  
+
 })(Action.prototype);
+MovieMasher.Action = Action;
 
 var Audio = {
   buffer_source: function(buffer){
@@ -308,6 +309,7 @@ var Audio = {
   __last_seconds: 0,
   __sync_seconds: 0,
 };
+MovieMasher.Audio = Audio;
 
 var Colors = {
   yuv2rgb: function(yuv) {
@@ -557,6 +559,7 @@ var Defaults = {
     return ob;
   },
 };
+MovieMasher.Defaults = Defaults;
 
 var Filter = {
   registered: {},
@@ -1407,6 +1410,7 @@ var Mash = {
     return clips;
   },
 };
+MovieMasher.Mash = Mash;
 
 var Option = {
   mash: {
@@ -1434,6 +1438,8 @@ var Option = {
     hscrollpadding: 20,
   }
 };
+MovieMasher.Option = Option;
+
 
 var Player = function(evaluated) {
   if (! Util.isob(evaluated)) evaluated = {};
@@ -2891,6 +2897,7 @@ var Player = function(evaluated) {
     if (this.__mash_length === Mash.length_of_clips(track.clips)) this.mash_length_changed();
   };
 })(Player.prototype);
+MovieMasher.Player = Player;
 
 var Players = {
   draw_delayed: function(){
@@ -2918,8 +2925,8 @@ var Players = {
   instances: [],
   current: null,
   delayed_timer: 0,
-
 };
+MovieMasher.Players = Players;
 
 var TimeRange = function(start, rate, duration){
   if (start) this.frame = Number(start) || 0;
@@ -3161,6 +3168,7 @@ TimeRange.fromSomething = function(something){
     this.frames = Math.min(time.frame, this.frames);
   };
 })(TimeRange.prototype);
+MovieMasher.TimeRange = TimeRange;
 
 var Util = {
   array_empty: function(array){

bower_components/moviemasher.js/package.json

@@ -1,7 +1,7 @@
 {
   "name": "moviemasher.js",
   "description": "JavaScript library for realtime, browser-based video and audio editing",
-  "version": "4.0.20",
+  "version": "4.0.21",
   "author": {
     "name": "Movie Masher",
     "email": "[email protected]"

bower_components/moviemasher.js/src/others/action.js

@@ -44,5 +44,6 @@ var Action = function(player, redo_func, undo_func, destroy_func){
     delete this.undo_add_objects;
     delete this.redo_delete_objects;
   };
-  
+
 })(Action.prototype);
+MovieMasher.Action = Action;

bower_components/moviemasher.js/src/others/audio.js

@@ -169,3 +169,4 @@ var Audio = {
   __last_seconds: 0,
   __sync_seconds: 0,
 };
+MovieMasher.Audio = Audio;

bower_components/moviemasher.js/src/others/defaults.js

@@ -67,3 +67,4 @@ var Defaults = {
     return ob;
   },
 };
+MovieMasher.Defaults = Defaults;

bower_components/moviemasher.js/src/others/mash.js

@@ -607,3 +607,4 @@ var Mash = {
     return clips;
   },
 };
+MovieMasher.Mash = Mash;

bower_components/moviemasher.js/src/others/option.js

@@ -23,4 +23,5 @@ var Option = {
   timeline: {
     hscrollpadding: 20,
   }
-};
+};
+MovieMasher.Option = Option;

bower_components/moviemasher.js/src/others/player.js

@@ -1455,3 +1455,4 @@ var Player = function(evaluated) {
     if (this.__mash_length === Mash.length_of_clips(track.clips)) this.mash_length_changed();
   };
 })(Player.prototype);
+MovieMasher.Player = Player;

bower_components/moviemasher.js/src/others/players.js

@@ -24,5 +24,5 @@ var Players = {
   instances: [],
   current: null,
   delayed_timer: 0,
-
 };
+MovieMasher.Players = Players;

bower_components/moviemasher.js/src/others/time.js

@@ -238,3 +238,4 @@ TimeRange.fromSomething = function(something){
     this.frames = Math.min(time.frame, this.frames);
   };
 })(TimeRange.prototype);
+MovieMasher.TimeRange = TimeRange;

dist/angular-moviemasher.js

@@ -1,5 +1,5 @@
-/*! angular-moviemasher - v1.0.17 - 2016-09-11
-* Copyright (c) 2016 Movie Masher; Licensed  */
+/*! angular-moviemasher - v1.0.18 - 2017-02-25
+* Copyright (c) 2017 Movie Masher; Licensed  */
 /*globals MovieMasher:true, angular:true*/
 (function(){
   'use strict';

package.json

@@ -1,7 +1,7 @@
 {
   "name": "angular-moviemasher",
   "description": "Example deployment of moviemasher.js and moviemasher.rb utilizing AngularJS, Bootstrap and PHP",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "author": {
     "name": "Movie Masher",
     "email": "[email protected]"