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

First support for GPIO on Raspberry Pi

Browse Source
This commit is contained in:
9and3r
2014-08-08 11:20:31 +02:00
parent a0843d18db
commit e336fc4b9d
7 changed files with 112 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mopidy_touchscreen/__init__.py
View File

@@ -31,6 +31,7 @@ class Extension(ext.Extension):
schema['cursor'] = config.Boolean() schema['cursor'] = config.Boolean()
schema['fullscreen'] = config.Boolean() schema['fullscreen'] = config.Boolean()
schema['cache_dir'] = config.Path() schema['cache_dir'] = config.Path()
schema['gpio'] = config.Boolean()
return schema return schema
def setup(self, registry): def setup(self, registry):

1
mopidy_touchscreen/ext.conf
View File

@@ -5,3 +5,4 @@ screen_height = 240
cursor = True cursor = True
fullscreen = False fullscreen = False
cache_dir = $XDG_CACHE_DIR/mopidy/touchscreen cache_dir = $XDG_CACHE_DIR/mopidy/touchscreen
gpio = False

14
mopidy_touchscreen/gpio_inpput_manager.py Normal file
View File

@@ -0,0 +1,14 @@
import RPi.GPIO as GPIO
import logging
logger = logging.getLogger(__name__)
class GPIOManager():
def __init__(self):
GPIO.add_event_detect(23, GPIO.RISING, callback=self.printFunction, bouncetime=300)
def printFunction(self):
logger.error("Sakatu da")

6
mopidy_touchscreen/menu_screen.py
View File

@@ -4,6 +4,7 @@ import socket
import mopidy import mopidy
from .screen_objects import ScreenObjectsManager, TouchAndTextItem from .screen_objects import ScreenObjectsManager, TouchAndTextItem
from .input_manager import InputManager
class MenuScreen(): class MenuScreen():
@@ -49,9 +50,10 @@ class MenuScreen():
def update(self, screen): def update(self, screen):
self.screen_objects.render(screen) self.screen_objects.render(screen)
def touch_event(self, touch_event): def touch_event(self, event):
if event.type == InputManager.click:
clicked = self.screen_objects.get_touch_objects_in_pos( clicked = self.screen_objects.get_touch_objects_in_pos(
touch_event.current_pos) event.current_pos)
for key in clicked: for key in clicked:
if key == "exit_icon" or key == "exit": if key == "exit_icon" or key == "exit":
mopidy.utils.process.exit_process() mopidy.utils.process.exit_process()

91
mopidy_touchscreen/screen_manager.py
View File

