From da40431ddaecfeb7fa49b6ba5cfe4459ffcf06b4 Mon Sep 17 00:00:00 2001
From: Ander <9and3r@gmail.com>
Date: Wed, 19 Nov 2014 21:58:58 +0100
Subject: [PATCH] Fixed Fullscreen

---
 mopidy_touchscreen/main_screen.py    | 10 +++++++---
 mopidy_touchscreen/screen_objects.py |  2 +-
 mopidy_touchscreen/touch_screen.py   |  7 +++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/mopidy_touchscreen/main_screen.py b/mopidy_touchscreen/main_screen.py
index 28aad17..07d27fc 100644
--- a/mopidy_touchscreen/main_screen.py
+++ b/mopidy_touchscreen/main_screen.py
@@ -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
 
diff --git a/mopidy_touchscreen/screen_objects.py b/mopidy_touchscreen/screen_objects.py
index f83ac29..122b81b 100644
--- a/mopidy_touchscreen/screen_objects.py
+++ b/mopidy_touchscreen/screen_objects.py
@@ -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)
diff --git a/mopidy_touchscreen/touch_screen.py b/mopidy_touchscreen/touch_screen.py
index fea0579..607b718 100644
--- a/mopidy_touchscreen/touch_screen.py
+++ b/mopidy_touchscreen/touch_screen.py
@@ -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)