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-05 16:00:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

added a extra list of banks to data object and a new index bank_number to be used all over

Browse Source
This commit is contained in:
langolierz
2018-02-21 08:33:29 +00:00
parent 3729332a3a
commit 495ec8a5e8
8 changed files with 67 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
display_centre/display.py
View File

@@ -7,7 +7,7 @@ class Display(object):
MENU_HEIGHT = 10
SELECTOR_WIDTH = 0.47
ROW_OFFSET = 6.0
VIDEO_DISPLAY_TEXT = ' NOW [{}] {} NEXT [{}] {}'
VIDEO_DISPLAY_TEXT = ' NOW [{}] {} NEXT [{}] {}'
VIDEO_DISPLAY_BANNER_TEXT = ' {} {} {}'
def __init__(self, tk, video_driver, message_handler, data):
@@ -18,6 +18,7 @@ class Display(object):
self.display_mode = "SAMPLER"
self.control_mode = 'PLAYER'
self.bank_number = 0
self.top_menu_index = 0
self.selected_list_index = self.top_menu_index
self.browser_list = self.data.rewrite_browser_list()
@@ -48,7 +49,7 @@ class Display(object):
self.display_text.pack()
def _load_title(self):
self.display_text.insert(END, '================== r_e_c_u_r ================== \n')
self.display_text.insert(END, '================== r_e_c_u_r:beta ============= \n')
self.display_text.tag_add("TITLE", 1.19, 1.28)
def _load_player(self):
@@ -71,20 +72,21 @@ class Display(object):
self._highlight_this_row(self.selected_list_index - self.top_menu_index)
def _load_sampler(self):
bank_data = self.data.get_sampler_data()
bank_data = self.data.get_sampler_data()[self.bank_number]
self.display_text.insert(END, '------------------ <SAMPLER> ------------------ \n')
self.display_text.tag_add("DISPLAY_MODE", 4.19, 4.29)
self.display_text.insert(END, '{:^4} {:<22} {:<4} {:<4} {:<4} \n'.format(
'slot', 'name', 'length', 'start', 'end'))
self.display_text.insert(END, '{:^6} {:<20} {:<4} {:<4} {:<4} \n'.format(
'{}-slot'.format(self.bank_number), 'name', 'length', 'start', 'end'))
for index, slot in enumerate(bank_data):
name_without_extension = slot['name'].rsplit('.',1)[0]
self.display_text.insert(END, '{:^4} {:<22} {:<4} {:<4} {:<4} \n'.format(
index, name_without_extension[0:22], self.format_time_value(slot['length']),
self.format_time_value(slot['start']), self.format_time_value(slot['end'])))
if self.video_driver.current_player.slot_number is '-':
self.selected_list_index = 0
current_bank , current_slot = self.data.split_bankslot_number(self.video_driver.current_player.slot_number)
if current_bank is self.bank_number:
self.selected_list_index = current_slot
else:
self.selected_list_index = self.video_driver.current_player.slot_number
self.selected_list_index = 0
def _load_browser(self):
browser_list = self.data.return_browser_list()
@@ -155,7 +157,7 @@ class Display(object):
time_left = self.format_time_value(end - position)
return self.VIDEO_DISPLAY_BANNER_TEXT.format(time_been, banner, time_left), \
self.VIDEO_DISPLAY_TEXT.format(now_slot, now_status, next_slot, next_status)
' NOW [{}] {} NEXT [{}] {}'.format(now_slot, now_status, next_slot, next_status)
@staticmethod
def create_video_display_banner(start, end, crop_length, position):