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

Code cleanup

Browse Source
This commit is contained in:
9and3r
2014-08-04 11:33:40 +02:00
parent efd5201b65
commit cd8d9d1c17
10 changed files with 101 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mopidy_touchscreen/screen_manager.py
View File

@@ -1,11 +1,12 @@
import traceback
import logging
import mopidy
from pkg_resources import Requirement, resource_filename
import pygame
import mopidy.core
from .main_screen import MainScreen
from .touch_manager import TouchManager
from .screen_objects import *
from .screen_objects import ScreenObjectsManager, TouchAndTextItem, Progressbar
from .tracklist import Tracklist
from .playlist_screen import PlaylistScreen
from .dynamic_background import DynamicBackground
@@ -109,13 +110,12 @@ class ScreenManager():
self.screen_objects_manager.set_touch_object("menu_3", button)
x = button.get_right_pos()
#Menu button
# Menu button
button = TouchAndTextItem(self.fonts['icon'], u" \ue60a",
(x, self.base_size * 7), None)
self.screen_objects_manager.set_touch_object("menu_4", button)
x = button.get_right_pos()
#Down bar
# Down bar
self.down_bar = pygame.Surface(
(self.size[0], self.size[1] - self.base_size * 7), pygame.SRCALPHA)
self.down_bar.fill((0, 0, 0, 128))
@@ -153,19 +153,19 @@ class ScreenManager():
if objects is not None:
for key in objects:
if key == "volume":
value = self.screen_objects_manager.get_touch_object(
key).get_pos_value(
touch_event.current_pos)
manager = self.screen_objects_manager
volume = manager.get_touch_object(key)
pos = touch_event.current_pos
value = volume.get_pos_value(pos)
self.backend.tell(
{'action': 'volume', 'value': value})
self.volume_changed(value)
elif key == "pause_play":
if self.core.playback.state.get() == mopidy.core.PlaybackState.PLAYING:
if self.core.playback.state.get() == \
mopidy.core.PlaybackState.PLAYING:
self.core.playback.pause()
logger.error("pausatzen")
else:
self.core.playback.play()
logger.error("erreproduzitzen")
elif key == "mute":
mute = not self.core.playback.mute.get()
self.core.playback.set_mute(mute)
@@ -198,7 +198,6 @@ class ScreenManager():
self.screen_objects_manager.get_touch_object("mute").set_text(
u"\ue621", False)
else:
logger.error("sartu naiz")
self.screen_objects_manager.get_touch_object("mute").set_text(
u"\ue622", False)
self.screen_objects_manager.get_touch_object("volume").set_value(volume)