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-13 03:40:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

adding reload on button press

Browse Source
This commit is contained in:
Tim Caldwell
2017-10-12 13:59:30 +13:00
parent 8d85515a20
commit ee076a732d
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
display_centre.py
View File

@@ -14,20 +14,21 @@ tk = Tk()
# tk.withdraw() # tk.withdraw()
canvas = Frame(tk, width=500, height=400) canvas = Frame(tk, width=500, height=400)
# data = data_centre.data() # data = data_centre.data()
video_driver = video_centre.video_driver(canvas)
def key(event): def key(event):
print "pressed", repr(event.char) print "pressed", repr(event.char)
if(event.char in ['0','1','2'] ): if(event.char in ['0','1','2'] ):
print 'updating next bank' print 'updating next bank'
data_centre.update_next_bank_number(int(event.char)) data_centre.update_next_bank_number(int(event.char))
video_driver.next_player.load_content()
canvas.bind("<Key>", key) canvas.bind("<Key>", key)
canvas.pack() canvas.pack()
canvas.focus_set() canvas.focus_set()
video_driver = video_centre.video_driver(canvas)
tk.mainloop() tk.mainloop()
# try: # try:

21
video_centre.py
View File

@@ -27,11 +27,10 @@ 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 = data_centre.get_next_context()
#first_context = '/home/pi/pp_home/media/01_trashpalaceintro.mp4' #first_context = '/home/pi/pp_home/media/01_trashpalaceintro.mp4'
logger.info(first_context['location'])
print(first_context['location']) print(first_context['location'])
self.current_player.load_content(first_context['location']) self.current_player.load_content()
self.wait_for_first_load() self.wait_for_first_load()
@@ -58,9 +57,8 @@ class video_driver(object):
self.current_player.play_content() self.current_player.play_content()
# self.last_player.exit() # self.last_player.exit()
next_context = data_centre.get_next_context()
#next_context = '/home/pi/pp_home/media/samplerloop3s.mp4' #next_context = '/home/pi/pp_home/media/samplerloop3s.mp4'
self.next_player.load_content(next_context['location']) self.next_player.load_content()
self.wait_for_next_cycle() self.wait_for_next_cycle()
@@ -124,15 +122,22 @@ class video_player(object):
self.omx.pause_before_play_required = 'no' self.omx.pause_before_play_required = 'no'
self.omx.show(True, 0) self.omx.show(True, 0)
def load_content(self, context): def load_content(self):
self.status = 'LOADING' self.status = 'LOADING'
logger.info('{} is loading now {}'.format(self.name, context)) next_context = data_centre.get_next_context()
self.omx.load(context, 'after-first-frame', logger.info('{} is loading now {}'.format(self.name, next_context['location']))
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):
self.exit()
self.load_content()
#layer = layer + 1 #layer = layer + 1
def set_to_default(self): def set_to_default(self):
##not used
self.omx.kill() self.omx.kill()
self.omx = OMXDriver(self.widget, '') self.omx = OMXDriver(self.widget, '')