Merge pull request #2068 from FoamyGuy/winamp_titano

Winamp project updates for PyPortal titano

Author: ladyada

PyPortal_Winamp_Player/PyPortal_Winamp_Skin_Converter/base_320x480.bmp

@@ -14,10 +14,15 @@
 else:
     input_filename = "base.png"
 
+if "-t" in sys.argv or "--titano" in sys.argv:
+    newsize = (320, 480)
+else:
+    newsize = (240, 320)
+
 # Opens a image in RGB mode
 im = Image.open(input_filename)
 
-newsize = (240, 320)
+
 
 find_text_color_dict = {}
 
@@ -97,4 +102,4 @@
 # convert to indexed color
 im = im.convert(mode="P", palette=Image.WEB)
 # save output BMP file
-im.save(input_filename.replace(".png", "_240x320.bmp"))
+im.save(input_filename.replace(".png", "_{}x{}.bmp".format(newsize[0], newsize[1])))

PyPortal_Winamp_Player/PyPortal_Winamp_Skin_Converter/convert_winamp_skin.py

@@ -29,28 +29,54 @@
 # display orientation. Must be 90 or 270.
 ORIENTATION = 90
 
-if ORIENTATION == 270:
-    # setup touch screen
-    ts = adafruit_touchscreen.Touchscreen(
-        board.TOUCH_YD,
-        board.TOUCH_YU,
-        board.TOUCH_XR,
-        board.TOUCH_XL,
-        calibration=((5200, 59000), (5800, 57000)),
-        size=(240, 320),
-    )
-elif ORIENTATION == 90:
-    # setup touch screen
-    ts = adafruit_touchscreen.Touchscreen(
-        board.TOUCH_YU,
-        board.TOUCH_YD,
-        board.TOUCH_XL,
-        board.TOUCH_XR,
-        calibration=((5200, 59000), (5800, 57000)),
-        size=(240, 320),
-    )
-else:
-    raise ValueError("ORIENTATION must be 90 or 270")
+PYPORTAL_TITANO = False
+
+if not PYPORTAL_TITANO:
+    SIZE = (240, 320)
+    if ORIENTATION == 270:
+        # setup touch screen
+        ts = adafruit_touchscreen.Touchscreen(
+            board.TOUCH_YD,
+            board.TOUCH_YU,
+            board.TOUCH_XR,
+            board.TOUCH_XL,
+            calibration=((5200, 59000), (5800, 57000)),
+            size=(240, 320),
+        )
+    elif ORIENTATION == 90:
+        # setup touch screen
+        ts = adafruit_touchscreen.Touchscreen(
+            board.TOUCH_YU,
+            board.TOUCH_YD,
+            board.TOUCH_XL,
+            board.TOUCH_XR,
+            calibration=((5200, 59000), (5800, 57000)),
+            size=(240, 320),
+        )
+    else:
+        raise ValueError("ORIENTATION must be 90 or 270")
+else:  # PyPortal Titano
+    SIZE = (320, 480)
+    if ORIENTATION == 270:
+        # setup touch screen
+        ts = adafruit_touchscreen.Touchscreen(
+            board.TOUCH_YD,
+            board.TOUCH_YU,
+            board.TOUCH_XR,
+            board.TOUCH_XL,
+            calibration=((5200, 59000), (5800, 57000)),
+            size=(320, 480),
+        )
+    elif ORIENTATION == 90:
+        # setup touch screen
+        ts = adafruit_touchscreen.Touchscreen(
+            board.TOUCH_YU,
+            board.TOUCH_YD,
+            board.TOUCH_XL,
+            board.TOUCH_XR,
+            calibration=((5200, 59000), (5800, 57000)),
+            size=(320, 480),
+        )
 
 # Initializations for SDCard
 spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
@@ -74,6 +100,7 @@
     playlist_file=PLAYLIST_FILE,
     skin_image=SKIN_IMAGE,
     skin_config_file=SKIN_CONFIG_FILE,
+    pyportal_titano=PYPORTAL_TITANO,
 )
 
 # Add the Group to the Display
@@ -100,16 +127,16 @@
             # store the time to compare with next iteration
             _previous_touch_time = _now
             # if touch is on bottom half
-            if p[1] > 320 // 2:
+            if p[1] > SIZE[1] // 2:
                 # if touch is on right half
-                if p[0] >= 240 // 2:
+                if p[0] >= SIZE[0] // 2:
                     winamp_application.next_track()
 
                 # if touch is on left half
                 else:
                     winamp_application.previous_track()
             # if touch is on top half
-            elif p[1] <= 240 // 2:
+            else:
                 # if currently playing song
                 if winamp_application.CURRENT_STATE == winamp_application.STATE_PLAYING:
                     print("pausing")

PyPortal_Winamp_Player/code.py

@@ -23,16 +23,18 @@ class WinampApplication(displayio.Group):
     :param playlist_file: json file containing the playlist of songs
     :param skin_image: BMP image file for skin background
     :param skin_config_file: json file containing color values
