Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-1469: Crossfading support (non-equal power)

Browse source 
-refactor
This commit is contained in:
Martin Konecny 2013-03-22 12:16:17 -04:00
parent 6dae7d3973
commit 33ca2e7c9c
8 changed files with 261 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

26
python_apps/pypo/telnetliquidsoap.py
View file

@ -63,13 +63,12 @@ class TelnetLiquidsoap:
self.telnet_lock.release()
def stop_web_stream_buffer(self, media_item):
def stop_web_stream_buffer(self):
try:
self.telnet_lock.acquire()
tn = telnetlib.Telnet(self.ls_host, self.ls_port)
#dynamic_source.stop http://87.230.101.24:80/top100station.mp3
#msg = 'dynamic_source.read_stop %s\n' % media_item['row_id']
msg = 'http.stop\n'
self.logger.debug(msg)
tn.write(msg)
@ -86,7 +85,7 @@ class TelnetLiquidsoap:
finally:
self.telnet_lock.release()
def stop_web_stream_output(self, media_item):
def stop_web_stream_output(self):
try:
self.telnet_lock.acquire()
tn = telnetlib.Telnet(self.ls_host, self.ls_port)
@ -142,13 +141,30 @@ class TelnetLiquidsoap:
tn.write("exit\n")
self.logger.debug(tn.read_all())
#TODO..
self.current_prebuffering_stream_id = media_item['row_id']
except Exception, e:
self.logger.error(str(e))
finally:
self.telnet_lock.release()
def get_current_stream_id():
try:
self.telnet_lock.acquire()
tn = telnetlib.Telnet(self.ls_host, self.ls_port)
msg = 'dynamic_source.get_id\n'
self.logger.debug(msg)
tn.write(msg)
tn.write("exit\n")
stream_id = tn.read_all().splitlines()[0]
self.logger.debug("stream_id: %s" % stream_id)
return stream_id
except Exception, e:
self.logger.error(str(e))
finally:
self.telnet_lock.release()
class DummyTelnetLiquidsoap: