Michelangelo Edition

bundles/de.properties

@@ -22,6 +22,7 @@ delay.off = Ausschalten
 clock = Uhr
 logo = Logo
 slideshow = Slideshow
+vumeter = VU-Meter
 
 news = Nachrichten
 culture = Kultur

bundles/en_us.properties

@@ -1,4 +1,4 @@
-home = Home
+home = Home
 genre = Genre
 
 radio = Radio
@@ -22,6 +22,7 @@ delay.off = Off
 clock = Clock
 logo = Logo
 slideshow = Slideshow
+vumeter = VU Meter
 
 news = News
 culture = Culture

bundles/fr.properties

@@ -22,6 +22,7 @@ delay.off = Éteindre
 clock = Horloge
 logo = Logo
 slideshow = Diaporama
+vumeter = VU-mètre
 
 news = Nouvelles
 culture = Culture

bundles/ru.properties

@@ -22,6 +22,7 @@ delay.off = Отключить
 clock = Часы
 logo = Логотип
 slideshow = Слайд-шоу
+vumeter = Индикатор
 
 news = Новости
 culture = Культура

config.txt

@@ -1,30 +1,30 @@
 [screen.info]
-width = 480
-height = 320
+width = 320
+height = 240
 depth = 32
 frame.rate = 30
 
 [usage]
+use.touchscreen = True
+use.mouse = False
 use.lirc = True
-use.rotary.encoders = True
-use.mpc.player = True
-use.mpd.player = False
+use.rotary.encoders = False
 use.web = True
 use.logging = False
 
+[audio]
+server.folder = C:\\Temp\\audio\\mpd-0.17.4-win32\\bin
+server.command = mpd mpd.conf
+client.name = mpc
+
 [current]
 mode = radio
 language = en_us
-playlist = news
+playlist = culture
 station = 0
-screensaver = slideshow
+screensaver = vumeter
 screensaver.delay = delay.1
-
-[music.server]
-folder = C:\\Temp\\audio\\mpd-0.17.4-win32\\bin
-command = mpd mpd.conf
-host = localhost
-port = 6600
+volume = 25
 
 [web.server]
 http.port = 8000
@@ -41,14 +41,14 @@ color.logo = 20,190,160
 font.name = FiraSans.ttf
 
 [previous]
-news = 0
-culture = 0
-retro = 0
-children = 0
+news = 1
+culture = 8
+retro = 12
+children = 6
 classical = 0
-pop = 0
-jazz = 0
-rock = 0
+pop = 16
+jazz = 11
+rock = 10
 contemporary = 0
 
 [order.home.menu]
@@ -80,6 +80,7 @@ contemporary = 9
 clock = 1
 logo = 2
 slideshow = 3
+vumeter = 4
 
 [order.screensaver.delay.menu]
 delay.1 = 1

event/dispatcher.py

@@ -16,8 +16,8 @@
 # along with Peppy Player. If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-from pygame.time import Clock
 
+from pygame.time import Clock
 from ui.menu.stationmenu import StationMenu
 from ui.screen.station import StationScreen
 from util.config import USAGE, USE_LIRC, USE_ROTARY_ENCODERS 
@@ -30,6 +30,7 @@
                      "0" : pygame.K_SPACE,
                      "1" : pygame.K_SPACE,
                      "return" : pygame.K_RETURN,
+                     "ok" : pygame.K_RETURN,
                      "left" : pygame.K_LEFT,
                      "right" : pygame.K_RIGHT,
                      "up" : pygame.K_UP,
@@ -42,14 +43,15 @@
                      "back" : pygame.K_ESCAPE}
 
 class EventDispatcher(object):
-    """ Event Dispatcher 
+    """ Event Dispatcher     
     This class runs two separate event loops:
     - Main event loop which handles mouse, keyboard and user events
     - LIRC event loop which handles LIRC events
     """
 
     def __init__(self, screensaver_dispatcher, util):
-        """ Initializer        
+        """ Initializer      
+          
         :param screensaver_dispatcher: reference to screensaver dispatcher used for forwarding events
         :param util: utility object which keeps configuration settings and utility methods        
         """
@@ -65,17 +67,19 @@ def __init__(self, screensaver_dispatcher, util):
         self.screensaver_was_running = False        
 
     def set_current_screen(self, current_screen):
-        """ Set current screen.        
+        """ Set current screen.             
         All events are applicable for the current screen only. 
         Logo screensaver needs current screen to get the current logo.
+        
         :param current_screen: reference to the current screen
         """
         self.current_screen = current_screen
         self.screensaver_dispatcher.set_current_screen(current_screen)
 
     def init_lirc(self):
         """ LIRC initializer.         
