Skip to content

Commit f303a69

Browse files
committed
vlc will use station volume (if applicable)
1 parent 606d4b5 commit f303a69

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

pyradio/player.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2242,6 +2242,7 @@ def play(self,
22422242
self.volume = -1
22432243
self.close()
22442244
self.name = name
2245+
self.station_volume = int(a_station[Station.volume]) if a_station[Station.volume] else -1
22452246
self.oldUserInput = {'Input': '', 'Volume': '', 'Title': ''}
22462247
self.muted = self.paused = False
22472248
self.show_volume = True
@@ -3667,10 +3668,17 @@ def _on_connect(self):
36673668
self.get_volume()
36683669
#self.actual_volume = int(self.max_volume*self._config_volume/100)
36693670
#logger.info('1 self.actual_volume = {}'.format(self.actual_volume))
3670-
if self.volume != self._config_volume:
3671+
volume_to_use = self.station_volume
3672+
if volume_to_use == -1:
3673+
volume_to_use = self._config_volume
3674+
if self.volume != volume_to_use:
3675+
if logger.isEnabledFor(logging.DEBUG):
3676+
logger.debug('volume: [config, station, used] = [{}, {}, {}]'.format(
3677+
self._config_volume, self.station_volume, volume_to_use)
3678+
)
36713679
#self.volume = self._config_volume
36723680
#self.set_volume(self.actual_volume)
3673-
self.set_volume(self._config_volume)
3681+
self.set_volume(volume_to_use)
36743682

36753683
def _read_config(self):
36763684
if self._config_volume == -1:

0 commit comments

Comments
 (0)