develop #comment Add functionality to increase/decrease subtitle's de…

…lay. - Fix displayed video shifting time on the buttons (10 mins to 5 mins).
Crazycurly · Feb 23, 2019 · fe8198c · fe8198c
1 parent 6de62d4
commit fe8198c
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 2 deletions.
diff --git a/OpenCast/media_player.py b/OpenCast/media_player.py
@@ -6,6 +6,7 @@
 
 from dbus import DBusException
 
+from omxplayer import keys
 from omxplayer.player import (
     OMXPlayer,
     OMXPlayerDeadError,
@@ -123,6 +124,12 @@ def toggle_subtitle(self):
         else:
             self._exec_command('hide_subtitles')
 
+    def increase_subtitle_delay(self):
+        self._exec_command('action', keys.INCREASE_SUBTITLE_DELAY)
+
+    def decrease_subtitle_delay(self):
+        self._exec_command('action', keys.DECREASE_SUBTITLE_DELAY)
+
     def change_volume(self, increase):
         with self._cv:
             volume = self._volume

diff --git a/OpenCast/server.py b/OpenCast/server.py
@@ -100,6 +100,10 @@ def _subtitle(self):
         logger.debug("Subtitle command received: {}".format(action))
         if action == 'toggle':
             self._controller.toggle_subtitle()
+        elif action == 'increase':
+            self._controller.shift_subtitle(True)
+        elif action == 'decrease':
+            self._controller.shift_subtitle(False)
 
     def _running(self):
         return 1

diff --git a/OpenCast/video_controller.py b/OpenCast/video_controller.py
@@ -54,6 +54,12 @@ def play_pause_video(self):
     def toggle_subtitle(self):
         self._player.toggle_subtitle()
 
+    def shift_subtitle(self, increase):
+        if increase:
+            self._player.increase_subtitle_delay()
+        else:
+            self._player.decrease_subtitle_delay()
+
     def change_volume(self, increase):
         self._player.change_volume(increase)
         logger.debug("[controller] change player volume, increase: {}"

diff --git a/static/remote.js b/static/remote.js
@@ -124,4 +124,12 @@ $(function() {
 	$("#toggle-subtitle-btn").click(function() {
 		mkRequest("/subtitle?action=toggle")
 	});
+
+	$("#inc-subtitle-delay").click(function() {
+		mkRequest("/subtitle?action=increase")
+	});
+	$("#dec-subtitle-delay").click(function() {
+		mkRequest("/subtitle?action=decrease")
+	});
+
 });
diff --git a/views/remote.tpl b/views/remote.tpl
@@ -61,10 +61,10 @@
 				<div class='button-line'>
 					<button id="long-backward-btn" class="button-left btn btn-info" type="button" title="Long skip backwards">
 						<span class="glyphicon glyphicon-backward pull-left"></span>
-						<span class="tb">-10 minutes</span>
+						<span class="tb">-5 minutes</span>
 					</button>
 					<button id="long-forward-btn" class="button-right btn btn-info" type="button" title="Long skip backwards">
-						<span class="tb">+10 minutes</span>
+						<span class="tb">+5 minutes</span>
 						<span class="glyphicon glyphicon-forward pull-right"></span>
 					</button>
 				</div>
@@ -87,6 +87,17 @@
 					</button>
 				</div>
 
+				<div class='button-line'>
+					<button id="dec-subtitle-delay" class="button-left btn btn-primary" type="button" title="Decrease delay">
+						<span class="glyphicon glyphicon-backward pull-left"></span>
+						<span class="tb">Decrease delay</span>
+					</button>
+					<button id="inc-subtitle-delay" class="button-right btn btn-primary" type="button" title="Increase delay">
+						<span class="tb">Increase delay</span>
+						<span class="glyphicon glyphicon-forward pull-right"></span>
+					</button>
+				</div>
+
 				<!-- History and playlist management -->
 				<div class='button-line'>
 					<button id="history-btn" class="btn btn-warning button-large" type="button" title="History" onClick="showHistory()">