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 2013-01-08 17:32:39 -05:00
parent 1263c04621 8b8e12a234
commit 6e7f45e615
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/controllers/LocaleController.php
View File

@ -180,6 +180,7 @@ class LocaleController extends Zend_Controller_Action
"If your live streaming client does not ask for a username, this field should be 'source'." => _("If your live streaming client does not ask for a username, this field should be 'source'."), "If your live streaming client does not ask for a username, this field should be 'source'." => _("If your live streaming client does not ask for a username, this field should be 'source'."),
"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 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 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 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."),
"This is the admin username and password for Icecast/SHOUTcast to get listener statistics." => _("This is the admin username and password for Icecast/SHOUTcast to get listener statistics."),
//preferences/support-setting.js //preferences/support-setting.js
"Image must be one of jpg, jpeg, png, or gif" => _("Image must be one of jpg, jpeg, png, or gif"), "Image must be one of jpg, jpeg, png, or gif" => _("Image must be one of jpg, jpeg, png, or gif"),
//schedule/add-show.js //schedule/add-show.js

1
airtime_mvc/application/controllers/UserController.php
View File

@ -58,7 +58,6 @@ class UserController extends Zend_Controller_Action
$user = new Application_Model_User($formData['user_id']); $user = new Application_Model_User($formData['user_id']);
$user->setFirstName($formData['first_name']); $user->setFirstName($formData['first_name']);
$user->setLastName($formData['last_name']); $user->setLastName($formData['last_name']);
$user->setLogin($formData['login']);
// We don't allow 6 x's as a password. // We don't allow 6 x's as a password.
// The reason is because we that as a password placeholder // The reason is because we that as a password placeholder
// on the client side. // on the client side.

2
airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
View File

@ -1,6 +1,6 @@
<div id="content" class="jp-container"> <div id="content" class="jp-container">
<h1><? echo _("Live stream") ?></h1> <h1><? echo _("Live stream") ?></h1>
<a id="popup-link" href="#">Share</a> <a id="popup-link" href="#"><?php echo _("Share") ?></a>
<?php $ids = Application_Model_StreamSetting::getEnabledStreamIds(); ?> <?php $ids = Application_Model_StreamSetting::getEnabledStreamIds(); ?>
<script> <script>
function setjPlayer(url, type, serverType){ function setjPlayer(url, type, serverType){

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

@ -357,7 +357,7 @@ function setupEventListeners() {
$(".admin_username_help_icon").qtip({ $(".admin_username_help_icon").qtip({
content: { content: {
text: $.i18n._("This admin username and password for Icecast to get listener statistics.") text: $.i18n._("This is the admin username and password for Icecast/SHOUTcast to get listener statistics.")
}, },
hide: { hide: {
delay: 500, delay: 500,

2
python_apps/pypo/liquidsoap_scripts/ls_lib.liq
View File

@ -407,7 +407,7 @@ end
# fade using both cross() and switch(). # fade using both cross() and switch().
def input.http_restart(~id,~initial_url="http://dummy/url") def input.http_restart(~id,~initial_url="http://dummy/url")
source = input.http(buffer=5.,max=15.,id=id,autostart=false,initial_url) source = audio_to_stereo(input.http(buffer=5.,max=15.,id=id,autostart=false,initial_url))
def stopped() def stopped()
"stopped" == list.hd(server.execute("#{id}.status")) "stopped" == list.hd(server.execute("#{id}.status"))