Преглед изворни кода

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

Conflicts:
	mopidy_touchscreen/dynamic_background.py
	mopidy_touchscreen/screen_manager.py
Ander пре 11 година
родитељ
комит
d74aa1db1e
2 измењених фајлова са 4 додато и 1 уклоњено
  1. 4 0
      mopidy_touchscreen/dynamic_background.py
  2. 0 1
      mopidy_touchscreen/screen_manager.py

+ 4 - 0
mopidy_touchscreen/dynamic_background.py

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

+ 0 - 1
mopidy_touchscreen/screen_manager.py

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