-        It's not executed if disabled in config.txt. Starts new thread for IR events handling. 
+        It's not executed if IR remote was disabled in config.txt. 
+        Starts new thread for IR events handling. 
         """        
         if not self.config[USAGE][USE_LIRC]:
             return
@@ -106,6 +110,8 @@ def handle_lirc_event(self, code):
         """ LIRC event handler.        
         To simplify event handling it wraps IR events into user event with keyboard sub-type. 
         For one IR event it generates two events - one for key down and one for key up.
+        
+        :param code: IR code
         """
         if self.screensaver_dispatcher.saver_running:
                 self.screensaver_dispatcher.cancel_screensaver()
@@ -133,19 +139,19 @@ def handle_lirc_event(self, code):
         if d[KEY_KEYBOARD_KEY]:
             event = pygame.event.Event(USER_EVENT_TYPE, **d)
             pygame.event.post(event)
-            if not self.screensaver_dispatcher.saver_running:
-                d[KEY_ACTION] = pygame.KEYUP
-                event = pygame.event.Event(USER_EVENT_TYPE, **d)
-                pygame.event.post(event)
+            d[KEY_ACTION] = pygame.KEYUP
+            event = pygame.event.Event(USER_EVENT_TYPE, **d)
+            pygame.event.post(event)
 
     def handle_keyboard_event(self, event):
         """ Keyboard event handler.         
         Wraps keyboard events into user event. Exits upon Ctrl-C. 
-        Distinguishes key up and key down.        
+        Distinguishes key up and key down.
+                
         :param event: event to handle
         """        
         keys = pygame.key.get_pressed() 
-        if keys[pygame.K_LCTRL] and event.key == pygame.K_c: 
+        if (keys[pygame.K_LCTRL] or keys[pygame.K_RCTRL]) and event.key == pygame.K_c: 
             self.shutdown(event)
         elif event.type == pygame.KEYDOWN or event.type == pygame.KEYUP:
             if self.screensaver_dispatcher.saver_running:
@@ -160,7 +166,8 @@ def handle_keyboard_event(self, event):
             pygame.event.post(event)
 
     def handle_event(self, event):
-        """ Forward event to the current screen and screensaver dispatcher         
+        """ Forward event to the current screen and screensaver dispatcher 
+                
         :param event: event to handle
         """        
         self.screensaver_dispatcher.handle_event(event)
@@ -170,7 +177,8 @@ def init_volume(self, volume):
         """ Volume initializer        
         This method will be executed only once upon system startup.
         It assumes that current screen is Station Screen.
-        After initialization it removes itself as a listener        
+        After initialization it removes itself as a listener 
+               
         :param volume: initial volume level
         """        
         if volume == -1 or self.volume_initialized:
@@ -182,6 +190,7 @@ def init_volume(self, volume):
                     v.set_position(int(volume))
                     v.update_position()
                     self.volume_initialized = True
+                    self.screensaver_dispatcher.change_volume(int(volume))
                     self.player.remove_volume_listener(self.init_volume)
             except:
                 pass
@@ -193,7 +202,8 @@ def dispatch(self, player, shutdown):
         - Quit event - when user closes window (Windows only)
         - Keyboard events
         - Mouse events
-        - User Events        
+        - User Events    
+            
         :param player: reference to player object
         "param shutdown: shutdown method to use when user exits
         """        

event/rotary.py

@@ -44,6 +44,7 @@ class RotaryEncoder(object):
 
     def __init__(self, pinA, pinB, button, key_increment, key_decrement, key_select):
         """ Initializer
+        
         :param pinA: GPIO pin number to increment
         :param pinA: GPIO pin number to decrement
         :param button: GPIO pin number for push-button
@@ -79,6 +80,7 @@ def __init__(self, pinA, pinB, button, key_increment, key_decrement, key_select)
     def handle_rotation_event(self, p):
         """ Callback method for rotation RE events.
         Makes required calculations and calls event handler with event defining rotation direction 
+        
         :param p: pin
         """        
         if self.gpio.input(self.pinA):
@@ -113,7 +115,9 @@ def handle_rotation_event(self, p):
 
     def handle_button_event(self, button):
         """ Callback method for push-button event. 
-        Calls event handler with event defining button Up or Down state 
+        Calls event handler with event defining button Up or Down state
+        
+        :param button: pin number of push-button  
         """        
         if self.gpio.input(button):
             event = self.BUTTONUP
@@ -126,7 +130,8 @@ def handle_event(self, event):
         """ Event handler for rotation and button events.
         Generates two Pygame user event for each RE event. 
         One button down and one button up events.
-        :param event: the event
+        
+        :param event: the event to handle
         """
         d = {}
         d[KEY_SUB_TYPE] = SUB_TYPE_KEYBOARD