Febbweiss/mopidy-touchscreen
1
0
Fork 0
mirror of https://github.com/Febbweiss/mopidy-touchscreen.git synced 2026-03-04 22:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lower CPU usage

Browse Source 
Screen will not be always updated
This commit is contained in:
Ander
2015-05-19 17:04:47 +02:00
parent 2ee9d41393
commit e98e198224
17 changed files with 325 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mopidy_touchscreen/screens/__init__.py
View File

@@ -1,4 +1,5 @@
# flake8: noqa
from base_screen import BaseScreen
from library_screen import LibraryScreen
from keyboard_screen import Keyboard
from main_screen import MainScreen

9
mopidy_touchscreen/screens/base_screen.py
View File

@@ -1,12 +1,16 @@
class BaseScreen():
update_all = 0
update_partial = 1
no_update = 2
def __init__(self, size, base_size, manager, fonts):
self.size = size
self.base_size = base_size
self.manager = manager
self.fonts = fonts
def update(self, surface):
def update(self, surface, update_type, rects):
pass
def event(self, event):
@@ -14,3 +18,6 @@ class BaseScreen():
def change_screen(self, direction):
return False
def should_update(self):
return BaseScreen.update_partial

107
mopidy_touchscreen/screens/keyboard_screen.py
View File

@@ -13,20 +13,24 @@ class Keyboard(BaseScreen):
self.base_height = size[1]/5
self.listener = listener
self.manager = manager
try:
self.font is None
except AttributeError:
self.font = pygame.font.SysFont("arial", size[1]/6)
self.selected_row = 0
self.selected_col = 0
self.selected_others = -1
self.font = pygame.font.SysFont("arial", size[1]/6)
self.keyboards = [ScreenObjectsManager(), ScreenObjectsManager()]
self.other_objects = ScreenObjectsManager()
self.current_keyboard = 0
rows = [['q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p'],
['a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', '-'],
[',', 'z', 'x', 'c', 'v', 'b', 'n', 'm', '.', '_']]
self.keys = [[['q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p'],
['a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', '-'],
[',', 'z', 'x', 'c', 'v', 'b', 'n', 'm', '.', '_']],
[['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'],
['!', '@', '#', '$', '%', '&', '/', '(', ')', '='],
['?', '{', '}', '_', '[', ']', '+', '<', '>', '*']]]
line = self.base_height
for row in rows:
for row in self.keys[self.current_keyboard]:
pos = 0
for key in row:
button = \
@@ -40,11 +44,8 @@ class Keyboard(BaseScreen):
line += self.base_height
self.current_keyboard = 1
rows = [['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'],
['!', '@', '#', '$', '%', '&', '/', '(', ')', '='],
['?', '{', '}', '_', '[', ']', '+', '<', '>', '*']]
line = self.base_height
for row in rows:
for row in self.keys[self.current_keyboard]:
pos = 0
for key in row:
button = \
@@ -91,6 +92,7 @@ class Keyboard(BaseScreen):
(self.base_width*10, self.base_height),
center=True)
self.other_objects.set_object("text", button)
self.change_selected(0, 0)
def update(self, screen):
screen.fill((0, 0, 0))
@@ -107,10 +109,7 @@ class Keyboard(BaseScreen):
touch_event.current_pos)
for key in keys:
if key == 'symbols':
if self.current_keyboard == 0:
self.current_keyboard = 1
else:
self.current_keyboard = 0
self.change_keyboard()
elif key == "remove":
self.other_objects.get_object("text").remove_text(1, False)
elif key == "space":
@@ -120,9 +119,83 @@ class Keyboard(BaseScreen):
self.listener.text_input(text)
self.manager.close_keyboard()
elif touch_event.type == InputManager.key:
if len(touch_event.unicode):
if isinstance(touch_event.unicode, unicode):
if touch_event.unicode == u'\x08':
self.other_objects.get_object("text").remove_text(1, False)
else:
self.other_objects.get_object("text").add_text(
touch_event.unicode, False)
elif touch_event.direction is not None:
x = 0
y = 0
if touch_event.direction == InputManager.left:
x = -1
elif touch_event.direction == InputManager.right:
x = 1
elif touch_event.direction == InputManager.up:
y = -1
elif touch_event.direction == InputManager.down:
y = 1
self.change_selected(x, y)
def change_keyboard(self):
if self.current_keyboard == 0:
self.current_keyboard = 1
else:
self.current_keyboard = 0
if self.selected_others < 0:
self.change_selected(0, 0)
def change_selected(self, x, y):
if self.selected_others < 0:
self.selected_row += x
if self.selected_row < 0:
self.selected_row = 0
elif self.selected_row > 9:
self.selected_row = 9
self.selected_col += y
if self.selected_col < 0:
self.selected_col = 0
elif self.selected_col > 2:
if self.selected_col < 2:
self.selected_others = 0
elif self.selected_col < 8:
self.selected_others = 1
else:
self.selected_others = 2
self.set_selected_other()
if self.selected_others < 0:
key = self.keys[self.current_keyboard]
[self.selected_col][self.selected_row]
self.keyboards[self.current_keyboard].set_selected(key)
else:
self.keyboards[0].set_selected(None)
self.keyboards[0].set_selected(None)
else:
if y < 0:
self.selected_others = -1
self.set_selected_other()
self.selected_col = 2
self.selected_row = 0
key = self.keys[self.current_keyboard]
[self.selected_col][self.selected_row]
self.keyboards[self.current_keyboard].set_selected(key)
else:
self.selected_others += x
if self.selected_others < 0:
self.selected_others = 0
elif self.selected_others > 3:
self.selected_others = 3
self.set_selected_other()
def set_selected_other(self):
key = None
if self.selected_others == 0:
key = "symbols"
elif self.selected_others == 1:
key = "remove"
elif self.selected_others == 2:
key = "space"
elif self.selected_others == 3:
key = "ok"
self.other_objects.set_selected(key)

