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

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

This commit is contained in:
denise 2013-01-03 16:19:20 -05:00
parent e2c87ed8b6 5df867d142
commit c11032111e
4 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/views/scripts/preference/stream-setting.phtml
View File

@ -80,7 +80,7 @@
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php endif; ?> <?php endif; ?>
<div id="slider-range-max"></div> <div id="slider-range-max" style="width: 99%"></div>
</dd> </dd>
</dl> </dl>
</fieldset> </fieldset>

32
airtime_mvc/public/js/airtime/preferences/streamsetting.js
View File

@ -231,7 +231,7 @@ function setupEventListeners() {
} }
}) })
$('.toggle legend').live('click',function() { $('.toggle legend').click(function() {
$(this).parent().toggleClass('closed'); $(this).parent().toggleClass('closed');
return false; return false;
}); });
@ -375,21 +375,6 @@ function setupEventListeners() {
at: "right center" at: "right center"
}, },
}) })
$('#stream_save').live('click', function(){
var confirm_pypo_restart_text = $.i18n._("If you change the username or password values for an enabled stream the playout engine will be rebooted and your listeners will hear silence for 5-10 seconds. Changing the following fields will NOT cause a reboot: Stream Label (Global Settings), and Switch Transition Fade(s), Master Username, and Master Password (Input Stream Settings). If Airtime is recording, and if the change causes a playout engine restart, the recording will be interrupted.");
if (confirm(confirm_pypo_restart_text)) {
var data = $('#stream_form').serialize();
var url = baseUrl+'/Preference/stream-setting';
$.post(url, {format:"json", data: data}, function(data){
var json = $.parseJSON(data);
$('#content').empty().append(json.html);
setupEventListeners();
setSliderForReplayGain();
});
}
});
} }
function setSliderForReplayGain(){ function setSliderForReplayGain(){
@ -409,5 +394,20 @@ function setSliderForReplayGain(){
$(document).ready(function() { $(document).ready(function() {
setupEventListeners(); setupEventListeners();
setSliderForReplayGain(); setSliderForReplayGain();
$('#stream_save').live('click', function(){
var confirm_pypo_restart_text = $.i18n._("If you change the username or password values for an enabled stream the playout engine will be rebooted and your listeners will hear silence for 5-10 seconds. Changing the following fields will NOT cause a reboot: Stream Label (Global Settings), and Switch Transition Fade(s), Master Username, and Master Password (Input Stream Settings). If Airtime is recording, and if the change causes a playout engine restart, the recording will be interrupted.");
if (confirm(confirm_pypo_restart_text)) {
var data = $('#stream_form').serialize();
var url = baseUrl+'/Preference/stream-setting';
$.post(url, {format:"json", data: data}, function(data){
var json = $.parseJSON(data);
$('#content').empty().append(json.html);
setupEventListeners();
setSliderForReplayGain();
});
}
});
}); });

8
python_apps/media-monitor2/media/metadata/process.py
View File

@ -9,6 +9,7 @@ from collections import namedtuple
import mutagen import mutagen
import subprocess import subprocess
import json import json
import logging
class FakeMutagen(dict): class FakeMutagen(dict):
""" """
@ -168,7 +169,7 @@ def normalize_mutagen(path):
md['sample_rate'] = getattr(m.info, 'sample_rate', 0) md['sample_rate'] = getattr(m.info, 'sample_rate', 0)
md['mime'] = m.mime[0] if len(m.mime) > 0 else u'' md['mime'] = m.mime[0] if len(m.mime) > 0 else u''
md['path'] = normpath(path) md['path'] = normpath(path)
# silence detect(set default queue in and out) # silence detect(set default queue in and out)
try: try:
command = ['silan', '-f', 'JSON', md['path']] command = ['silan', '-f', 'JSON', md['path']]
@ -178,8 +179,9 @@ def normalize_mutagen(path):
md['cuein'] = info['sound'][0][0] md['cuein'] = info['sound'][0][0]
md['cueout'] = info['sound'][-1][1] md['cueout'] = info['sound'][-1][1]
except Exception: except Exception:
raise logger = logging.getLogger()
logger.info('silan is missing')
if 'title' not in md: md['title'] = u'' if 'title' not in md: md['title'] = u''
return md return md

2
python_apps/pypo/pypofetch.py
View File

@ -296,7 +296,7 @@ class PypoFetch(Thread):
dump, stream = s[u'keyname'].split('_', 1) dump, stream = s[u'keyname'].split('_', 1)
state_change_restart[stream] = False state_change_restart[stream] = False
# This is the case where restart is required no matter what # This is the case where restart is required no matter what
if (existing[s[u'keyname']] != s[u'value']): if (existing[s[u'keyname']] != str(s[u'value'])):
self.logger.info("'Need-to-restart' state detected for %s...", s[u'keyname']) self.logger.info("'Need-to-restart' state detected for %s...", s[u'keyname'])
restart = True; restart = True;
elif "master_live_stream_port" in s[u'keyname'] or "master_live_stream_mp" in s[u'keyname'] or "dj_live_stream_port" in s[u'keyname'] or "dj_live_stream_mp" in s[u'keyname']: elif "master_live_stream_port" in s[u'keyname'] or "master_live_stream_mp" in s[u'keyname'] or "dj_live_stream_port" in s[u'keyname'] or "dj_live_stream_mp" in s[u'keyname']: