From 469cbe2f82f2fd7376566095eafd7717b5b1bd29 Mon Sep 17 00:00:00 2001 From: Ander <9and3r@gmail.com> Date: Thu, 22 Jan 2015 00:27:18 +0100 Subject: [PATCH] Remove screen updated zones (Was not in use) --- mopidy_touchscreen/library_screen.py | 2 +- mopidy_touchscreen/main_screen.py | 2 +- mopidy_touchscreen/menu_screen.py | 2 +- mopidy_touchscreen/playlist_screen.py | 2 +- mopidy_touchscreen/screen_manager.py | 6 +----- mopidy_touchscreen/search_screen.py | 2 +- mopidy_touchscreen/tracklist.py | 2 +- 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/mopidy_touchscreen/library_screen.py b/mopidy_touchscreen/library_screen.py index 7d6b2ba..b32b155 100644 --- a/mopidy_touchscreen/library_screen.py +++ b/mopidy_touchscreen/library_screen.py @@ -44,7 +44,7 @@ class LibraryScreen(BaseScreen): self.current_directory = directory self.browse_uri(directory) - def update(self, screen, update_all): + def update(self, screen): self.list_view.render(screen) def touch_event(self, touch_event): diff --git a/mopidy_touchscreen/main_screen.py b/mopidy_touchscreen/main_screen.py index e09a97f..f60be84 100644 --- a/mopidy_touchscreen/main_screen.py +++ b/mopidy_touchscreen/main_screen.py @@ -84,7 +84,7 @@ class MainScreen(BaseScreen): self.touch_text_manager.set_touch_object("volume", progress) progress.set_value(self.core.playback.volume.get()) - def update(self, screen, update_all): + def update(self, screen): screen.blit(self.top_bar, (0, 0)) if self.track is not None: self.touch_text_manager.get_touch_object( diff --git a/mopidy_touchscreen/menu_screen.py b/mopidy_touchscreen/menu_screen.py index f36f4f2..3ad44d2 100644 --- a/mopidy_touchscreen/menu_screen.py +++ b/mopidy_touchscreen/menu_screen.py @@ -54,7 +54,7 @@ class MenuScreen(BaseScreen): (0, self.base_size * 3), None) self.screen_objects.set_touch_object("ip", button) - def update(self, screen, update_all): + def update(self, screen): self.screen_objects.render(screen) def touch_event(self, event): diff --git a/mopidy_touchscreen/playlist_screen.py b/mopidy_touchscreen/playlist_screen.py index 368186a..a957213 100644 --- a/mopidy_touchscreen/playlist_screen.py +++ b/mopidy_touchscreen/playlist_screen.py @@ -16,7 +16,7 @@ class PlaylistScreen(BaseScreen): self.playlist_tracks = [] self.playlist_tracks_strings = [] - def update(self, screen, update_all): + def update(self, screen): self.list_view.render(screen) def playlists_loaded(self): diff --git a/mopidy_touchscreen/screen_manager.py b/mopidy_touchscreen/screen_manager.py index 01518ef..995368d 100644 --- a/mopidy_touchscreen/screen_manager.py +++ b/mopidy_touchscreen/screen_manager.py @@ -37,7 +37,6 @@ class ScreenManager(): self.size = None self.screens = None self.track = None - self.screen_changed = None self.input_manager = InputManager(size) self.down_bar_objects = ScreenObjectsManager() self.down_bar_solid = None @@ -67,7 +66,6 @@ class ScreenManager(): except: traceback.print_exc() self.track = None - self.screen_changed = True # Menu buttons @@ -137,12 +135,10 @@ class ScreenManager(): surface = pygame.Surface(self.size) self.background.draw_background([surface, self.down_bar_solid]) - self.screens[self.current_screen].update(surface, - self.screen_changed) + self.screens[self.current_screen].update(surface) surface.blit(self.down_bar_solid, (0, self.base_size * 7)) surface.blit(self.down_bar, (0, self.base_size * 7)) self.down_bar_objects.render(surface) - self.screen_changed = False return surface def track_started(self, track): diff --git a/mopidy_touchscreen/search_screen.py b/mopidy_touchscreen/search_screen.py index af41575..17a6353 100644 --- a/mopidy_touchscreen/search_screen.py +++ b/mopidy_touchscreen/search_screen.py @@ -68,7 +68,7 @@ class SearchScreen(BaseScreen): self.set_mode(mode=mode_track_name) self.set_query("") - def update(self, screen, update_all): + def update(self, screen): screen.blit(self.top_bar, (0, 0)) self.screen_objects.render(screen) self.list_view.render(screen) diff --git a/mopidy_touchscreen/tracklist.py b/mopidy_touchscreen/tracklist.py index 9b882db..034524e 100644 --- a/mopidy_touchscreen/tracklist.py +++ b/mopidy_touchscreen/tracklist.py @@ -18,7 +18,7 @@ class Tracklist(BaseScreen): self.track_started( self.manager.core.playback.current_tl_track.get()) - def update(self, screen, update_all): + def update(self, screen): self.list_view.render(screen) def tracklist_changed(self):