+    :param pyportal_titano: boolean value. True if using Titano, False otherwise.
     """
 
     STATE_PLAYING = 0
     STATE_PAUSED = 1
-
+    # pylint: disable=too-many-statements
     def __init__(
         self,
         playlist_file="playlist.json",
         skin_image="/base_240x320.bmp",
         skin_config_file="base_config.json",
+        pyportal_titano=False,
     ):
         self.SKIN_IMAGE = skin_image
         self.SKIN_CONFIG_FILE = skin_config_file
@@ -50,15 +52,35 @@ def __init__(
 
         # initialize clock display
         self.clock_display = ClockDisplay(text_color=self.CONFIG_DATA["time_color"])
-        self.clock_display.x = 44
-        self.clock_display.y = 22
+        if not pyportal_titano:
+            # standard PyPortal and pynt clock display location
+            # and playlist display parameters
+            self.clock_display.x = 44
+            self.clock_display.y = 22
+            _max_playlist_display_chars = 30
+            _rows = 3
+        else:
+            # PyPortal Titano clock display location
+            # and playlist display parameters
+            self.clock_display.x = 65
+            self.clock_display.y = 37
+            _max_playlist_display_chars = 42
+            _rows = 4
 
         # initialize playlist display
         self.playlist_display = PlaylistDisplay(
-            text_color=self.CONFIG_DATA["text_color"]
+            text_color=self.CONFIG_DATA["text_color"],
+            max_chars=_max_playlist_display_chars,
+            rows=_rows,
         )
-        self.playlist_display.x = 13
-        self.playlist_display.y = 234
+        if not pyportal_titano:
+            # standard PyPortal and pynt playlist display location
+            self.playlist_display.x = 13
+            self.playlist_display.y = 234
+        else:
+            # PyPortal Titano playlist display location
+            self.playlist_display.x = 20
+            self.playlist_display.y = 354
 
         # set playlist into playlist display
         self.playlist_display.from_files_list(self.PLAYLIST["playlist"]["files"])
@@ -69,15 +91,26 @@ def __init__(
             self.playlist_display.current_track_number - 1
         ]
 
+        if not pyportal_titano:
+            # standard PyPortal and pynt max characters for track title
+            _max_chars = 22
+        else:
+            # PyPortal Titano max characters for track title
+            _max_chars = 29
         # initialize ScrollingLabel for track name
         self.current_song_lbl = scrolling_label.ScrollingLabel(
             terminalio.FONT,
             text=self.playlist_display.current_track_title,
             color=self.CONFIG_DATA["text_color"],
-            max_characters=22,
+            max_characters=_max_chars,
         )
         self.current_song_lbl.anchor_point = (0, 0)
-        self.current_song_lbl.anchored_position = (98, 19)
+        if not pyportal_titano:
+            # standard PyPortal and pynt track title location
+            self.current_song_lbl.anchored_position = (98, 19)
+        else:
+            # PyPortal Titano track title location
+            self.current_song_lbl.anchored_position = (130, 33)
 
         # Setup the skin image file as the bitmap data source
         self.background_bitmap = displayio.OnDiskBitmap(self.SKIN_IMAGE)
@@ -193,8 +226,15 @@ def next_track(self):
         # increment current track number
         self.playlist_display.current_track_number += 1
 
-        # start playing track
-        self.play_current_track()
+        try:
+            # start playing track
+            self.play_current_track()
+        except OSError as e:
+            # file not found
+            print("Error playing: {}".format(self.current_song_file_name))
+            print(e)
+            self.next_track()
+            return
 
     def previous_track(self):
         """
@@ -209,8 +249,15 @@ def previous_track(self):
         # decrement current track number
         self.playlist_display.current_track_number -= 1
 
-        # start playing track
-        self.play_current_track()
+        try:
+            # start playing track
+            self.play_current_track()
+        except OSError as e:
+            # file not found
+            print("Error playing: {}".format(self.current_song_file_name))
+            print(e)
+            self.previous_track()
+            return
 
     def pause(self):
         """
@@ -244,17 +291,24 @@ class PlaylistDisplay(displayio.Group):
 
     :param text_color: Hex color code for the text in the list
     :param song_list: Song names in the list
-    :param current_track_number: initial track number shown at the top of the list.
+    :param current_track_number: initial track number shown at the top of the list.l
+    :param max_chars: int max number of characters to show in a row. Excess characters are cut.
+    :param rows: how many rows to show. One track per row. Default 3 rows
     """
 
-    def __init__(self, text_color, song_list=None, current_track_number=0):
+    def __init__(
+        self, text_color, song_list=None, current_track_number=0, max_chars=30, rows=3
+    ):
         super().__init__()
 
+        self._rows = rows
         if song_list is None:
             song_list = []
         self._song_list = song_list
         self._current_track_number = current_track_number
 
+        self._max_chars = max_chars
+
         # the label to show track titles inside of
         self._label = bitmap_label.Label(terminalio.FONT, color=text_color)
 
@@ -275,13 +329,15 @@ def update_display(self):
 
         # get the current track plus the following 2
         _showing_songs = self.song_list[
-            self.current_track_number - 1 : self.current_track_number + 3 - 1
+            self.current_track_number - 1 : self.current_track_number + self._rows - 1
         ]
 
         # format the track titles into a single string with newlines
         _showing_string = ""
         for index, song in enumerate(_showing_songs):
-            _cur_line = "{}. {}".format(self.current_track_number + index, song[:30])
+            _cur_line = "{}. {}".format(
+                self.current_track_number + index, song[: self._max_chars]
+            )
             _showing_string = "{}{}\n".format(_showing_string, _cur_line)
 
         # put it into the label