@@ -41,7 +41,9 @@ class ScreenManager():
traceback.print_exc() traceback.print_exc()
self.track = None self.track = None
self.input_manager = InputManager(size) self.input_manager = InputManager(size)
self.screen_objects_manager = ScreenObjectsManager() self.top_bar_objects = ScreenObjectsManager()
self.down_bar_objects = ScreenObjectsManager()
self.selected_zone = self.top_bar_objects
# Top bar # Top bar
self.top_bar = pygame.Surface((self.size[0], self.base_size), self.top_bar = pygame.Surface((self.size[0], self.base_size),
@@ -50,38 +52,38 @@ class ScreenManager():
# Play/pause # Play/pause
button = TouchAndTextItem(self.fonts['icon'], u"\ue615 ", (0, 0), None) button = TouchAndTextItem(self.fonts['icon'], u"\ue615 ", (0, 0), None)
self.screen_objects_manager.set_touch_object("pause_play", button) self.top_bar_objects.set_touch_object("pause_play", button)
x = button.get_right_pos() x = button.get_right_pos()
# Random # Random
button = TouchAndTextItem(self.fonts['icon'], u"\ue629 ", (x, 0), None) button = TouchAndTextItem(self.fonts['icon'], u"\ue629 ", (x, 0), None)
self.screen_objects_manager.set_touch_object("random", button) self.top_bar_objects.set_touch_object("random", button)
x = button.get_right_pos() x = button.get_right_pos()
# Repeat # Repeat
button = TouchAndTextItem(self.fonts['icon'], u"\ue626", (x, 0), None) button = TouchAndTextItem(self.fonts['icon'], u"\ue626", (x, 0), None)
self.screen_objects_manager.set_touch_object("repeat", button) self.top_bar_objects.set_touch_object("repeat", button)
x = button.get_right_pos() x = button.get_right_pos()
# Single # Single
button = TouchAndTextItem(self.fonts['base'], " 1 ", (x, 0), None) button = TouchAndTextItem(self.fonts['base'], " 1 ", (x, 0), None)
self.screen_objects_manager.set_touch_object("single", button) self.top_bar_objects.set_touch_object("single", button)
x = button.get_right_pos() x = button.get_right_pos()
# Internet # Internet
button = TouchAndTextItem(self.fonts['icon'], u"\ue602 ", (x, 0), None) button = TouchAndTextItem(self.fonts['icon'], u"\ue602 ", (x, 0), None)
self.screen_objects_manager.set_touch_object("internet", button) self.top_bar_objects.set_touch_object("internet", button)
x = button.get_right_pos() x = button.get_right_pos()
# Mute # Mute
button = TouchAndTextItem(self.fonts['icon'], u"\ue61f ", (x, 0), None) button = TouchAndTextItem(self.fonts['icon'], u"\ue61f ", (x, 0), None)
self.screen_objects_manager.set_touch_object("mute", button) self.top_bar_objects.set_touch_object("mute", button)
x = button.get_right_pos() x = button.get_right_pos()
# Volume # Volume
progress = Progressbar(self.fonts['base'], "100", (x, 0), progress = Progressbar(self.fonts['base'], "100", (x, 0),
(self.size[0] - x, self.base_size), 100, True) (self.size[0] - x, self.base_size), 100, True)
self.screen_objects_manager.set_touch_object("volume", progress) self.top_bar_objects.set_touch_object("volume", progress)
progress.set_value(self.core.playback.volume.get()) progress.set_value(self.core.playback.volume.get())
# Menu buttons # Menu buttons
@@ -91,31 +93,31 @@ class ScreenManager():
# Main button # Main button
button = TouchAndTextItem(self.fonts['icon'], u" \ue600", button = TouchAndTextItem(self.fonts['icon'], u" \ue600",
(0, self.base_size * 7), button_size) (0, self.base_size * 7), button_size)
self.screen_objects_manager.set_touch_object("menu_0", button) self.down_bar_objects.set_touch_object("menu_0", button)
x = button.get_right_pos() x = button.get_right_pos()
# Tracklist button # Tracklist button
button = TouchAndTextItem(self.fonts['icon'], u" \ue60d", button = TouchAndTextItem(self.fonts['icon'], u" \ue60d",
(x, self.base_size * 7), button_size) (x, self.base_size * 7), button_size)
self.screen_objects_manager.set_touch_object("menu_1", button) self.down_bar_objects.set_touch_object("menu_1", button)
x = button.get_right_pos() x = button.get_right_pos()
# Library button # Library button
button = TouchAndTextItem(self.fonts['icon'], u" \ue604", button = TouchAndTextItem(self.fonts['icon'], u" \ue604",
(x, self.base_size * 7), button_size) (x, self.base_size * 7), button_size)
self.screen_objects_manager.set_touch_object("menu_2", button) self.down_bar_objects.set_touch_object("menu_2", button)
x = button.get_right_pos() x = button.get_right_pos()
# Playlist button # Playlist button
button = TouchAndTextItem(self.fonts['icon'], u" \ue605", button = TouchAndTextItem(self.fonts['icon'], u" \ue605",
(x, self.base_size * 7), button_size) (x, self.base_size * 7), button_size)
self.screen_objects_manager.set_touch_object("menu_3", button) self.down_bar_objects.set_touch_object("menu_3", button)
x = button.get_right_pos() x = button.get_right_pos()
# Menu button # Menu button
button = TouchAndTextItem(self.fonts['icon'], u" \ue60a", button = TouchAndTextItem(self.fonts['icon'], u" \ue60a",
(x, self.base_size * 7), None) (x, self.base_size * 7), None)
self.screen_objects_manager.set_touch_object("menu_4", button) self.down_bar_objects.set_touch_object("menu_4", button)
# Down bar # Down bar
self.down_bar = pygame.Surface( self.down_bar = pygame.Surface(
@@ -129,7 +131,7 @@ class ScreenManager():
self.screens[4].check_connection() self.screens[4].check_connection()
self.change_screen(self.current_screen) self.change_screen(self.current_screen)
self.screen_objects_manager.set_selected("pause_play") self.top_bar_objects.set_selected("pause_play")
def update(self): def update(self):
surface = pygame.Surface(self.size) surface = pygame.Surface(self.size)
@@ -137,7 +139,8 @@ class ScreenManager():
self.screens[self.current_screen].update(surface) self.screens[self.current_screen].update(surface)
surface.blit(self.top_bar, (0, 0)) surface.blit(self.top_bar, (0, 0))
surface.blit(self.down_bar, (0, self.base_size * 7)) surface.blit(self.down_bar, (0, self.base_size * 7))
self.screen_objects_manager.render(surface) self.top_bar_objects.render(surface)
self.down_bar_objects.render(surface)
return surface return surface
def track_started(self, track): def track_started(self, track):
@@ -152,31 +155,37 @@ class ScreenManager():
event = self.input_manager.event(event) event = self.input_manager.event(event)
if event is not None: if event is not None:
if event.type == InputManager.click: if event.type == InputManager.click:
objects = self.screen_objects_manager.get_touch_objects_in_pos( objects = self.top_bar_objects.get_touch_objects_in_pos(
event.current_pos) event.current_pos)
objects.extend(self.down_bar_objects.get_touch_objects_in_pos(
event.current_pos))
self.click_on_objects(objects, event) self.click_on_objects(objects, event)
elif event.type == InputManager.key and event.direction == InputManager.enter: elif event.type == InputManager.key and event.direction == InputManager.enter:
objects = [self.screen_objects_manager.selected_key] objects = [self.selected_zone.selected_key]
self.click_on_objects(objects, event) self.click_on_objects(objects, event)
elif event.type == InputManager.key: elif event.type == InputManager.key:
self.screen_objects_manager.change_selected(event.direction) if event.direction == InputManager.enter:
logger.error(self.selected_zone.selected_key)
self.click_on_objects([self.selected_zone.selected_key], event)
else:
self.change_selection(event, None)
self.screens[self.current_screen].touch_event(event) self.screens[self.current_screen].touch_event(event)
def volume_changed(self, volume): def volume_changed(self, volume):
if not self.core.playback.mute.get(): if not self.core.playback.mute.get():
if volume > 80: if volume > 80:
self.screen_objects_manager.get_touch_object("mute").set_text( self.top_bar_objects.get_touch_object("mute").set_text(
u"\ue61f", False) u"\ue61f", False)
elif volume > 50: elif volume > 50:
self.screen_objects_manager.get_touch_object("mute").set_text( self.top_bar_objects.get_touch_object("mute").set_text(
u"\ue620", False) u"\ue620", False)
elif volume > 20: elif volume > 20:
self.screen_objects_manager.get_touch_object("mute").set_text( self.top_bar_objects.get_touch_object("mute").set_text(
u"\ue621", False) u"\ue621", False)
else: else:
self.screen_objects_manager.get_touch_object("mute").set_text( self.top_bar_objects.get_touch_object("mute").set_text(
u"\ue622", False) u"\ue622", False)
self.screen_objects_manager.get_touch_object("volume").set_value( self.top_bar_objects.get_touch_object("volume").set_value(
volume) volume)
def click_on_objects(self, objects, event): def click_on_objects(self, objects, event):
@@ -210,7 +219,7 @@ class ScreenManager():
self.change_screen(int(key[-1:])) self.change_screen(int(key[-1:]))
def change_volume(self,event): def change_volume(self,event):
manager = self.screen_objects_manager manager = self.top_bar_objects
volume = manager.get_touch_object("volume") volume = manager.get_touch_object("volume")
pos = event.current_pos pos = event.current_pos
value = volume.get_pos_value(pos) value = volume.get_pos_value(pos)
@@ -220,17 +229,17 @@ class ScreenManager():
def playback_state_changed(self, old_state, new_state): def playback_state_changed(self, old_state, new_state):
if new_state == mopidy.core.PlaybackState.PLAYING: if new_state == mopidy.core.PlaybackState.PLAYING:
self.screen_objects_manager.get_touch_object( self.top_bar_objects.get_touch_object(
"pause_play").set_text(u"\ue616", False) "pause_play").set_text(u"\ue616", False)
else: else:
self.screen_objects_manager.get_touch_object( self.top_bar_objects.get_touch_object(
"pause_play").set_text(u"\ue615", False) "pause_play").set_text(u"\ue615", False)
def mute_changed(self, mute): def mute_changed(self, mute):
self.screen_objects_manager.get_touch_object("mute").set_active( self.top_bar_objects.get_touch_object("mute").set_active(
not mute) not mute)
if mute: if mute:
self.screen_objects_manager.get_touch_object("mute").set_text( self.top_bar_objects.get_touch_object("mute").set_text(
u"\ue623", False) u"\ue623", False)
else: else:
self.volume_changed(self.core.playback.volume.get()) self.volume_changed(self.core.playback.volume.get())
@@ -239,28 +248,42 @@ class ScreenManager():
self.screens[1].tracklist_changed() self.screens[1].tracklist_changed()
def options_changed(self): def options_changed(self):
self.screen_objects_manager.get_touch_object("random").set_active( self.top_bar_objects.get_touch_object("random").set_active(
self.core.tracklist.random.get()) self.core.tracklist.random.get())
self.screen_objects_manager.get_touch_object("repeat").set_active( self.top_bar_objects.get_touch_object("repeat").set_active(
self.core.tracklist.repeat.get()) self.core.tracklist.repeat.get())
self.screen_objects_manager.get_touch_object("single").set_active( self.top_bar_objects.get_touch_object("single").set_active(
self.core.tracklist.single.get()) self.core.tracklist.single.get())
def change_screen(self, new_screen): def change_screen(self, new_screen):
self.screen_objects_manager.get_touch_object( self.down_bar_objects.get_touch_object(
"menu_" + str(self.current_screen)).set_active(False) "menu_" + str(self.current_screen)).set_active(False)
self.current_screen = new_screen self.current_screen = new_screen
self.screen_objects_manager.get_touch_object( self.down_bar_objects.get_touch_object(
"menu_" + str(new_screen)).set_active(True) "menu_" + str(new_screen)).set_active(True)
def playlists_loaded(self): def playlists_loaded(self):
self.screens[3].playlists_loaded() self.screens[3].playlists_loaded()
def set_connection(self, connection, loading): def set_connection(self, connection, loading):
internet = self.screen_objects_manager.get_touch_object("internet") internet = self.top_bar_objects.get_touch_object("internet")
if loading: if loading:
internet.set_text(u"\ue627", None) internet.set_text(u"\ue627", None)
internet.set_active(False) internet.set_active(False)
else: else:
internet.set_text(u"\ue602", None) internet.set_text(u"\ue602", None)
internet.set_active(connection) internet.set_active(connection)
def change_selection(self, event, pos):
if self.selected_zone == self.top_bar_objects:
if not self.top_bar_objects.change_selected(event.direction, pos) and event.direction == InputManager.down:
pos = self.top_bar_objects.selected.pos
self.selected_zone = self.down_bar_objects
self.top_bar_objects.set_selected(None)
self.change_selection(event, pos)
elif self.selected_zone == self.down_bar_objects:
if not self.down_bar_objects.change_selected(event.direction, pos) and event.direction == InputManager.up:
pos = self.down_bar_objects.selected.pos
self.selected_zone = self.top_bar_objects
self.down_bar_objects.set_selected(None)
self.change_selection(event, pos)

29
mopidy_touchscreen/screen_objects.py
View File

@@ -61,23 +61,23 @@ class ScreenObjectsManager():
self.selected_key = key self.selected_key = key
else: else:
self.selected = None self.selected = None
self.selected.set_selected(False)
self.selected_key = None self.selected_key = None
def change_selected(self, direction): def change_selected(self, direction, pos):
if pos is None:
pos = self.selected.pos pos = self.selected.pos
if direction == InputManager.right: if direction == InputManager.right:
bests = self.find_nearest_objects(self.find_in_quadrant(False, True), True) bests = self.find_nearest_objects(self.find_in_quadrant(False, True, pos), True, pos)
best_key = self.find_best_object(bests, False, True) best_key = self.find_best_object(bests, False, True, pos)
elif direction == InputManager.left: elif direction == InputManager.left:
bests = self.find_nearest_objects(self.find_in_quadrant(False, False), True) bests = self.find_nearest_objects(self.find_in_quadrant(False, False, pos), True, pos)
best_key = self.find_best_object(bests, False, False) best_key = self.find_best_object(bests, False, False, pos)
elif direction == InputManager.down: elif direction == InputManager.down:
bests = self.find_nearest_objects(self.find_in_quadrant(True, True), False) bests = self.find_nearest_objects(self.find_in_quadrant(True, True, pos), False, pos)
best_key = self.find_best_object(bests, True, True) best_key = self.find_best_object(bests, True, True, pos)
elif direction == InputManager.up: elif direction == InputManager.up:
bests = self.find_nearest_objects(self.find_in_quadrant(True, False), False) bests = self.find_nearest_objects(self.find_in_quadrant(True, False, pos), False, pos)
best_key = self.find_best_object(bests, True, False) best_key = self.find_best_object(bests, True, False, pos)
if best_key is None: if best_key is None:
return False return False
else: else:
@@ -88,8 +88,7 @@ class ScreenObjectsManager():
# The quadrant is the normal math one with x and y # The quadrant is the normal math one with x and y
# x is positive on the bottom as pygame x # x is positive on the bottom as pygame x
# The quadrant origin (0,0) is the selected pos # The quadrant origin (0,0) is the selected pos
def find_in_quadrant(self, vertical, positive): def find_in_quadrant(self, vertical, positive, pos):
pos = self.selected.pos
objects = {} objects = {}
if vertical: if vertical:
if positive: if positive:
@@ -116,8 +115,7 @@ class ScreenObjectsManager():
return objects return objects
# Find the objects that are nearest # Find the objects that are nearest
def find_nearest_objects(self, objects, vertical): def find_nearest_objects(self, objects, vertical, pos):
pos = self.selected.pos
best_pos = None best_pos = None
min_value = None min_value = None
best_objects = {} best_objects = {}
@@ -146,8 +144,7 @@ class ScreenObjectsManager():
best_objects[key] = objects[key] best_objects[key] = objects[key]
return best_objects return best_objects
def find_best_object(self, objects, vertical, positive): def find_best_object(self, objects, vertical, positive, pos):
pos = self.selected.pos
best_key = None best_key = None
best_pos = None best_pos = None
if vertical: if vertical:

8
mopidy_touchscreen/touch_screen.py
View File

@@ -4,6 +4,7 @@ from threading import Thread
import pygame import pygame
import pykka import pykka
import mopidy
from mopidy import core from mopidy import core
from .screen_manager import ScreenManager from .screen_manager import ScreenManager
@@ -27,6 +28,12 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
self.screen_manager = ScreenManager(self.screen_size, self.core, self.screen_manager = ScreenManager(self.screen_size, self.core,
self.backend, self.cache_dir) self.backend, self.cache_dir)
# Raspberry pi GPIO
self.gpio = config['touchscreen']['gpio']
if self.gpio:
from .gpio_inpput_manager import GPIOManager
self.gpio = GPIOManager()
def start_thread(self): def start_thread(self):
clock = pygame.time.Clock() clock = pygame.time.Clock()
if self.fullscreen: if self.fullscreen:
@@ -47,6 +54,7 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
else: else:
self.screen_manager.event(event) self.screen_manager.event(event)
pygame.quit() pygame.quit()
mopidy.utils.process.exit_process()
def on_start(self): def on_start(self):
try: try: