|
@@ -3,7 +3,7 @@ import pykka
|
|
|
import logging
|
|
import logging
|
|
|
from threading import Thread
|
|
from threading import Thread
|
|
|
import pygame
|
|
import pygame
|
|
|
-from .main_screen import MainScreen
|
|
|
|
|
|
|
+from .screen_manager import ScreenManager
|
|
|
|
|
|
|
|
from mopidy import core
|
|
from mopidy import core
|
|
|
|
|
|
|
@@ -14,19 +14,18 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
|
|
|
def __init__(self, config, core):
|
|
def __init__(self, config, core):
|
|
|
super(TouchScreen, self).__init__()
|
|
super(TouchScreen, self).__init__()
|
|
|
self.core = core
|
|
self.core = core
|
|
|
|
|
+ self.screen_size=(320, 240)
|
|
|
|
|
|
|
|
def start_thread(self):
|
|
def start_thread(self):
|
|
|
|
|
+ self.screen_manager = ScreenManager(self.screen_size)
|
|
|
pygame.init()
|
|
pygame.init()
|
|
|
clock = pygame.time.Clock()
|
|
clock = pygame.time.Clock()
|
|
|
- main_screen = MainScreen()
|
|
|
|
|
- screen = pygame.display.set_mode((200,200));
|
|
|
|
|
|
|
+ screen = pygame.display.set_mode(self.screen_size)
|
|
|
while self.running:
|
|
while self.running:
|
|
|
clock.tick(60)
|
|
clock.tick(60)
|
|
|
- screen.fill((255,255,255))
|
|
|
|
|
|
|
+ screen.blit(self.screen_manager.update(self.core),(0,0))
|
|
|
pygame.display.flip()
|
|
pygame.display.flip()
|
|
|
- logger.error("bukatzen")
|
|
|
|
|
pygame.quit()
|
|
pygame.quit()
|
|
|
- logger.error("bukatu dot")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -34,18 +33,12 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
|
|
|
self.running=True
|
|
self.running=True
|
|
|
self.thread = Thread(target=self.start_thread)
|
|
self.thread = Thread(target=self.start_thread)
|
|
|
self.thread.start()
|
|
self.thread.start()
|
|
|
-
|
|
|
|
|
|
|
+ pass
|
|
|
def on_stop(self):
|
|
def on_stop(self):
|
|
|
self.running = False
|
|
self.running = False
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def track_playback_started(self, tl_track):
|
|
def track_playback_started(self, tl_track):
|
|
|
- pass
|
|
|
|
|
- #myfont = pygame.font.SysFont("monospace", 15)
|
|
|
|
|
-
|
|
|
|
|
- # render text
|
|
|
|
|
- #label = myfont.render(tl_track.track.name, 1, (255,255,0))
|
|
|
|
|
- #self.screen.blit(label, (100, 100))
|
|
|
|
|
- #pygame.display.flip()
|
|
|
|
|
|
|
+ self.screen_manager.track_started(tl_track)
|
|
|
|
|
|