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

Merge branch 'background-cover' of https://github.com/9and3r/mopidy-touchscreen into background-cover

Browse Source 
Conflicts:
	mopidy_touchscreen/dynamic_background.py
	mopidy_touchscreen/screen_manager.py
This commit is contained in:
Ander
2015-01-10 01:04:35 +01:00
parent 4e554a248a d49db26693
commit d74aa1db1e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mopidy_touchscreen/dynamic_background.py
View File

@@ -1,9 +1,13 @@
import random import random
<<<<<<< HEAD
change_speed = 2 change_speed = 2
import pygame import pygame
=======
import pygame
>>>>>>> d49db26693cc07087bc620dcdc603290ef56557b
class DynamicBackground(): class DynamicBackground():
def __init__(self, size): def __init__(self, size):

1
mopidy_touchscreen/screen_manager.py
View File

@@ -29,7 +29,6 @@ class ScreenManager():
self.core = core self.core = core
self.cache = cache self.cache = cache
self.fonts = {} self.fonts = {}
self.background = DynamicBackground(size)
self.current_screen = library_index self.current_screen = library_index
self.init_manager(size) self.init_manager(size)