From 4f08d96cfd1c33207742772a64ae0820a45bd745 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 31 Jan 2013 14:34:36 +0200
Subject: [PATCH] Added ability to change playback rate, added pause/play on
 video click, minor improvements.

---
 .../xmodule/js/src/videoalpha/display.coffee  |  1 +
 .../js/src/videoalpha/display/html5_video.js  | 47 ++++++++++++++++---
 .../videoalpha/display/video_player.coffee    | 12 +++--
 3 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/display.coffee b/common/lib/xmodule/xmodule/js/src/videoalpha/display.coffee
index 735e916573..86f8e896c0 100644
--- a/common/lib/xmodule/xmodule/js/src/videoalpha/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/videoalpha/display.coffee
@@ -25,6 +25,7 @@ class @VideoAlpha
       @setSpeed($.cookie('video_speed'))
     $("#video_#{@id}").data('video', this).addClass('video-load-complete')
     @hide_captions = $.cookie('hide_captions') == 'true'
+    _this = this
     if ((@videoType is "youtube") and (YT.Player)) or ((@videoType is "html5") and (HTML5Video.Player))
       @embed()
     else
diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/display/html5_video.js b/common/lib/xmodule/xmodule/js/src/videoalpha/display/html5_video.js
index 555d12187d..12a5734f13 100644
--- a/common/lib/xmodule/xmodule/js/src/videoalpha/display/html5_video.js
+++ b/common/lib/xmodule/xmodule/js/src/videoalpha/display/html5_video.js
@@ -112,6 +112,28 @@ this.HTML5Video = (function () {
 
             this.video = this.videoEl[0];
 
+            this.videoEl.on('click', function (event) {
+                if (_this.playerState === HTML5Video.PlayerState.PAUSED) {
+                    _this.video.play();
+                    _this.playerState = HTML5Video.PlayerState.PLAYING;
+
+                    if ($.isFunction(_this.config.events.onStateChange) === true) {
+                        _this.config.events.onStateChange({
+                            'data': _this.playerState
+                        });
+                    }
+                } else if (_this.playerState === HTML5Video.PlayerState.PLAYING) {
+                    _this.video.pause();
+                    _this.playerState = HTML5Video.PlayerState.PAUSED;
+
+                    if ($.isFunction(_this.config.events.onStateChange) === true) {
+                        _this.config.events.onStateChange({
+                            'data': _this.playerState
+                        });
+                    }
+                }
+            });
+
             this.video.addEventListener('canplay', function () {
                 _this.playerState = HTML5Video.PlayerState.PAUSED;
 
@@ -185,12 +207,13 @@ this.HTML5Video = (function () {
         };
 
         Player.prototype.pauseVideo = function () {
-
             this.video.pause();
         };
 
-        Player.prototype.seekTo = function () {
-
+        Player.prototype.seekTo = function (value) {
+            if ((typeof value === 'number') && (value <= this.video.duration) && (value >= 0)) {
+                this.video.currentTime = value;
+            }
         };
 
         // YouTube API has player.loadVideoById, but since we are working with a video source, we will rename this
@@ -215,8 +238,10 @@ this.HTML5Video = (function () {
             this.cueVideoBySource(id);
         };
 
-        Player.prototype.setVolume = function () {
-
+        Player.prototype.setVolume = function (value) {
+            if ((typeof value === 'number') && (value <= 100) && (value >= 0)) {
+                this.video.volume = value * 0.01;
+            }
         };
 
         Player.prototype.getCurrentTime = function () {
@@ -232,13 +257,23 @@ this.HTML5Video = (function () {
         };
 
         Player.prototype.getVolume = function () {
-
+            return this.video.volume;
         };
 
         Player.prototype.getDuration = function () {
             return this.video.duration;
         };
 
+        Player.prototype.setSpeed = function (value) {
+            var newSpeed;
+
+            newSpeed = parseFloat(value);
+
+            if (isFinite(newSpeed) === true) {
+                this.video.playbackRate = value;
+            }
+        }
+
         return Player;
     }());
 
diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_player.coffee b/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_player.coffee
index 20b16ae01c..0094a2f47f 100644
--- a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_player.coffee
+++ b/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_player.coffee
@@ -139,11 +139,13 @@ class @VideoPlayerAlpha extends SubviewAlpha
     newSpeed = parseFloat(newSpeed).toFixed(2).replace /\.00$/, '.0'
     @video.setSpeed(newSpeed)
     @caption.currentSpeed = newSpeed
-
-    if @isPlaying()
-      @player.loadVideoById(@video.youtubeId(), @currentTime)
-    else
-      @player.cueVideoById(@video.youtubeId(), @currentTime)
+    if @video.videoType is 'html5'
+      @player.setSpeed(newSpeed)
+    else if @video.videoType is 'youtube'
+      if @isPlaying()
+        @player.loadVideoById(@video.youtubeId(), @currentTime)
+      else
+        @player.cueVideoById(@video.youtubeId(), @currentTime)
     @updatePlayTime @currentTime
 
   onVolumeChange: (event, volume) =>