8
mopidy_touchscreen/screens/library_screen.py
View File

@@ -37,8 +37,12 @@ class LibraryScreen(BaseScreen):
self.current_directory = directory
self.browse_uri(directory)
def update(self, screen):
self.list_view.render(screen)
def should_update(self):
return self.list_view.should_update()
def update(self, screen, update_type, rects):
update_all = (update_type == BaseScreen.update_all)
self.list_view.render(screen, update_all, rects)
def touch_event(self, touch_event):
clicked = self.list_view.touch_event(touch_event)

71
mopidy_touchscreen/screens/main_screen.py
View File

@@ -31,7 +31,9 @@ class MainScreen(BaseScreen):
self.cache = cache
self.image = None
self.artists = None
self.update_next_frame = True
self.background = background
self.update_keys = []
self.current_track_pos = 0
self.track_duration = "00:00"
self.touch_text_manager = ScreenObjectsManager()
@@ -89,29 +91,51 @@ class MainScreen(BaseScreen):
self.touch_text_manager.set_touch_object("volume", progress)
progress.set_value(self.core.playback.volume.get())
def update(self, screen):
screen.blit(self.top_bar, (0, 0))
if self.track is not None:
def should_update(self):
if len(self.update_keys) > 0:
return True
else:
track_pos_millis = self.core.playback.time_position.get()
new_track_pos = track_pos_millis / 1000
self.touch_text_manager.get_touch_object(
"time_progress").set_value(
track_pos_millis)
if new_track_pos != self.current_track_pos:
return True
else:
return False
def update(self, screen, update_type, rects):
if update_type == BaseScreen.update_all:
screen.blit(self.top_bar, (0, 0))
self.touch_text_manager.render(screen)
if self.image is not None:
screen.blit(self.image, (
self.base_size / 2, self.base_size +
self.base_size / 2))
elif update_type == BaseScreen.update_partial \
and self.track is not None:
track_pos_millis = self.core.playback.time_position.get()
new_track_pos = track_pos_millis / 1000
if new_track_pos != self.current_track_pos:
progress = self.touch_text_manager.get_touch_object(
"time_progress")
progress.set_value(track_pos_millis)
self.current_track_pos = new_track_pos
self.touch_text_manager.get_touch_object(
"time_progress").set_text(
progress.set_text(
time.strftime('%M:%S', time.gmtime(
self.current_track_pos)) +
"/" + self.track_duration)
if self.image is not None:
screen.blit(self.image, (
self.base_size / 2, self.base_size +
self.base_size / 2))
self.touch_text_manager.render(screen)
return screen
progress.render(screen)
rects.append(progress.rect_in_pos)
for key in self.update_keys:
object = self.touch_text_manager.get_touch_object(key)
object.update()
object.render(screen)
rects.append(object.rect_in_pos)
def track_started(self, track):
self.update_keys = []
self.image = None
x = self.base_size * 5
width = self.size[0] - self.base_size / 2 - x
@@ -128,6 +152,8 @@ class MainScreen(BaseScreen):
label = TouchAndTextItem(self.fonts['base'],
MainScreen.get_track_name(track),
(x, self.base_size * 2), (width, -1))
if not label.fit_horizontal:
self.update_keys.append("track_name")
self.touch_text_manager.set_touch_object("track_name", label)
# Album name
@@ -135,6 +161,8 @@ class MainScreen(BaseScreen):
MainScreen.get_track_album_name
(track), (x, self.base_size * 3),
(width, -1))
if not label.fit_horizontal:
self.update_keys.append("album_name")
self.touch_text_manager.set_touch_object("album_name", label)
# Artist
@@ -142,6 +170,8 @@ class MainScreen(BaseScreen):
self.get_artist_string(),
(x, self.base_size * 4),
(width, -1))
if not label.fit_horizontal:
self.update_keys.append("artist_name")
self.touch_text_manager.set_touch_object("artist_name", label)
# Previous track button
@@ -251,6 +281,8 @@ class MainScreen(BaseScreen):
(self.base_size / 2,
self.base_size * 2),
(width, -1))
if not current.fit_horizontal:
self.update_keys.append("track_name")
self.touch_text_manager.set_touch_object("track_name",
current)
@@ -260,6 +292,8 @@ class MainScreen(BaseScreen):
(self.base_size / 2,
self.base_size * 3),
(width, -1))
if not current.fit_horizontal:
self.update_keys.append("album_name")
self.touch_text_manager.set_touch_object("album_name",
current)
@@ -268,11 +302,15 @@ class MainScreen(BaseScreen):
(self.base_size / 2,
self.base_size * 4),
(width, -1))
if not current.fit_horizontal:
self.update_keys.append("artist_name")
self.touch_text_manager.set_touch_object("artist_name",
current)
self.background.set_background_image(None)
def track_playback_ended(self, tl_track, time_position):
self.background.set_target_color(None, None)
self.background.set_background_image(None)
self.image = None
self.track_duration = "00:00"
@@ -306,9 +344,8 @@ class MainScreen(BaseScreen):
self.get_image_file_name())
image = pygame.transform.scale(image_original, (size, size))
image = image.convert()
self.background.set_target_color(pygame.transform.average_color(image),
image_original)
self.image = image
self.background.set_background_image(image_original)
def touch_event(self, event):
if event.type == InputManager.click:

