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

Fixed Fullscreen

Browse Source
This commit is contained in:
Ander
2014-11-19 21:58:58 +01:00
parent 529d2555bb
commit da40431dda
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mopidy_touchscreen/main_screen.py
View File

@@ -28,6 +28,7 @@ class MainScreen():
self.image = None self.image = None
self.artists = None self.artists = None
self.dirty_area = [] self.dirty_area = []
self.track_duration = "00:00"
self.image_now_loaded = False self.image_now_loaded = False
self.touch_text_manager = ScreenObjectsManager() self.touch_text_manager = ScreenObjectsManager()
current_track = self.core.playback.current_track.get() current_track = self.core.playback.current_track.get()
@@ -43,9 +44,7 @@ class MainScreen():
self.core.playback.time_position.get() / 1000) self.core.playback.time_position.get() / 1000)
self.touch_text_manager.get_touch_object("time_progress").set_text( self.touch_text_manager.get_touch_object("time_progress").set_text(
time.strftime('%M:%S', time.gmtime( time.strftime('%M:%S', time.gmtime(
self.core.playback.time_position.get() / 1000)) + "/" + self.core.playback.time_position.get() / 1000)) + "/" + self.track_duration)
time.strftime('%M:%S', time.gmtime(
self.track.length / 1000)))
if update_all: if update_all:
if self.image is not None: if self.image is not None:
screen.blit(self.image, (self.base_size / 2, self.base_size + self.base_size / 2)) 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 x = self.base_size * 5
width = self.size[0] - self.base_size / 2 - x width = self.size[0] - self.base_size / 2 - x
self.track_duration = time.strftime('%M:%S', time.gmtime(track.length / 1000))
# Load all artists # Load all artists
self.artists = [] self.artists = []
for artist in track.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.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.image = None
self.track_duration = "00:00"
# There is no cover so it will use all the screen size for the text # There is no cover so it will use all the screen size for the text
width = self.size[0] - self.base_size width = self.size[0] - self.base_size

2
mopidy_touchscreen/screen_objects.py
View File

@@ -264,7 +264,7 @@ class TextItem(BaseItem):
if self.step > self.box.get_rect().width: if self.step > self.box.get_rect().width:
self.step = -self.size[0] self.step = -self.size[0]
else: else:
self.step = self.step + 4 self.step = self.step + 1
return True return True
else: else:
return BaseItem.update(self) return BaseItem.update(self)

7
mopidy_touchscreen/touch_screen.py
View File

@@ -1,7 +1,7 @@
import logging import logging
import traceback import traceback
from threading import Thread from threading import Thread
import os
import pygame import pygame
import pykka import pykka
import mopidy import mopidy
@@ -23,6 +23,9 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
config['touchscreen']['screen_height']) config['touchscreen']['screen_height'])
self.cache_dir = config['touchscreen']['cache_dir'] self.cache_dir = config['touchscreen']['cache_dir']
self.fullscreen = config['touchscreen']['fullscreen'] 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() pygame.init()
self.cursor = config['touchscreen']['cursor'] self.cursor = config['touchscreen']['cursor']
self.screen_manager = ScreenManager(self.screen_size, self.core, self.screen_manager = ScreenManager(self.screen_size, self.core,
@@ -44,7 +47,7 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
clock = pygame.time.Clock() clock = pygame.time.Clock()
if self.fullscreen: if self.fullscreen:
screen = pygame.display.set_mode(self.screen_size, screen = pygame.display.set_mode(self.screen_size,
pygame.FULLSCREEN, pygame.HWSURFACE) pygame.FULLSCREEN)
else: else:
screen = pygame.display.set_mode(self.screen_size) screen = pygame.display.set_mode(self.screen_size)
pygame.mouse.set_visible(self.cursor) pygame.mouse.set_visible(self.cursor)