From 176ac1cc022cb062721704d651922a757e212758 Mon Sep 17 00:00:00 2001
From: langolierz <langolierz@gmail.com>
Date: Tue, 26 Dec 2017 03:30:20 +0000
Subject: [PATCH] fixed video position display and ending pause_at_end loop

---
 next_bank_number.json | 2 +-
 omxdriver.py          | 4 +++-
 video_centre.py       | 8 +++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/next_bank_number.json b/next_bank_number.json
index e440e5c..c793025 100644
--- a/next_bank_number.json
+++ b/next_bank_number.json
@@ -1 +1 @@
-3
\ No newline at end of file
+7
\ No newline at end of file
diff --git a/omxdriver.py b/omxdriver.py
index 3cdaba7..55ee76c 100644
--- a/omxdriver.py
+++ b/omxdriver.py
@@ -9,6 +9,7 @@ class omx_driver:
         self.status = 'UNASSIGNED'
         self.duration = 0
         self.dbus_name = dbus_name
+        self.omx_running = True
 
 
     def load(self, location, arguments):
@@ -41,7 +42,7 @@ class omx_driver:
             print('time to end is {}'.format(self.duration - position))
             self.player.pause()
             print('its finished')
-        else:
+        elif(self.omx_running):
             self.root.after(5,self.pause_at_end)
 
     def get_position(self):
@@ -60,4 +61,5 @@ class omx_driver:
 
     def quit(self):
         self.player.quit()
+        self.omx_running = False
 
diff --git a/video_centre.py b/video_centre.py
index 902770a..6566950 100644
--- a/video_centre.py
+++ b/video_centre.py
@@ -96,8 +96,8 @@ class video_driver(object):
 
     def get_info_for_video_display(self):
         if has_omx:
-            return self.current_player.bank_number, self.current_player.status, self.next_player.bank_number, \
-                self.next_player.status, self.current_player.get_position(), self.current_player.length
+            return self.current_player.bank_number, self.current_player.omx.status, self.next_player.bank_number, \
+                self.next_player.omx.status, self.current_player.get_position(), self.current_player.length
         else:
             return 0, 'test', 1, 'test', 0, 10
 
@@ -128,7 +128,7 @@ class video_player(object):
         return self.omx.status is 'FINISHED'
 
     def get_position(self):
-        if self.is_loaded():
+        if self.omx.status is not 'LOADING':
             return self.omx.get_position()
         else:
             return 0
@@ -172,8 +172,6 @@ class video_player(object):
             print("trying to reload")
         self.load_content()
 
-    # layer = layer + 1
-
     def exit(self):
         try:
             if (self.is_loaded):