version 0.9.2.14

Author: s-n-g

README.html

@@ -1626,7 +1626,7 @@ <h3 id="parameters-used">Parameters used</h3>
 </tr>
 </tbody>
 </table>
-<p>* disabled if more than 300KB of memory is free</p>
+<p>* disabled if more than 500KB of memory is free</p>
 <h3 id="customizing-the-buffering-behaviour">Customizing the buffering behaviour</h3>
 <p>In case one wants to use a different set of parameters (when using <strong>mpv</strong> or <strong>mplayer</strong>, but not <strong>vlc</strong>), one would just not use the integrated solution; one would just use a <strong>profile</strong>.</p>
 <p>Please refer to the players’ documentation on profiles and the “<a href="#player-default-volume-level">Player default volume level</a>” section in this document.</p>

README.md

@@ -800,7 +800,7 @@ The following table shows the command line parameters used by **PyRadio** when t
 | --cache-secs=X                 |                          |                          |
 | --cache-on-disk=yes/no \*      |                          |                          |
 
-\* disabled if more than 300KB of memory is free
+\* disabled if more than 500KB of memory is free
 
 ### Customizing the buffering behaviour
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyradio"
-version = "0.9.2.13"
+version = "0.9.2.14"
 authors = [
   { name="Ben Dowling", email="[email protected]" },
   { name="Spiros Georgaras", email="[email protected]" },

pyradio.1

@@ -907,7 +907,7 @@ The following list shows the command line parameters used by \fBpradio\fR when t
 .br
 --cache-on-disk=yes/no \fB*\fR
 
-\fB*\fR disabled if more than 300KB of memory is free
+\fB*\fR disabled if more than 500KB of memory is free
 .RE
 
 

pyradio/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 " pyradio -- Console radio player. "
 
-version_info = (0, 9, 2, 13)
+version_info = (0, 9, 2, 14)
 
 # Set it to True if new stations have been
 # added to the package's stations.csv

pyradio/install.py

@@ -15,7 +15,7 @@
 ''' This is PyRadio version this
     install.py was released for
 '''
-PyRadioInstallPyReleaseVersion = '0.9.2.13'
+PyRadioInstallPyReleaseVersion = '0.9.2.14'
 
 import locale
 locale.setlocale(locale.LC_ALL, "")

pyradio/player.py

@@ -931,6 +931,8 @@ def updateStatus(self, *args):
                                 'Stream buffering done' in subsystemOut or \
                                 'Buffering ' in subsystemOut:
                             self.buffering = False
+                            if self.PLAYER_NAME == 'vlc':
+                                on_connect()
                             with self.buffering_lock:
                                 self.buffering_change_function()
                             with self.status_update_lock:
@@ -2982,7 +2984,7 @@ class VlcPlayer(Player):
                 ' Segment #',
                 'using audio decoder module',
                 'answer code 200',
-                'buffering done',
+                ' buffering done',
                 'Buffering '
             )
             # max_volume = 1000
@@ -2993,7 +2995,7 @@ class VlcPlayer(Player):
                 'using audio filter module',
                 'using audio decoder module',
                 'answer code 200',
-                'buffering done'
+                ' buffering done'
             )
 
         ''' Windows only variables '''
@@ -3029,6 +3031,8 @@ def __init__(self,
 
     def _on_connect(self):
         logger.error('\n\n***********  VLC on connect\n\n')
+        if self.buffering:
+            logger.error('not setting volume: buffering')
         if self._config_volume > -1:
             self.get_volume()
             #self.actual_volume = int(self.max_volume*self._config_volume/100)
@@ -3063,7 +3067,7 @@ def _write_config(self):
                 f.write(str(self.volume))
         except:
             return False
-        self._config_volume - self.volume
+        self._config_volume = self.volume
         return True
 
     def _volume_set(self, vol):

pyradio/radio.py

@@ -2177,6 +2177,7 @@ def playbackTimeoutCounter(self, *args):
 
     def connectionFailed(self):
         # ok
+        self.buffering = self.player.playback_is_on = False
         self.detect_if_player_exited = False
         if self.ws.operation_mode in (self.ws.STATION_INFO_MODE,
                 self.ws.STATION_DATABASE_INFO_MODE,
@@ -7017,7 +7018,7 @@ def keypress(self, char):
                     self._cnf.buffering_data = x.cache[:]
                     self._show_notification_with_delay(
                             txt='___Buffering set to {0} {1}___'.format(
-                                    x.delay,
+                                    int(x.delay / 1000) if self.player.PLAYER_NAME == 'vlc' else x.delay,
                                     'KBytes' if self.player.PLAYER_NAME == 'mplayer' else 'seconds',
                                 ),
                             mode_to_set=self.ws.NORMAL_MODE,