- adding support for playback start, title and volume to TTS

Author: s-n-g

pyradio/common.py

@@ -68,6 +68,7 @@ class Station(IntEnum):
 	'press-?': ' Press ? for help',
 	'error-str': 'error',
 	'vol_': 'Vol: ',
+    'volume_set': 'Volume set to ',
     'error-403': 'Server returned "Forbidden" (error 403)',
     'error-404': 'Station does not exist (error 404)',
     'error-503': 'Service not available (error 503)',

pyradio/log.py

@@ -20,6 +20,7 @@
     from importlib_resources import files, as_file   # backport για 3.7–3.8
 from .common import STATES, M_STRINGS
 from .cjkwrap import cjklen, cjkslices
+from .tts import Priority
 
 locale.setlocale(locale.LC_ALL, "")
 
@@ -246,7 +247,8 @@ def __init__(self,
                  config,
                  current_player_id,
                  active_player_id,
-                 get_web_song_title
+                 get_web_song_title,
+                 tts
                  ):
         self.program_restart = False
         self.error_msg = False
@@ -314,6 +316,7 @@ def __init__(self,
         self._stop_thread = False
         self.timer = None
         self._started_station_name = None
+        self.tts = tts
 
     def __del__(self):
         self._stop_desktop_notification_thread = True
@@ -411,6 +414,20 @@ def write(self,
               error_msg=False,
               notify_function=None):
         with self.lock:
+            try:
+                if self.tts and self.tts():
+                    if msg_id == STATES.TITLE \
+                            and msg and msg.startswith(M_STRINGS['title_']):
+                        self.tts().queue_speech(msg.replace(':', ',',1))
+                        pass
+                    elif msg_id == STATES.VOLUME:
+                        logger.error(f'{msg = }')
+                        s_msg = msg.split(']')[0].split(' ')[-1]
+                        logger.error(f'{s_msg = }')
+                        self.tts().queue_speech(M_STRINGS['volume_set'] + s_msg.split('%')[0] + ' percent', Priority.HIGH)
+            except AttributeError:
+                pass
+
             current_player_id = self._current_player_id()
             active_player_id = self._active_player_id()
 

pyradio/player.py

@@ -15,6 +15,7 @@
 import socket
 from shutil import copyfile as shutil_copy_file
 import locale
+from .tts import Priority
 locale.setlocale(locale.LC_ALL, "")
 # this is for windows...
 try:
@@ -340,6 +341,8 @@ class Player():
 
     enable_per_station_volume = True
 
+    tts = None
+
     def __init__(self,
                  config,
                  outputStream,
@@ -2129,6 +2132,7 @@ def play(self,
         self.playback_is_on = False
         self.delay_thread = None
         self.outputStream.write(msg_id=STATES.CONNECT, msg=M_STRINGS['station_'] + name + M_STRINGS['station-open'], counter='')
+        self._speak(f'Playing station: {name}', Priority.NORMAL)
         if logger.isEnabledFor(logging.INFO):
             logger.info('Selected Station: ' + name)
         if encoding:
@@ -2307,6 +2311,10 @@ def play(self,
         if referer_file:
             self.handle_old_referer(referer, referer_file)
 
+    def _speak(self, msg, priority):
+        if self.tts and self.tts():
+            self.tts().queue_speech(msg, priority)
+
     def _sendCommand(self, command):
         ''' send keystroke command to player '''
         if [x for x in ('q', 'shutdown') if command.startswith(x)]:
@@ -3923,7 +3931,10 @@ def get_volume(self, repeat=False):
             sleep(1)
             self.get_volume(repeat=True)
         self.actual_volume = self.volume
-        self.volume = int(100 * self.actual_volume / self.max_volume)
+        try:
+            self.volume = int(100 * int(self.actual_volume) / int(self.max_volume))
+        except Exception as e:
+            logger.error(f'exception: {e}')
         # logger.error('Final')
         # logger.error('self.actual_volume = {}'.format(self.actual_volume))
         # logger.error('self.volume = {}'.format(self.volume))

pyradio/radio.py

@@ -58,7 +58,7 @@
 from .messages_system import PyRadioMessagesSystem
 from .server import PyRadioServer, HAS_NETIFACES
 from .keyboard import kbkey, get_lkbkey, get_unicode_and_cjk_char, dequeue_input, input_queue, set_kb_letter, check_localized, add_l10n_to_functions_dict, set_kb_cjk
-from .tts import TTSManager
+from .tts import TTSManager, Priority
 HAVE_CHARSET_NORMALIZER = True
 try:
     from .m3u import parse_m3u
@@ -263,7 +263,6 @@ def keypress(self, char):
 
 class PyRadio():
     player = None
-    ws = Window_Stack()
 
     _i_am_resizing = False
     _redisplay_list = []
@@ -512,6 +511,7 @@ def __init__(self, pyradio_config,
             in log.write, if _current_player_id != _active_player_id
                     do not display any message
         '''
+        self.ws = Window_Stack(self._speak_selection)
         self.player = None
         # player data
         self._default_player_name = None
@@ -1047,7 +1047,7 @@ def _set_text_volume(self, vol):
             # self._remote_control_server._send_text('Volume set!')
             self.player.set_volume(vol)
             sleep(.1)
-            return f'Volume set to: {vol}'
+            return M_STRINGS['volume_set'] + f'{vol}'
         else:
             if self.player.muted:
                 return 'Player is Muted!'
@@ -1251,7 +1251,8 @@ def setup(self, stdscr):
             self._cnf,
             lambda: self._current_player_id,
             lambda: self._active_player_id,
-            lambda: self._remote_control_server
+            lambda: self._remote_control_server,
+            lambda: self.tts
         )
         self.log.program_restart = self.program_restart
         self.program_restart = False
@@ -1287,6 +1288,7 @@ def setup(self, stdscr):
             self.player.log = self.log
             self.player.handle_old_referer = self._handle_old_referer
             self.player.update_bitrate = self._update_bitrate
+            self.player.tts = lambda: self.tts
             if self._request_recording:
                 if not (platform.startswith('win') and \
                         self.player.PLAYER_NAME == 'vlc'):
@@ -2217,6 +2219,8 @@ def run(self):
 
             self._cnf.setup_mouse()
 
+            self._speak_selection()
+
             if not self._cnf.use_themes \
                     and not self._cnf.no_themes_notification_shown \
                     and not self._cnf.no_themes_from_command_line:
@@ -4191,7 +4195,8 @@ def _open_playlist(self, a_url=None):
                         if not self._cnf._online_browser.initialize():
                             ''' browser cannot be opened '''
                             self._cnf.remove_from_playlist_history()
-                            self.ws.close_window()
+                            self.ws.close_window(no_tts=True)
+                            self._speak_high('Error, cannot connect to Radio Browser')
                             self._print_service_connection_error()
                             self._cnf.browsing_station_service = False
                             self._cnf.online_browser = None
@@ -4202,6 +4207,7 @@ def _open_playlist(self, a_url=None):
 
                         ''' make sure we don't send a wrong click '''
                         self._cnf._online_browser.search()
+                        self._speak_selection()
                     else:
                         self._cnf.remove_from_playlist_history()
                         self._open_simple_message_by_key(
@@ -4635,6 +4641,7 @@ def _open_playlist_from_history(self,
                 #     self._cnf.save_last_playlist()
             if result:
                 self._normal_mode_resize()
+                self._speak_selection()
         return result
 
     def _get_station_id(self, find):
@@ -6659,6 +6666,7 @@ def _activate_player(self, player_name):
         self.player.update_bitrate = self._update_bitrate
         self.player.log = self.log
         self.player.handle_old_referer = self._handle_old_referer
+        self.player.tts = lambda: self.tts
         if not (self.player.PLAYER_NAME == 'vlc' and \
                 platform.startswith('win')):
             self.player.recording = to_record
@@ -6747,11 +6755,17 @@ def _exit_program_or_playlist_mode(self):
             self._cnf.EXTERNAL_PLAYER_OPTS = None
             return False
 
+    def _speak_high(self, msg):
+        self.tts.queue_speech(msg, Priority.HIGH)
+
+    def _speak_normal(self, msg):
+        self.tts.queue_speech(msg, Priority.NORMAL)
+
     def _speak_selection(self):
         if self.ws.operation_mode == self.ws.NORMAL_MODE:
-            self.tts.speak(f'Selected station: {self.stations[self.selection][0]}')
+            self.tts.queue_speech(f'{self.selection+1}. {self.stations[self.selection][0]}', Priority.NORMAL)
         elif self.ws.operation_mode == self.ws.PLAYLIST_MODE:
-            self.tts.speak(f'Selected playlist: {self.stations[self.selection][0]}')
+            self.tts.queue_speech(f'{self.selection+1}. {self.stations[self.selection][0]}', Priority.NORMAL)
 
     def keypress(self, char):
         ''' PyRadio keypress '''
@@ -9760,6 +9774,7 @@ def keypress(self, char):
                 self._update_status_bar_right()
                 if self.number_of_items > 0:
                     self.setStation(-1)
+                    self._speak_selection()
                     self.refreshBody()
                 return
 
@@ -9768,6 +9783,7 @@ def keypress(self, char):
                 self._jump_to_jumpnr(char)
                 self.refreshBody()
                 self._reset_status_bar_right()
+                self._speak_selection()
                 return
 
             if char in map(ord, map(str, range(0, 10))):
@@ -9786,6 +9802,7 @@ def keypress(self, char):
                 self._update_status_bar_right()
                 self.setStation(0)
                 self.refreshBody()
+                self._speak_selection()
                 return
 
             if char in (curses.KEY_EXIT, kbkey['q'], 27)  or \