mirror of
https://github.com/Febbweiss/mopidy-touchscreen.git
synced 2026-03-05 06:35:43 +00:00
Lower CPU usage
Screen will not be always updated
This commit is contained in:
@@ -9,7 +9,7 @@ from pkg_resources import Requirement, resource_filename
|
||||
|
||||
import pygame
|
||||
|
||||
from screens import Keyboard, LibraryScreen, MainScreen, MenuScreen,\
|
||||
from screens import BaseScreen, Keyboard, LibraryScreen, MainScreen, MenuScreen,\
|
||||
PlaylistScreen, SearchScreen, Tracklist
|
||||
|
||||
|
||||
@@ -24,6 +24,7 @@ menu_index = 5
|
||||
|
||||
|
||||
class ScreenManager():
|
||||
|
||||
def __init__(self, size, core, cache):
|
||||
self.core = core
|
||||
self.cache = cache
|
||||
@@ -40,6 +41,7 @@ class ScreenManager():
|
||||
self.down_bar_objects = ScreenObjectsManager()
|
||||
self.down_bar = None
|
||||
self.keyboard = None
|
||||
self.update_type = BaseScreen.update_all
|
||||
|
||||
self.init_manager(size)
|
||||
|
||||
@@ -51,8 +53,8 @@ class ScreenManager():
|
||||
Requirement.parse("mopidy-touchscreen"),
|
||||
"mopidy_touchscreen/icomoon.ttf")
|
||||
self.fonts['base'] = pygame.font.SysFont("arial",
|
||||
self.base_size)
|
||||
self.fonts['icon'] = pygame.font.Font(font, self.base_size)
|
||||
int(self.base_size*0.9))
|
||||
self.fonts['icon'] = pygame.font.Font(font, int(self.base_size*0.9))
|
||||
try:
|
||||
self.screens = [
|
||||
SearchScreen(size, self.base_size, self, self.fonts),
|
||||
@@ -131,15 +133,44 @@ class ScreenManager():
|
||||
self.screens[menu_index].check_connection()
|
||||
self.change_screen(self.current_screen)
|
||||
|
||||
def update(self):
|
||||
surface = self.background.draw_background()
|
||||
if self.keyboard:
|
||||
self.keyboard.update(surface)
|
||||
self.update_type = BaseScreen.update_all
|
||||
|
||||
def get_update_type(self):
|
||||
if self.update_type == BaseScreen.update_all:
|
||||
self.update_type = BaseScreen.no_update
|
||||
return BaseScreen.update_all
|
||||
else:
|
||||
self.screens[self.current_screen].update(surface)
|
||||
surface.blit(self.down_bar, (0, self.base_size * 7))
|
||||
self.down_bar_objects.render(surface)
|
||||
return surface
|
||||
if self.keyboard:
|
||||
return BaseScreen.no_update
|
||||
else:
|
||||
if self.background.should_update():
|
||||
return BaseScreen.update_all
|
||||
else:
|
||||
if self.screens[self.current_screen].should_update():
|
||||
return BaseScreen.update_partial
|
||||
else:
|
||||
return BaseScreen.no_update
|
||||
|
||||
def update(self, screen):
|
||||
update_type = self.get_update_type()
|
||||
if update_type != BaseScreen.no_update:
|
||||
rects = []
|
||||
surface = self.background.draw_background()
|
||||
if self.keyboard:
|
||||
self.keyboard.update(surface)
|
||||
else:
|
||||
self.screens[self.current_screen].\
|
||||
update(surface, update_type, rects)
|
||||
surface.blit(self.down_bar, (0, self.base_size * 7))
|
||||
self.down_bar_objects.render(surface)
|
||||
|
||||
if update_type == BaseScreen.update_all or len(rects) < 1:
|
||||
screen.blit(surface, (0, 0))
|
||||
pygame.display.flip()
|
||||
else:
|
||||
for rect in rects:
|
||||
screen.blit(surface, rect, area=rect)
|
||||
pygame.display.update(rects)
|
||||
|
||||
def track_started(self, track):
|
||||
self.track = track
|
||||
@@ -157,6 +188,7 @@ class ScreenManager():
|
||||
self.keyboard.touch_event(event)
|
||||
elif not self.manage_event(event):
|
||||
self.screens[self.current_screen].touch_event(event)
|
||||
self.update_type = BaseScreen.update_all
|
||||
|
||||
def manage_event(self, event):
|
||||
if event.type == InputManager.click:
|
||||
@@ -179,19 +211,24 @@ class ScreenManager():
|
||||
|
||||
def volume_changed(self, volume):
|
||||
self.screens[main_screen_index].volume_changed(volume)
|
||||
self.update_type = BaseScreen.update_all
|
||||
|
||||
def playback_state_changed(self, old_state, new_state):
|
||||
self.screens[main_screen_index].playback_state_changed(
|
||||
old_state, new_state)
|
||||
self.update_type = BaseScreen.update_all
|
||||
|
||||
def mute_changed(self, mute):
|
||||
self.screens[main_screen_index].mute_changed(mute)
|
||||
self.update_type = BaseScreen.update_all
|
||||
|
||||
def tracklist_changed(self):
|
||||
self.screens[tracklist_index].tracklist_changed()
|
||||
self.update_type = BaseScreen.update_all
|
||||
|
||||
def options_changed(self):
|
||||
self.screens[main_screen_index].options_changed()
|
||||
self.update_type = BaseScreen.update_all
|
||||
|
||||
def change_screen(self, new_screen):
|
||||
if new_screen > -1 and new_screen < len(self.screens):
|
||||
@@ -200,6 +237,7 @@ class ScreenManager():
|
||||
self.current_screen = new_screen
|
||||
self.down_bar_objects.get_touch_object(
|
||||
"menu_" + str(new_screen)).set_active(True)
|
||||
self.update_type = BaseScreen.update_all
|
||||
|
||||
def click_on_objects(self, objects, event):
|
||||
if objects is not None:
|
||||
@@ -211,23 +249,30 @@ class ScreenManager():
|
||||
|
||||
def playlists_loaded(self):
|
||||
self.screens[playlist_index].playlists_loaded()
|
||||
self.update_type = BaseScreen.update_all
|
||||
|
||||
def set_connection(self, connection, loading):
|
||||
self.screens[main_screen_index].set_connection(connection,
|
||||
loading)
|
||||
self.update_type = BaseScreen.update_all
|
||||
|
||||
def check_connection(self):
|
||||
self.screens[menu_index].check_connection()
|
||||
self.update_type = BaseScreen.update_all
|
||||
|
||||
def search(self, query, mode):
|
||||
self.screens[search_index].search(query, mode)
|
||||
self.update_type = BaseScreen.update_all
|
||||
|
||||
def resize(self, event):
|
||||
self.init_manager(event.size)
|
||||
self.update_type = BaseScreen.update_all
|
||||
|
||||
def open_keyboard(self, input_listener):
|
||||
self.keyboard = Keyboard(self.size, self.base_size, self,
|
||||
self.fonts, input_listener)
|
||||
self.update_type = BaseScreen.update_all
|
||||
|
||||
def close_keyboard(self):
|
||||
self.keyboard = None
|
||||
self.update_type = BaseScreen.update_all
|
||||
|
||||
Reference in New Issue
Block a user