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

Merge branch 'cc-2015-on-reboot-resume-show' into devel

Browse source 
Conflicts:
	python_apps/media-monitor/airtime-media-monitor-init-d
This commit is contained in:
martin 2011-06-17 15:10:33 -04:00
commit 2e4519f156
32 changed files with 401 additions and 389 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_apps/api_clients/api_client.py
View file

@ -619,7 +619,7 @@ class ObpApiClient():
def get_liquidsoap_data(self, pkey, schedule):
playlist = schedule[pkey]
data = dict()
data["ptype"] = playlist['subtype']
#data["ptype"] = playlist['subtype']
try:
data["user_id"] = playlist['user_id']
data["playlist_id"] = playlist['id']