eessppeelllloo/r_e_c_u_r
1
0
Fork 0
mirror of https://github.com/cyberboy666/r_e_c_u_r.git synced 2025-12-15 04:40:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

stores bank info in memory on video player

Browse Source
This commit is contained in:
Tim Caldwell
2017-10-12 16:09:37 +13:00
parent aa46b2fa2d
commit 4ebdfc05cc
1 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
video_centre.py
View File

@@ -1,6 +1,8 @@
import time import time
try: try:
from omxdriver import OMXDriver # <== for deving only from omxdriver import OMXDriver # <== for deving only
has_omx = True has_omx = True
except ImportError: except ImportError:
has_omx = False has_omx = False
@@ -8,7 +10,9 @@ from Tkinter import Tk, Canvas
import data_centre import data_centre
logger = data_centre.setup_logging() logger = data_centre.setup_logging()
#layer = 0
# layer = 0
class video_driver(object): class video_driver(object):
@@ -27,7 +31,7 @@ class video_driver(object):
def begin_playing(self): def begin_playing(self):
# TODO: the first clip will be a demo # TODO: the first clip will be a demo
#first_context = '/home/pi/pp_home/media/01_trashpalaceintro.mp4' # first_context = '/home/pi/pp_home/media/01_trashpalaceintro.mp4'
self.current_player.load_content() self.current_player.load_content()
@@ -56,14 +60,14 @@ class video_driver(object):
self.current_player.play_content() self.current_player.play_content()
# self.last_player.exit() # self.last_player.exit()
#next_context = '/home/pi/pp_home/media/samplerloop3s.mp4' # next_context = '/home/pi/pp_home/media/samplerloop3s.mp4'
self.next_player.load_content() self.next_player.load_content()
self.wait_for_next_cycle() self.wait_for_next_cycle()
def wait_for_next_cycle(self): def wait_for_next_cycle(self):
if(self.current_player.is_finished() or self.manual_next): if (self.current_player.is_finished() or self.manual_next):
logger.info('{} is finished'.format(self.current_player.name)) logger.info('{} is finished'.format(self.current_player.name))
self.manual_next = False self.manual_next = False
if self.next_player.is_loaded(): if self.next_player.is_loaded():
@@ -80,7 +84,7 @@ class video_driver(object):
self.widget.after(self.delay, self.wait_for_next_cycle) self.widget.after(self.delay, self.wait_for_next_cycle)
def wait_for_next_load(self): def wait_for_next_load(self):
if(self.next_player.is_loaded()): if (self.next_player.is_loaded()):
self.switch_players() self.switch_players()
self.play_video() self.play_video()
else: else:
@@ -88,8 +92,8 @@ class video_driver(object):
def get_info_for_video_display(self): def get_info_for_video_display(self):
if has_omx: if has_omx:
return self.current_player.bank_number, self.current_player.status, self.next_player.bank_number,\ return self.current_player.bank_number, self.current_player.status, self.next_player.bank_number, \
self.next_player.status, self.current_player.duration, self.current_player.video_length self.next_player.status, self.current_player.duration, self.current_player.video_length
else: else:
return 0, 'test', 1, 'test', 0, 10 return 0, 'test', 1, 'test', 0, 10
@@ -98,10 +102,14 @@ class video_player(object):
def __init__(self, widget, name): def __init__(self, widget, name):
self.widget = widget self.widget = widget
self.name = name self.name = name
self.video_name = ''
self.status = 'UNASSIGNED' self.status = 'UNASSIGNED'
self.bank_number = '-' self.bank_number = '-'
self.position = 0 self.position = 0
self.video_length = 10 self.start = ''
self.end = ''
self.length = 10
self.location = ''
self.omx = OMXDriver(self.widget, '') self.omx = OMXDriver(self.widget, '')
@@ -125,22 +133,30 @@ class video_player(object):
def load_content(self): def load_content(self):
self.status = 'LOADING' self.status = 'LOADING'
next_context = data_centre.get_next_context() self.get_context_for_this_player()
logger.info('{} is loading now {}'.format( logger.info('{} is loading now {}'.format(
self.name, next_context['location'])) self.name,self.location ))
self.omx.load(next_context['location'], 'after-first-frame', self.omx.load(next_context['location'], 'after-first-frame',
'--win 0,0,400,400 --no-osd', '') '--win 0,0,400,400 --no-osd', '')
def reload_content(self): def get_context_for_this_player(self):
self.status = 'RELOADING' next_context = data_centre.get_next_context()
if self.is_loaded(): self.location = next_context['location']
self.exit() self.length = next_context['location']
else: self.start = next_context['start']
self.widget.after(50,self.reload_content) self.end = next_context['end']
print("trying to reload") self.video_name = next_context['name']
self.load_content()
#layer = layer + 1 def reload_content(self):
self.status = 'RELOADING'
if self.is_loaded():
self.exit()
else:
self.widget.after(50, self.reload_content)
print("trying to reload")
self.load_content()
# layer = layer + 1
def set_to_default(self): def set_to_default(self):
##not used ##not used
@@ -148,7 +164,7 @@ class video_player(object):
self.omx = OMXDriver(self.widget, '') self.omx = OMXDriver(self.widget, '')
def exit(self): def exit(self):
if(self.omx.omx_loaded is not None): if (self.omx.omx_loaded is not None):
logger.info('{} is exiting omx'.format(self.name)) logger.info('{} is exiting omx'.format(self.name))
self.omx.stop() self.omx.stop()
self.omx = OMXDriver(self.widget, '') self.omx = OMXDriver(self.widget, '')
@@ -156,12 +172,12 @@ class video_player(object):
def pause_content(self): def pause_content(self):
self.status = 'PAUSED' self.status = 'PAUSED'
#tk = Tk() # tk = Tk()
#canvas = Canvas(tk,width=500,height=400, bd=0, highlightthickness=0) # canvas = Canvas(tk,width=500,height=400, bd=0, highlightthickness=0)
# canvas.pack() # canvas.pack()
#driver = video_driver(canvas) # driver = video_driver(canvas)
# while True: # while True:
# tk.update() # tk.update()