8
mopidy_touchscreen/screens/menu_screen.py
View File

@@ -16,8 +16,12 @@ class MenuScreen(BaseScreen):
self.list.set_list(self.list_items)
def update(self, screen):
self.list.render(screen)
def should_update(self):
return self.list.should_update()
def update(self, screen, update_type, rects):
update_all = (update_type == BaseScreen.update_all)
self.list.render(screen, update_all, rects)
def touch_event(self, event):
clicked = self.list.touch_event(event)

8
mopidy_touchscreen/screens/playlist_screen.py
View File

@@ -17,8 +17,12 @@ class PlaylistScreen(BaseScreen):
self.playlist_tracks_strings = []
self.playlists_loaded()
def update(self, screen):
self.list_view.render(screen)
def should_update(self):
return self.list_view.should_update()
def update(self, screen, update_type, rects):
update_all = (update_type == BaseScreen.update_all)
self.list_view.render(screen, update_all, rects)
def playlists_loaded(self):
self.selected_playlist = None

8
mopidy_touchscreen/screens/search_screen.py
View File

@@ -73,10 +73,14 @@ class SearchScreen(BaseScreen):
self.set_mode(mode=mode_track_name)
self.set_query("Search")
def update(self, screen):
def should_update(self):
return self.list_view.should_update()
def update(self, screen, update_type, rects):
screen.blit(self.top_bar, (0, 0))
self.screen_objects.render(screen)
self.list_view.render(screen)
update_all = (update_type == BaseScreen.update_all)
self.list_view.render(screen, update_all, rects)
def set_mode(self, mode=mode_track_name):
if mode is not self.mode:

8
mopidy_touchscreen/screens/tracklist.py
View File

@@ -19,8 +19,12 @@ class Tracklist(BaseScreen):
self.track_started(
self.manager.core.playback.current_tl_track.get())
def update(self, screen):
self.list_view.render(screen)
def should_update(self):
return self.list_view.should_update()
def update(self, screen, update_type, rects):
update_all = (update_type == BaseScreen.update_all)
self.list_view.render(screen, update_all, rects)
def tracklist_changed(self):
self.update_list()