Skip to content

Commit 52f42aa

Browse files
committed
- Player Selection Window: "l" will select a player, "h" will cancel
- Keep recording a station if player changed while recording
1 parent 09b3b71 commit 52f42aa

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

pyradio/player.py

+1
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ def __init__(self,
303303
self.monitor = self.monitor_process = None
304304
self.monitor_opts = self.monitor_update_thread = None
305305
self._recording_lock = recording_lock
306+
self.already_playing = False
306307

307308
@property
308309
def recording(self):

pyradio/radio.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,11 @@ def keypress(self, char):
231231
elif char in (
232232
curses.KEY_ENTER,
233233
ord('\n'), ord('\r'),
234-
ord('s'), ord(' ')
234+
ord('s'), ord(' '),
235+
ord('l'), curses.KEY_RIGHT
235236
):
236237
return self._available_players[self._selected]
237-
elif char in (ord('q'), curses.KEY_EXIT, 27):
238+
elif char in (ord('h'), ord('q'), curses.KEY_EXIT, 27):
238239
return None
239240
return ''
240241

@@ -7006,6 +7007,7 @@ def keypress(self, char):
70067007
logger.debug('selected player = {}'.format(ret))
70077008
self._change_player = None
70087009
to_play = self.playing
7010+
to_record = self.player.recording
70097011
if self.player.isPlaying():
70107012
self.stopPlayer()
70117013
self.player = None
@@ -7022,6 +7024,7 @@ def keypress(self, char):
70227024
self._add_station_to_stations_history,
70237025
self._recording_lock
70247026
)
7027+
self.player.recording = to_record
70257028
self.log.display_help_message = False
70267029
self.log.write(ret + ': Player activated!!!', help_msg=False, suffix='')
70277030
self.player.volume = -1

0 commit comments

Comments
 (0)