diff --git a/.gitignore b/.gitignore index 939db29..33ddfa1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.pyc -*.log \ No newline at end of file +*.log +.vscode \ No newline at end of file diff --git a/display_centre.py b/display_centre.py index a6c7ff6..e46f30d 100644 --- a/display_centre.py +++ b/display_centre.py @@ -11,10 +11,16 @@ import data_centre # logger = data_centre.setup_logging() tk = Tk() + +label1Text = StringVar() +label1Text.set('blah') # tk.withdraw() -canvas = Frame(tk, width=500, height=400) +frame = Frame(tk, width=500, height=400) # data = data_centre.data() -video_driver = video_centre.video_driver(canvas) +label = Label(tk, textvariable=label1Text) +video_driver = video_centre.video_driver(frame) + +label.pack() def key(event): print "pressed", repr(event.char) @@ -24,13 +30,16 @@ def key(event): data_centre.update_next_bank_number(int(event.char)) video_driver.next_player.reload_content() -canvas.bind("", key) - -canvas.pack() -canvas.focus_set() +def update_current_time(): + label1Text.set(video_driver.current_player.omx.get_position()) + tk.after(500, update_current_time) +frame.bind("", key) +frame.pack() +frame.focus_set() +tk.after(500, update_current_time) tk.mainloop() # try: # # video_driver = video_centre.video_driver(canvas) diff --git a/next_bank_number.json b/next_bank_number.json index d8263ee..56a6051 100644 --- a/next_bank_number.json +++ b/next_bank_number.json @@ -1 +1 @@ -2 \ No newline at end of file +1 \ No newline at end of file diff --git a/video_centre.py b/video_centre.py index 513f957..744dc55 100644 --- a/video_centre.py +++ b/video_centre.py @@ -123,20 +123,20 @@ class video_player(object): def load_content(self): self.status = 'LOADING' next_context = data_centre.get_next_context() - logger.info('{} is loading now {}'.format(self.name, next_context['location'])) + 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', '') def reload_content(self): self.status = 'RELOADING' - if self.omx.omx_loaded and self.is_loaded(): + 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):