Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
James 2012-12-28 16:20:21 -05:00
parent 1dfe99224c b9d829a33c
commit 5e42695718
3 changed files with 3245 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.mo Normal file
View File

Binary file not shown.

3243
airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po Normal file
View File

File diff suppressed because it is too large Load Diff

3
python_apps/pypo/pypopush.py
View File

@ -209,7 +209,8 @@ class PypoPush(Thread):
else: else:
correct = liquidsoap_queue_approx[0]['start'] == media_item['start'] and \ correct = liquidsoap_queue_approx[0]['start'] == media_item['start'] and \
liquidsoap_queue_approx[0]['row_id'] == media_item['row_id'] and \ liquidsoap_queue_approx[0]['row_id'] == media_item['row_id'] and \
liquidsoap_queue_approx[0]['end'] == media_item['end'] liquidsoap_queue_approx[0]['end'] == media_item['end'] and \
liquidsoap_queue_approx[0]['replay_gain'] == media_item['replay_gain']
elif is_stream(media_item): elif is_stream(media_item):
correct = liquidsoap_stream_id == str(media_item['row_id']) correct = liquidsoap_stream_id == str(media_item['row_id'])