mirror of
https://github.com/Febbweiss/mopidy-touchscreen.git
synced 2026-03-04 22:25:39 +00:00
Fixed Fullscreen
This commit is contained in:
@@ -28,6 +28,7 @@ class MainScreen():
|
||||
self.image = None
|
||||
self.artists = None
|
||||
self.dirty_area = []
|
||||
self.track_duration = "00:00"
|
||||
self.image_now_loaded = False
|
||||
self.touch_text_manager = ScreenObjectsManager()
|
||||
current_track = self.core.playback.current_track.get()
|
||||
@@ -43,9 +44,7 @@ class MainScreen():
|
||||
self.core.playback.time_position.get() / 1000)
|
||||
self.touch_text_manager.get_touch_object("time_progress").set_text(
|
||||
time.strftime('%M:%S', time.gmtime(
|
||||
self.core.playback.time_position.get() / 1000)) + "/" +
|
||||
time.strftime('%M:%S', time.gmtime(
|
||||
self.track.length / 1000)))
|
||||
self.core.playback.time_position.get() / 1000)) + "/" + self.track_duration)
|
||||
if update_all:
|
||||
if self.image is not None:
|
||||
screen.blit(self.image, (self.base_size / 2, self.base_size + self.base_size / 2))
|
||||
@@ -62,6 +61,8 @@ class MainScreen():
|
||||
x = self.base_size * 5
|
||||
width = self.size[0] - self.base_size / 2 - x
|
||||
|
||||
self.track_duration = time.strftime('%M:%S', time.gmtime(track.length / 1000))
|
||||
|
||||
# Load all artists
|
||||
self.artists = []
|
||||
for artist in track.artists:
|
||||
@@ -194,6 +195,9 @@ class MainScreen():
|
||||
self.dirty_area.append(pygame.Rect(self.base_size / 2, self.base_size + self.base_size / 2, self.image.get_rect().width,self.image.get_rect().height))
|
||||
self.image = None
|
||||
|
||||
self.track_duration = "00:00"
|
||||
|
||||
|
||||
# There is no cover so it will use all the screen size for the text
|
||||
width = self.size[0] - self.base_size
|
||||
|
||||
|
||||
@@ -264,7 +264,7 @@ class TextItem(BaseItem):
|
||||
if self.step > self.box.get_rect().width:
|
||||
self.step = -self.size[0]
|
||||
else:
|
||||
self.step = self.step + 4
|
||||
self.step = self.step + 1
|
||||
return True
|
||||
else:
|
||||
return BaseItem.update(self)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import logging
|
||||
import traceback
|
||||
from threading import Thread
|
||||
|
||||
import os
|
||||
import pygame
|
||||
import pykka
|
||||
import mopidy
|
||||
@@ -23,6 +23,9 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
|
||||
config['touchscreen']['screen_height'])
|
||||
self.cache_dir = config['touchscreen']['cache_dir']
|
||||
self.fullscreen = config['touchscreen']['fullscreen']
|
||||
os.environ["SDL_FBDEV"] = "/dev/fb1"
|
||||
os.environ["SDL_MOUSEDEV"] = "/dev/input/touchscreen"
|
||||
os.environ["SDL_MOUSEDRV"] = "TSLIB"
|
||||
pygame.init()
|
||||
self.cursor = config['touchscreen']['cursor']
|
||||
self.screen_manager = ScreenManager(self.screen_size, self.core,
|
||||
@@ -44,7 +47,7 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
|
||||
clock = pygame.time.Clock()
|
||||
if self.fullscreen:
|
||||
screen = pygame.display.set_mode(self.screen_size,
|
||||
pygame.FULLSCREEN, pygame.HWSURFACE)
|
||||
pygame.FULLSCREEN)
|
||||
else:
|
||||
screen = pygame.display.set_mode(self.screen_size)
|
||||
pygame.mouse.set_visible(self.cursor)
|
||||
|
||||
Reference in New Issue
Block a user