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

Playing a song in from library will add all songs to tracklist and play the selected one

Browse Source
This commit is contained in:
Ander
2015-01-10 00:37:45 +01:00
parent 72c5a47d15
commit 28169f1dc7
2 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
mopidy_touchscreen/library_screen.py
View File

@@ -19,7 +19,7 @@ class LibraryScreen(BaseScreen):
self.current_directory = None self.current_directory = None
self.library = None self.library = None
self.library_strings = None self.library_strings = None
self.lookup_uri(None) self.browse_uri(None)
def get_dirty_area(self): def get_dirty_area(self):
return self.list_view.get_dirty_area() return self.list_view.get_dirty_area()
@@ -27,12 +27,12 @@ class LibraryScreen(BaseScreen):
def go_inside_directory(self, uri): def go_inside_directory(self, uri):
self.directory_list.append(self.current_directory) self.directory_list.append(self.current_directory)
self.current_directory = uri self.current_directory = uri
self.lookup_uri(uri) self.browse_uri(uri)
def lookup_uri(self, uri): def browse_uri(self, uri):
self.library_strings = [] self.library_strings = []
if uri is not None: if uri is not None:
self.library_strings.append("..") self.library_strings.append("../")
self.library = self.manager.core.library.browse(uri).get() self.library = self.manager.core.library.browse(uri).get()
for lib in self.library: for lib in self.library:
self.library_strings.append(lib.name) self.library_strings.append(lib.name)
@@ -42,7 +42,7 @@ class LibraryScreen(BaseScreen):
if len(self.directory_list): if len(self.directory_list):
directory = self.directory_list.pop() directory = self.directory_list.pop()
self.current_directory = directory self.current_directory = directory
self.lookup_uri(directory) self.browse_uri(directory)
def update(self, screen, update_all): def update(self, screen, update_all):
self.list_view.render(screen) self.list_view.render(screen)
@@ -50,40 +50,28 @@ class LibraryScreen(BaseScreen):
def touch_event(self, touch_event): def touch_event(self, touch_event):
clicked = self.list_view.touch_event(touch_event) clicked = self.list_view.touch_event(touch_event)
if clicked is not None: if clicked is not None:
if touch_event.type == InputManager.long_click:
if self.current_directory is not None:
if clicked == 0:
self.go_up_directory()
else:
self.play_uri(self.library[clicked - 1].uri,
False)
else:
self.play_uri(self.library[clicked].uri, False)
else:
if self.current_directory is not None: if self.current_directory is not None:
if clicked == 0: if clicked == 0:
self.go_up_directory() self.go_up_directory()
else: else:
if self.library[ if self.library[
clicked - 1].type == mopidy.models.Ref.TRACK: clicked - 1].type == mopidy.models.Ref.TRACK:
self.play_uri( self.play_uri(self.current_directory, clicked-1)
self.library[clicked - 1].uri, True)
else: else:
self.go_inside_directory( self.go_inside_directory(
self.library[clicked - 1].uri) self.library[clicked - 1].uri)
else:
if self.library[
clicked].type == mopidy.models.Track:
self.play_uri(self.library[clicked].uri, True)
else: else:
self.go_inside_directory( self.go_inside_directory(
self.library[clicked].uri) self.library[clicked].uri)
def play_uri(self, uri, track): def play_uri(self, uri, track_pos):
self.manager.core.tracklist.clear() self.manager.core.tracklist.clear()
if track: tracks = []
self.manager.core.tracklist.add(uri=uri) for item in self.library:
self.manager.core.playback.play() if item.type == mopidy.models.Ref.TRACK:
tracks.append(self.manager.core.library.lookup(item.uri).get()[0])
else: else:
# TODO: add folder to tracks to play track_pos = track_pos - 1
pass self.manager.core.tracklist.add(tracks)
self.manager.core.playback.play(tl_track=self.manager.core.tracklist.tl_tracks.get()[track_pos])

2
mopidy_touchscreen/touch_screen.py
View File

@@ -62,7 +62,7 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
def start_thread(self): def start_thread(self):
clock = pygame.time.Clock() clock = pygame.time.Clock()
while self.running: while self.running:
clock.tick(15) clock.tick(8)
self.screen.blit(self.screen_manager.update(), (0, 0)) self.screen.blit(self.screen_manager.update(), (0, 0))
pygame.display.flip() pygame.display.flip()
for event in pygame.event.get(): for event in pygame.event.get():