From bc8707f47cbdd2c59001ab9a8b649f901e5536ee Mon Sep 17 00:00:00 2001 From: langolierz Date: Sat, 6 Jan 2018 00:40:16 +0000 Subject: [PATCH] get refactor working on the pi --- data_centre/data.py | 2 +- data_centre/json_objects/settings.json | 2 +- display_centre/display.py | 3 +-- video_centre/video_driver.py | 7 ++++--- video_centre/video_player.py | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data_centre/data.py b/data_centre/data.py index 1bbb7f7..d30e928 100644 --- a/data_centre/data.py +++ b/data_centre/data.py @@ -14,7 +14,7 @@ BANK_DATA_JSON = 'display_data.json' NEXT_SLOT_JSON = 'next_bank_number.json' SETTINGS_JSON = 'settings.json' EMPTY_BANK = dict(name='', location='', length=-1, start=-1, end=-1) -PATH_TO_DATA_OBJECTS = '{}\\json_objects\\'.format(get_the_current_dir_path()) +PATH_TO_DATA_OBJECTS = '{}/json_objects/'.format(get_the_current_dir_path()) def read_json(file_name): with open(PATH_TO_DATA_OBJECTS + file_name) as data_file: diff --git a/data_centre/json_objects/settings.json b/data_centre/json_objects/settings.json index 5e0f0ac..4d14cfc 100644 --- a/data_centre/json_objects/settings.json +++ b/data_centre/json_objects/settings.json @@ -1 +1 @@ -[{"value": "RANDOM", "name": "PLAYBACK_MODE"}, {"value": "[1,1,1,4,1,2,1,4]", "name": "PLAYLIST"}, {"value": "ON", "name": "SYNC_LENGTHS"}, {"value": "00:08", "name": "SYNC_LENGTHS_TO"}, {"value": "ON", "name": "RAND_START"}, {"value": "COMPOSITE", "name": "VIDEO_OUTPUT"}, {"value": "ON", "name": "DEV_MODE"}] \ No newline at end of file +[{"name": "PLAYBACK_MODE", "value": "SAMPLER"}, {"name": "PLAYLIST", "value": "[1,1,1,4,1,2,1,4]"}, {"name": "SYNC_LENGTHS", "value": "OFF"}, {"name": "SYNC_LENGTHS_TO", "value": "00:08"}, {"name": "RAND_START", "value": "OFF"}, {"name": "VIDEO_OUTPUT", "value": "COMPOSITE"}, {"name": "DEV_MODE", "value": "ON"}] \ No newline at end of file diff --git a/display_centre/display.py b/display_centre/display.py index 9b05bb9..cb6400d 100644 --- a/display_centre/display.py +++ b/display_centre/display.py @@ -66,7 +66,6 @@ class Display(object): else: self._load_sampler() self.display_text.tag_add("COLUMN_NAME", 5.0, 6.0) - print('selected_list_index:{}, top_menu_index:{}'.format(self.selected_list_index, self.top_menu_index)) self._highlight_this_row(self.selected_list_index - self.top_menu_index) def _load_sampler(self): @@ -170,7 +169,7 @@ class Display(object): def _update_screen_every_second(self): self.refresh_display() - self.tk.after(1000, self._update_screen_every_second) + self.tk.after(500, self._update_screen_every_second) def refresh_display(self): self.display_text.configure(state='normal') diff --git a/video_centre/video_driver.py b/video_centre/video_driver.py index 34492b8..6aaae65 100644 --- a/video_centre/video_driver.py +++ b/video_centre/video_driver.py @@ -8,10 +8,11 @@ class VideoDriver(object): self.data = data self.delay = 5 self.has_omx = self.data.has_omx + print(self.has_omx) if self.has_omx: - self.last_player = video_player(self.root, 'a.a') - self.current_player = video_player(self.root, 'b.b') - self.next_player = video_player(self.root, 'c.c') + self.last_player = video_player(self.root, self.message_handler, self.data, 'a.a') + self.current_player = video_player(self.root,self.message_handler, self.data, 'b.b') + self.next_player = video_player(self.root, self.message_handler, self.data, 'c.c') self.manual_next = False self.print_status() self.root.after(self.delay, self.begin_playing) diff --git a/video_centre/video_player.py b/video_centre/video_player.py index 18afbc7..97da570 100644 --- a/video_centre/video_player.py +++ b/video_centre/video_player.py @@ -22,7 +22,7 @@ class video_player: self.end = -1.0 self.length = 0.0 self.location = '' - self.arguments = ['--no-osd', '--win', screen_size, '--alpha', '0'] + self.arguments = ['--no-osd', '--win', self.screen_size, '--alpha', '0'] def load(self): self.get_context_for_player() @@ -86,7 +86,7 @@ class video_player: return -1 def get_context_for_player(self): - next_context = data_centre.get_next_context() + next_context = self.data.get_next_context() self.location = next_context['location'] self.duration = next_context['length'] self.start = next_context['start'] @@ -105,7 +105,7 @@ class video_player: self.set_position(after_seek_position) #self.player.seek(amount) else: - data_centre.set_message('INFO', 'can not seek outside range') + self.message_handler.set_message('INFO', 'can not seek outside range') def set_position(self, position): self.omx_player.set_position(position)