changing internal streaming method from ugly wget-streaming to the gstreamer-streamin...

diff --git a/lastfm/src/StreamPlayer.py b/lastfm/src/StreamPlayer.py
index 225299a..61b7607 100755 (executable)
--- a/lastfm/src/StreamPlayer.py
+++ b/lastfm/src/StreamPlayer.py
@@ -1,12 +1,10 @@
 from enigma import eServiceReference
-from os import system
-from os.path import isfile as os_path_isfile
+from enigma import iPlayableService
 from time import time
 from urllib import quote_plus
 from Components.config import config
-
-from enigma import iPlayableService
 from Components.ServiceEventTracker import ServiceEventTracker
+
 class StreamPlayer:
     STATE_PLAYINGSTARTED = 0
     STATE_STOP = 1
@@ -25,8 +23,6 @@ class StreamPlayer:
             {
                 iPlayableService.evStart: self.__onStart,
                 iPlayableService.evEOF: self.__onStop,
-                iPlayableService.evEnd: self.__onEnd,
-                iPlayableService.evStopped: self.__onStopped,
             })
     
     def __onStart(self):
@@ -36,14 +32,6 @@ class StreamPlayer:
     def __onStop(self):
         print "STOP"*20
         self.stop("got EVENT 6, GST stopped")
-    
-    def __onStopped(self):
-        #for know just for debugging
-        print "STOPPED"*20
-    
-    def __onEnd(self):
-        #for know just for debugging
-        print "END"*20
         
     def setSession(self,session):
         self.session = session
@@ -56,6 +44,7 @@ class StreamPlayer:
     def stateChanged(self,reason):
         for i in self.onStateChanged:
             i(reason)   
+
     def getRemaining(self):
         track = self.playlist.getTrack(self.currentplaylistitemnumber)
         if track is False:
@@ -85,20 +74,8 @@ class StreamPlayer:
         elif track['location'] != "no location":
             print "playing item "+str(self.currentplaylistitemnumber) +"/"+str(self.playlist.length)+" with url ",track['location']
             self.session.nav.stopService()
-            self.targetfile = "/tmp/lastfm.mp3"
-            system("mknod %s p" %self.targetfile)
-            url = track['location']
-            cmdstring = ""
-            if config.plugins.LastFM.useproxy.value:
-                if os_path_isfile("/tmp/lastfmproxy"):
-                    url += "?savetrack=true&artist=%s&album=%s&title=%s&image=%s"%(quote_plus(track["creator"]),quote_plus(track["album"]),quote_plus(track["title"]),quote_plus(track["image"]))
-                    cmdstring += ("export http_proxy=\"http://localhost:%i\"; "%config.plugins.LastFM.proxyport.value)+cmdstring
-                else:
-                    print "lastfmproxy seem not running, not using it"
-            cmdstring += "wget  '%s' -Y on -O- > '%s'&" %(url,self.targetfile)
-            
-            system(cmdstring)
-            self.session.nav.playService(eServiceReference("4097:0:0:0:0:0:0:0:0:0:%s"%self.targetfile))
+            sref = eServiceReference(4097,0,track['location'])
+            self.session.nav.playService(sref)
         self.is_playing = True
 
     def skip(self):
@@ -113,8 +90,6 @@ class StreamPlayer:
             self.stateChanged(self.STATE_PLAYINGSTARTED)
         elif self.is_playing is True and force is True:
             self.session.nav.stopService()
-            system("killall -9 wget")
-            system("rm %s" %self.targetfile)
             self.session.nav.playService(self.oldService)
             self.is_playing = False
             self.stateChanged(self.STATE_STOP)