Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
This commit is contained in:
commit
6e7f45e615
|
@ -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 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
|
||||
"Image must be one of jpg, jpeg, png, or gif" => _("Image must be one of jpg, jpeg, png, or gif"),
|
||||
//schedule/add-show.js
|
||||
|
|
|
@ -58,7 +58,6 @@ class UserController extends Zend_Controller_Action
|
|||
$user = new Application_Model_User($formData['user_id']);
|
||||
$user->setFirstName($formData['first_name']);
|
||||
$user->setLastName($formData['last_name']);
|
||||
$user->setLogin($formData['login']);
|
||||
// We don't allow 6 x's as a password.
|
||||
// The reason is because we that as a password placeholder
|
||||
// on the client side.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<div id="content" class="jp-container">
|
||||
<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(); ?>
|
||||
<script>
|
||||
function setjPlayer(url, type, serverType){
|
||||
|
|
|
@ -357,7 +357,7 @@ function setupEventListeners() {
|
|||
|
||||
$(".admin_username_help_icon").qtip({
|
||||
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: {
|
||||
delay: 500,
|
||||
|
|
|
@ -407,7 +407,7 @@ end
|
|||
# fade using both cross() and switch().
|
||||
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()
|
||||
"stopped" == list.hd(server.execute("#{id}.status"))
|
||||
|
|
Loading…
Reference in New Issue