From 19b9b14dfc86c49c9112289dea82d23c3f1cdf4f Mon Sep 17 00:00:00 2001
From: rlx <0x0073@0x2620.org>
Date: Sun, 14 Jul 2013 17:58:45 +0000
Subject: [PATCH] VideoPlayer: fix loop while playing in to out;
 VideoEditPanel: add play in to out control

---
 source/Ox.UI/js/Video/VideoEditPanel.js | 2 +-
 source/Ox.UI/js/Video/VideoPlayer.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/Ox.UI/js/Video/VideoEditPanel.js b/source/Ox.UI/js/Video/VideoEditPanel.js
index fa89cdb2..b6992fd6 100644
--- a/source/Ox.UI/js/Video/VideoEditPanel.js
+++ b/source/Ox.UI/js/Video/VideoEditPanel.js
@@ -135,7 +135,7 @@ Ox.VideoEditPanel = function(options, self) {
     self.$video = Ox.VideoPlayer({
             controlsTop: ['fullscreen', 'space', 'open'],
             controlsBottom: [
-                'play', 'volume', 'scale', 'timeline',
+                'play', 'playInToOut', 'volume', 'scale', 'timeline',
                 'previous', 'next', 'loop', 'position', 'settings'
             ],
             enableKeyboard: true,
diff --git a/source/Ox.UI/js/Video/VideoPlayer.js b/source/Ox.UI/js/Video/VideoPlayer.js
index 814e152b..259caf8a 100644
--- a/source/Ox.UI/js/Video/VideoPlayer.js
+++ b/source/Ox.UI/js/Video/VideoPlayer.js
@@ -1878,7 +1878,7 @@ Ox.VideoPlayer = function(options, self) {
             || (self.options.playInToOut && self.options.position >= self.out)
         ) {
             if (self.options.loop) {
-                rewind();
+                setPosition(self.options['in']);
                 self.$video.play();
             } else {
                 togglePaused();