Remove 'timeline/subscribe' calls

Author: jjlawren

plexapi/client.py

@@ -195,10 +195,11 @@ def sendCommand(self, command, proxy=None, **params):
 
         # Workaround for ptp. See https://github.com/pkkid/python-plexapi/issues/244
         t = time.time()
-        if t - self._last_call >= 80 and self.product in ('ptp', 'Plex Media Player'):
-            url = '/player/timeline/poll?wait=0&commandID=%s' % self._nextCommandId()
-            query(url, headers=headers)
+        if command == 'timeline/poll':
             self._last_call = t
+        elif t - self._last_call >= 80 and self.product in ('ptp', 'Plex Media Player'):
+            self._last_call = t
+            self.timeline()
 
         params['commandID'] = self._nextCommandId()
         key = '/player/%s%s' % (command, utils.joinArgs(params))
@@ -485,15 +486,6 @@ def playMedia(self, media, offset=0, **params):
         if mediatype == "audio":
             mediatype = "music"
 
-        if self.product != 'OpenPHT':
-            try:
-                self.sendCommand('timeline/subscribe', port=server_port, protocol='http')
-            except:  # noqa: E722
-                # some clients dont need or like this and raises http 400.
-                # We want to include the exception in the log,
-                # but it might still work so we swallow it.
-                log.exception('%s failed to subscribe ' % self.title)
-
         playqueue = media if isinstance(media, PlayQueue) else self._server.createPlayQueue(media)
         self.sendCommand('playback/playMedia', **dict({
             'machineIdentifier': self._server.machineIdentifier,
@@ -548,7 +540,7 @@ def setStreams(self, audioStreamID=None, subtitleStreamID=None, videoStreamID=No
 
     # -------------------
     # Timeline Commands
-    def timeline(self, wait=1):
+    def timeline(self, wait=0):
         """ Poll the current timeline and return the XML response. """
         return self.sendCommand('timeline/poll', wait=wait)
 
@@ -559,7 +551,7 @@ def isPlayingMedia(self, includePaused=False):
                 includePaused (bool): Set True to treat currently paused items
                     as playing (optional; default True).
         """
-        for mediatype in self.timeline(wait=0):
+        for mediatype in self.timeline():
             if mediatype.get('state') == 'playing':
                 return True
             if includePaused and mediatype.get('state') == 'paused':