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

fixed 000 issue

Browse Source
This commit is contained in:
langolierz
2018-02-08 07:31:18 +00:00
parent 45060598a2
commit 9a5cfadec5
7 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data_centre/json_objects/display_data.json
View File

@@ -1 +1 @@
[{"name": "mushroom-dreams.mp4", "end": -1, "start": 340.722063, "length": 1132.04, "location": "/media/pi/TIM/videos_to_play/mushroom-dreams.mp4"}, {"name": "samplerloop3s3.mp4", "end": -1, "start": 1.750672, "length": 3.008, "location": "/media/pi/TIM/samplerloop3s3.mp4"}, {"name": "long_spinning.mp4", "end": -1, "start": -1, "length": 804.245, "location": "/media/pi/TIM/videos_to_play/long_spinning.mp4"}, {"name": "colour_pixel_02.mp4", "end": 68.500718, "start": 66.892487, "length": 87.04, "location": "/media/pi/TIM/videos_to_play/colour_pixel_02.mp4"}, {"name": "", "end": -1, "start": -1, "length": -1, "location": ""}, {"name": "", "end": -1, "start": -1, "length": -1, "location": ""}, {"name": "", "end": -1, "start": -1, "length": -1, "location": ""}, {"name": "", "end": -1, "start": -1, "length": -1, "location": ""}, {"name": "", "end": -1, "start": -1, "length": -1, "location": ""}, {"name": "", "end": -1, "start": -1, "length": -1, "location": ""}]
[{"start": 607.690078, "end": 610.079466, "length": 1132.04, "name": "mushroom-dreams.mp4", "location": "/media/pi/TIM/videos_to_play/mushroom-dreams.mp4"}, {"start": -1, "end": -1, "length": 3.008, "name": "samplerloop3s3.mp4", "location": "/media/pi/TIM/samplerloop3s3.mp4"}, {"start": -1, "end": -1, "length": 804.245, "name": "long_spinning.mp4", "location": "/media/pi/TIM/videos_to_play/long_spinning.mp4"}, {"start": 66.892487, "end": 68.500718, "length": 87.04, "name": "colour_pixel_02.mp4", "location": "/media/pi/TIM/videos_to_play/colour_pixel_02.mp4"}, {"end": -1, "start": -1, "length": 52.757, "name": "colour_pixel_03.mp4", "location": "/media/pi/TIM/videos_to_play/colour_pixel_03.mp4"}, {"end": -1, "start": -1, "length": 52.757, "name": "colour_pixel_03.mp4", "location": "/media/pi/TIM/videos_to_play/colour_pixel_03.mp4"}, {"end": -1, "start": -1, "length": 52.757, "name": "colour_pixel_03.mp4", "location": "/media/pi/TIM/videos_to_play/colour_pixel_03.mp4"}, {"end": -1, "start": -1, "length": 52.757, "name": "colour_pixel_03.mp4", "location": "/media/pi/TIM/videos_to_play/colour_pixel_03.mp4"}, {"end": -1, "start": -1, "length": 52.757, "name": "colour_pixel_03.mp4", "location": "/media/pi/TIM/videos_to_play/colour_pixel_03.mp4"}, {"end": -1, "start": -1, "length": 52.757, "name": "colour_pixel_03.mp4", "location": "/media/pi/TIM/videos_to_play/colour_pixel_03.mp4"}]

2
data_centre/json_objects/next_slot_number.json
View File

@@ -1 +1 @@
0
4

3
display_centre/display.py
View File

@@ -76,8 +76,9 @@ class Display(object):
self.display_text.insert(END, '{:^4} {:<22} {:<4} {:<4} {:<4} \n'.format(
'slot', '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, slot['name'][0:22], self.format_time_value(slot['length']),
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

BIN
documentation/browser_example.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 48 KiB

BIN
documentation/sampler_example.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

BIN
documentation/settings_example.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

69
user_input/numpad_input.py
View File

@@ -9,10 +9,8 @@ class NumpadInput(object):
self.actions = actions
self.key_mappings = data.get_keypad_mapping_data()
self.bind_actions()
self.last_0_press_time = datetime.datetime.now()
self.last_0_difference = 2000
self.number_of_0_represses = 0
self.is_triple = False
self.in_0_event = False
self.additional_0_in_event = 0
def bind_actions(self):
self.display.display_text.bind("<Key>", self.on_key_press)
@@ -20,14 +18,19 @@ class NumpadInput(object):
def on_key_press(self, event):
numpad = list(string.ascii_lowercase[0:19])
if event.char is 's':
self.on_0_press()
if event.char is '.':
self.actions.quit_the_program()
if event.char is 's':
event.char = self.on_0_key_press()
elif event.char in numpad:
this_mapping = self.key_mappings[event.char]
self.run_action_for_mapped_key(event.char)
else:
print('{} is not in keypad map'.format(event.char))
def run_action_for_mapped_key(self, key):
this_mapping = self.key_mappings[key]
if self.display.display_mode in this_mapping:
mode = self.display.display_mode
elif 'DEFAULT' in this_mapping:
@@ -41,33 +44,31 @@ class NumpadInput(object):
getattr(self.actions, this_mapping[mode][0])()
self.display.refresh_display()
def on_0_key_press(self) :
if(not self.in_0_event ):
self.in_0_event = True
self.additional_0_in_event = 0
self.root.after(600, self.check_event_outcome)
else:
print('{} is not in keypad map'.format(event.char))
self.additional_0_in_event = self.additional_0_in_event + 1
def on_0_press(self):
this_press_time = datetime.datetime.now()
print('the last 0 press was at {}'.format(self.last_0_press_time))
self.last_0_difference = this_press_time - self.last_0_press_time
print('the difference between last and now is {}'.format(self.last_0_difference))
print('the total dif in secs is {}.'.format(self.last_0_difference.total_seconds()))
self.last_0_press_time = this_press_time
if (self.last_0_difference.total_seconds() < 0.7):
self.number_of_0_represses = self.number_of_0_represses + 1
self.last_0_press_time = this_press_time
self.root.after(1000, self.respond_to_0_press)
def check_event_outcome(self):
if(self.additional_0_in_event == 0 ):
self.in_0_event = False
self.run_action_for_mapped_key('s')
elif(self.additional_0_in_event > 1):
self.in_0_event = False
self.run_action_for_mapped_key('n')
elif(self.additional_0_in_event == 1):
print('this doesnt happen - may not be needed')
self.root.after(600, self.second_check_event_outcome)
def respond_to_0_press(self):
print('current represses is {},.'.format(self.number_of_0_represses))
if(self.number_of_0_represses == 0):
print('doing single action now')
elif(self.number_of_0_represses == 1):
print('waiting for another...')
elif(self.number_of_0_represses == 2):
print('doing triple action now')
self.number_of_0_represses = -10
self.root.after(1000, self.set_represses_to_0)
def set_represses_to_0(self):
print('clearing repress from {}'.format(self.number_of_0_represses))
self.number_of_0_represses = 0
def second_check_event_outcome(self):
if(self.additional_0_in_event == 1 ):
self.in_0_event = False
self.run_action_for_mapped_key('s')
elif(self.additional_0_in_event > 1):
self.in_0_event = False
self.run_action_for_mapped_key('n')