Skip to content

Commit

Permalink
Update only when nedeed
Browse files Browse the repository at this point in the history
  • Loading branch information
9and3r committed Nov 14, 2014
1 parent 00b50c5 commit e62f710
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 14 deletions.
4 changes: 2 additions & 2 deletions mopidy_touchscreen/library_screen.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ def go_up_directory(self):
self.current_directory = directory
self.lookup_uri(directory)

def update(self, screen):
self.list_view.render(screen)
def update(self, screen, update_all):
self.list_view.render(screen)

def touch_event(self, touch_event):
clicked = self.list_view.touch_event(touch_event)
Expand Down
2 changes: 2 additions & 0 deletions mopidy_touchscreen/list_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ def load_new_item_position(self, item_pos):
i += 1
z += 1



def render(self, surface):
self.screen_objects.render(surface)

Expand Down
14 changes: 9 additions & 5 deletions mopidy_touchscreen/main_screen.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,16 @@ def __init__(self, size, manager, cache, core, fonts):
self.cache = cache
self.image = None
self.artists = None
self.image_now_loaded = False
self.touch_text_manager = ScreenObjectsManager()
current_track = self.core.playback.current_track.get()
if current_track is None:
self.track_playback_ended(None, None)
else:
self.track_started(current_track)

def update(self, screen):
def update(self, screen, update_all):
if self.track is not None:
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.get_touch_object(
"time_progress").set_value(
self.core.playback.time_position.get() / 1000)
Expand All @@ -47,7 +45,12 @@ def update(self, screen):
self.core.playback.time_position.get() / 1000)) + "/" +
time.strftime('%M:%S', time.gmtime(
self.track.length / 1000)))
self.touch_text_manager.render(screen)
if update_all:
if self.image_now_loaded:
if self.image is not None:
screen.blit(self.image, (self.base_size / 2, self.base_size + self.base_size / 2))
self.image_now_loaded = False
self.touch_text_manager.render(screen)
return screen

def track_started(self, track):
Expand Down Expand Up @@ -212,6 +215,7 @@ def load_image(self):
self.get_cover_folder() +
self.get_image_file_name()).convert(),
(size, size))
self.image_now_loaded = True

def touch_event(self, event):
if event.type == InputManager.click:
Expand Down
4 changes: 2 additions & 2 deletions mopidy_touchscreen/menu_screen.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ def __init__(self, size, base_size, manager):
(0, self.base_size * 4), None)
self.screen_objects.set_touch_object("ip", button)

def update(self, screen):
def update(self, screen, update_all):
self.screen_objects.render(screen)

def get_dirty_area(self):
self.screen_objects.get_dirty_area()
return self.screen_objects.get_dirty_area()

def touch_event(self, event):
if event.type == InputManager.click:
Expand Down
4 changes: 2 additions & 2 deletions mopidy_touchscreen/playlist_screen.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ def __init__(self, size, base_size, manager):
def get_dirty_area(self):
return self.list_view.get_dirty_area()

def update(self, screen):
self.list_view.render(screen)
def update(self, screen, update_all):
self.list_view.render(screen)

def playlists_loaded(self):
self.playlists_strings = []
Expand Down
5 changes: 4 additions & 1 deletion mopidy_touchscreen/screen_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ def __init__(self, size, core, backend, cache):
self.down_bar_objects = ScreenObjectsManager()
self.selected_zone = self.top_bar_objects
self.dirty_area = []
self.screen_changed = True

# Top bar
self.top_bar = pygame.Surface((self.size[0], self.base_size),
Expand Down Expand Up @@ -135,11 +136,12 @@ def __init__(self, size, core, backend, cache):
def update(self):
surface = pygame.Surface(self.size)
surface.fill([200,200,200])
self.screens[self.current_screen].update(surface)
self.screens[self.current_screen].update(surface, self.screen_changed)
surface.blit(self.top_bar, (0, 0))
surface.blit(self.down_bar, (0, self.base_size * 7))
self.top_bar_objects.render(surface)
self.down_bar_objects.render(surface)
self.screen_changed = False
return surface

def track_started(self, track):
Expand Down Expand Up @@ -263,6 +265,7 @@ def options_changed(self):
self.core.tracklist.single.get())

def change_screen(self, new_screen):
self.screen_changed = True
self.down_bar_objects.get_touch_object(
"menu_" + str(self.current_screen)).set_active(False)
self.current_screen = new_screen
Expand Down
2 changes: 2 additions & 0 deletions mopidy_touchscreen/screen_objects.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ def set_touch_object(self, key, add_object):
def get_touch_object(self, key):
return self.touch_objects[key]


def render(self, surface):
for key in self.text_objects:
if self.text_objects[key].update():
Expand Down Expand Up @@ -369,6 +370,7 @@ def get_pos_value(self, pos):
return x * self.max / self.size[0]

def set_text(self, text):
self.dirty = True
self.text.set_text(text, True)


Expand Down
4 changes: 2 additions & 2 deletions mopidy_touchscreen/tracklist.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ def __init__(self, size, base_size, manager):
def get_dirty_area(self):
return self.list_view.get_dirty_area()

def update(self, screen):
self.list_view.render(screen)
def update(self, screen, update_all):
self.list_view.render(screen)

def tracklist_changed(self):
self.update_list()
Expand Down

0 comments on commit e62f710

Please sign in to comment.