Code Cleanup

This commit is contained in:
Ander
2015-01-22 01:10:39 +01:00
parent 313fce75c1
commit 6d212d98ab
9 changed files with 17 additions and 12 deletions

View File

@@ -1,5 +1,4 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import logging
import os import os
from mopidy import config, ext from mopidy import config, ext

View File

@@ -1,6 +1,7 @@
import logging import logging
import RPi.GPIO as GPIO import RPi.GPIO as GPIO
import pygame import pygame

View File

@@ -3,12 +3,14 @@ import json
import logging import logging
import os import os
import time import time
import mopidy.core
import urllib import urllib
import urllib2 import urllib2
from threading import Thread from threading import Thread
import pygame import pygame
import mopidy.core
from .base_screen import BaseScreen from .base_screen import BaseScreen
from .input_manager import InputManager from .input_manager import InputManager
from .screen_objects import (Progressbar, ScreenObjectsManager, from .screen_objects import (Progressbar, ScreenObjectsManager,

View File

@@ -1,5 +1,6 @@
import os import os
import socket import socket
import mopidy import mopidy
from .base_screen import BaseScreen from .base_screen import BaseScreen

View File

@@ -1,5 +1,5 @@
from .list_view import ListView
from .base_screen import BaseScreen from .base_screen import BaseScreen
from .list_view import ListView
class PlaylistScreen(BaseScreen): class PlaylistScreen(BaseScreen):

View File

@@ -1,17 +1,19 @@
import logging import logging
import traceback import traceback
import pygame
from pkg_resources import Requirement, resource_filename from pkg_resources import Requirement, resource_filename
import pygame
from .dynamic_background import DynamicBackground from .dynamic_background import DynamicBackground
from .input_manager import InputManager from .input_manager import InputManager
from .library_screen import LibraryScreen from .library_screen import LibraryScreen
from .main_screen import MainScreen from .main_screen import MainScreen
from .menu_screen import MenuScreen from .menu_screen import MenuScreen
from .playlist_screen import PlaylistScreen from .playlist_screen import PlaylistScreen
from .search_screen import SearchScreen
from .screen_objects import ScreenObjectsManager, \ from .screen_objects import ScreenObjectsManager, \
TouchAndTextItem TouchAndTextItem
from .search_screen import SearchScreen
from .tracklist import Tracklist from .tracklist import Tracklist

View File

@@ -3,8 +3,6 @@ import math
import pygame import pygame
from .input_manager import InputManager
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -146,7 +144,8 @@ class TextItem(BaseItem):
def render(self, surface): def render(self, surface):
if self.fit_horizontal: if self.fit_horizontal:
surface.blit( surface.blit(
self.box, ((self.pos[0] + self.margin), self.pos[1]), area=self.rect) self.box, ((self.pos[0] + self.margin),
self.pos[1]), area=self.rect)
else: else:
surface.blit(self.box, self.pos, surface.blit(self.box, self.pos,
area=pygame.Rect(self.step, 0, self.size[0], area=pygame.Rect(self.step, 0, self.size[0],

View File

@@ -1,11 +1,10 @@
from .list_view import ListView
import pygame import pygame
from .base_screen import BaseScreen from .base_screen import BaseScreen
from .input_manager import InputManager from .input_manager import InputManager
from .list_view import ListView
from .screen_objects import ScreenObjectsManager, \ from .screen_objects import ScreenObjectsManager, \
TouchAndTextItem, TextItem TextItem, TouchAndTextItem
mode_track_name = 0 mode_track_name = 0

View File

@@ -1,10 +1,11 @@
import logging import logging
import os import os
from threading import Thread
import traceback import traceback
from threading import Thread
import pygame import pygame
import pykka import pykka
import mopidy import mopidy
from mopidy import core from mopidy import core
@@ -43,6 +44,7 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
# Raspberry pi GPIO # Raspberry pi GPIO
self.gpio = config['touchscreen']['gpio'] self.gpio = config['touchscreen']['gpio']
if self.gpio: if self.gpio:
from .gpio_inpput_manager import GPIOManager from .gpio_inpput_manager import GPIOManager
pins = {} pins = {}