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

CC-5131 : Please give user a message that Browser other than Chrome can't use waveform

Browse source
This commit is contained in:
Naomi 2013-05-14 14:15:54 -04:00
parent 2d09ba3a16
commit 0dd8138c2b
21 changed files with 37010 additions and 35156 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/controllers/LocaleController.php
View file

@ -284,6 +284,11 @@ class LocaleController extends Zend_Controller_Action
"Cannot schedule outside a show." => _("Cannot schedule outside a show."), "Cannot schedule outside a show." => _("Cannot schedule outside a show."),
"Moving 1 Item" => _("Moving 1 Item"), "Moving 1 Item" => _("Moving 1 Item"),
"Moving %s Items" => _("Moving %s Items"), "Moving %s Items" => _("Moving %s Items"),
"Save" => _("Save"),
"Cancel" => _("Cancel"),
"Fade Editor" => _("Fade Editor"),
"Cue Editor" => _("Cue Editor"),
"Waveform features are available in a browser supporting the Web Audio API" => _("Waveform features are available in a browser supporting the Web Audio API"),
//already in library/library.js //already in library/library.js
//"Select" => _("Select"), //"Select" => _("Select"),
"Select all" => _("Select all"), "Select all" => _("Select all"),

22
airtime_mvc/application/layouts/scripts/layout.phtml
View file

@ -38,21 +38,21 @@
<div class="waveform-cues"> <div class="waveform-cues">
<div class="playlist-tracks"></div> <div class="playlist-tracks"></div>
<div class="playlist-controls"> <div class="playlist-controls">
<a class="btn btn-small btn_play"><i class="icon-play icon-white"></i>Play</a> <a class="btn btn-small btn_play"><i class="icon-play icon-white"></i><?php echo _("Play"); ?></a>
<a class="btn btn-small btn_stop"><i class="icon-stop icon-white"></i>Stop</a> <a class="btn btn-small btn_stop"><i class="icon-stop icon-white"></i><?php echo _("Stop"); ?></a>
<label class="audio audio_pos">00:00:00.0</label> <label class="audio audio_pos">00:00:00.0</label>
</div> </div>
<div class="set-cue"> <div class="set-cue">
<label for="editor-cue-in">Cue In</label> <label for="editor-cue-in"><?php echo _("Cue In"); ?></label>
<input type="text" class="audio_start"> <input type="text" class="audio_start">
<input type="button" class="btn btn-small set-cue-in" value="Set Cue In"> <input type="button" class="btn btn-small set-cue-in" value="<?php echo _("Set Cue In"); ?>">
<label class="audio editor-cue-in">00:00:00.0</label> <label class="audio editor-cue-in">00:00:00.0</label>
<span style="display:none" class="cue-in-error"></span> <span style="display:none" class="cue-in-error"></span>
</div> </div>
<div class="set-cue"> <div class="set-cue">
<label for="editor-cue-out">Cue Out</label> <label for="editor-cue-out"><?php echo _("Cue Out"); ?></label>
<input type="text" class="audio_end"> <input type="text" class="audio_end">
<input type="button" class="btn btn-small set-cue-out" value="Set Cue Out"> <input type="button" class="btn btn-small set-cue-out" value="<?php echo _("Set Cue Out"); ?>">
<label class="audio editor-cue-out">00:00:00.0</label> <label class="audio editor-cue-out">00:00:00.0</label>
<span style="display:none" class="cue-out-error"></span> <span style="display:none" class="cue-out-error"></span>
</div> </div>
@ -63,13 +63,13 @@
<div class="waveform-fades"> <div class="waveform-fades">
<div class="playlist-tracks"></div> <div class="playlist-tracks"></div>
<div class="playlist-controls left-floated"> <div class="playlist-controls left-floated">
<a class="btn btn-small btn_play"><i class="icon-play icon-white"></i>Play</a> <a class="btn btn-small btn_play"><i class="icon-play icon-white"></i><?php echo _("Play"); ?></a>
<a class="btn btn-small btn_stop"><i class="icon-stop icon-white"></i>Stop</a> <a class="btn btn-small btn_stop"><i class="icon-stop icon-white"></i><?php echo _("Stop"); ?></a>
</div> </div>
<div class="set-fade left-floated"> <div class="set-fade left-floated">
<a type="button" class="btn btn-small btn_cursor" data-state="cursor">Cursor</a> <a type="button" class="btn btn-small btn_cursor" data-state="cursor"><?php echo _("Cursor"); ?></a>
<a type="button" class="btn btn-small btn_fadein" data-state="fadein">Fade In</a> <a type="button" class="btn btn-small btn_fadein" data-state="fadein"><?php echo _("Fade In"); ?></a>
<a type="button" class="btn btn-small btn_fadeout" data-state="fadeout">Fade Out</a> <a type="button" class="btn btn-small btn_fadeout" data-state="fadeout"><?php echo _("Fade Out"); ?></a>
</div> </div>
</div> </div>
</script> </script>

16
airtime_mvc/application/views/scripts/playlist/set-cue.phtml
View file

@ -1,17 +1,21 @@
<dl id="spl_cue_editor" class="inline-list"> <dl id="spl_cue_editor" class="inline-list">
<dd data-uri="<?php echo $this->uri; ?>"> <dd data-uri="<?php echo $this->uri; ?>">
<input type="button" class="pl-waveform-cues-btn" value="Show Waveform"></input> <input type="button" class="pl-waveform-cues-btn" value="<?php echo _("Show Waveform")?>"></input>
</dd> </dd>
<dt><? echo _("Cue In: "); ?><span class='spl_cue_hint'><? echo _("(hh:mm:ss.t)")?></span></dt> <dt><?php echo _("Cue In: "); ?><span class='spl_cue_hint'><?php echo _("(hh:mm:ss.t)")?></span></dt>
<dd id="spl_cue_in_<?php echo $this->id; ?>" class="spl_cue_in" data-cue-in="<?php echo $this->cueIn; ?>" data-cue-sec="<?php echo $this->cueInSec; ?>"> <dd id="spl_cue_in_<?php echo $this->id; ?>" class="spl_cue_in"
data-cue-in="<?php echo $this->cueIn; ?>"
data-cue-sec="<?php echo $this->cueInSec; ?>">
<span contenteditable="true" class="spl_text_input"><?php echo $this->cueIn; ?></span> <span contenteditable="true" class="spl_text_input"><?php echo $this->cueIn; ?></span>
</dd> </dd>
<dd class="edit-error"></dd> <dd class="edit-error"></dd>
<dt><? echo _("Cue Out: "); ?><span class='spl_cue_hint'><? echo _("(hh:mm:ss.t)")?></span></dt> <dt><?php echo _("Cue Out: "); ?><span class='spl_cue_hint'><?php echo _("(hh:mm:ss.t)")?></span></dt>
<dd id="spl_cue_out_<?php echo $this->id; ?>" class="spl_cue_out" data-cue-out="<?php echo $this->cueOut; ?>" data-cue-sec="<?php echo $this->cueOutSec; ?>"> <dd id="spl_cue_out_<?php echo $this->id; ?>" class="spl_cue_out"
data-cue-out="<?php echo $this->cueOut; ?>"
data-cue-sec="<?php echo $this->cueOutSec; ?>">
<span contenteditable="true" class="spl_text_input"><?php echo $this->cueOut; ?></span> <span contenteditable="true" class="spl_text_input"><?php echo $this->cueOut; ?></span>
</dd> </dd>
<dd class="edit-error"></dd> <dd class="edit-error"></dd>
<dt><? echo _("Original Length:"); ?></dt> <dt><?php echo _("Original Length:"); ?></dt>
<dd id="spl_original"><span><?php echo $this->origLength; ?></span></dd> <dd id="spl_original"><span><?php echo $this->origLength; ?></span></dd>
</dl> </dl>

22
airtime_mvc/application/views/scripts/playlist/set-fade.phtml
View file

@ -1,21 +1,29 @@
<dl id="spl_editor" class="inline-list"> <dl id="spl_editor" class="inline-list">
<dd> <dd>
<input type="button" class="pl-waveform-fades-btn" value="Show Waveform"></input> <input type="button" class="pl-waveform-fades-btn" value="<?php echo _("Show Waveform")?>"></input>
</dd> </dd>
<?php if ($this->item1Type == 0) {?> <?php if ($this->item1Type == 0) {?>
<dt><? echo _("Fade out: "); ?><span class='spl_cue_hint'><? echo _("(ss.t)")?></span></dt> <dt><? echo _("Fade out: "); ?><span class='spl_cue_hint'><? echo _("(ss.t)")?></span></dt>
<dd id="spl_fade_out_<?php echo $this->item1; ?>" class="spl_fade_out" data-fadeout="<?php echo $this->item1Url; ?>" <dd id="spl_fade_out_<?php echo $this->item1; ?>" class="spl_fade_out"
data-cuein="<?php echo $this->cueIn1; ?>" data-cueout="<?php echo $this->cueOut1; ?>" data-length="<?php echo $this->fadeOut; ?>" data-fadeout="<?php echo $this->item1Url; ?>"
data-type="logarithmic" data-item="<?php echo $this->item1; ?>"> data-cuein="<?php echo $this->cueIn1; ?>"
data-cueout="<?php echo $this->cueOut1; ?>"
data-length="<?php echo $this->fadeOut; ?>"
data-type="logarithmic"
data-item="<?php echo $this->item1; ?>">
<span contenteditable="true" class="spl_text_input"><?php echo $this->fadeOut; ?></span> <span contenteditable="true" class="spl_text_input"><?php echo $this->fadeOut; ?></span>
</dd> </dd>
<dd class="edit-error"></dd> <dd class="edit-error"></dd>
<?php } <?php }
if (isset($this->item2Url)) {?> if (isset($this->item2Url)) {?>
<dt><? echo _("Fade in: "); ?><span class='spl_cue_hint'><? echo _("(ss.t)")?></span></dt> <dt><? echo _("Fade in: "); ?><span class='spl_cue_hint'><? echo _("(ss.t)")?></span></dt>
<dd id="spl_fade_in_<?php echo $this->item2; ?>" class="spl_fade_in" data-fadein="<?php echo $this->item2Url; ?>" data-offset="<?php if ($this->item1Type == 0) { echo $this->offset; } else { echo 0; } ?>" <dd id="spl_fade_in_<?php echo $this->item2; ?>" class="spl_fade_in"
data-cuein="<?php echo $this->cueIn2; ?>" data-cueout="<?php echo $this->cueOut2; ?>" data-length="<?php echo $this->fadeIn; ?>" data-fadein="<?php echo $this->item2Url; ?>"
data-type="logarithmic" data-item="<?php echo $this->item2; ?>"> data-offset="<?php if ($this->item1Type == 0) { echo $this->offset; } else { echo 0; } ?>"
data-cuein="<?php echo $this->cueIn2; ?>"
data-cueout="<?php echo $this->cueOut2; ?>" data-length="<?php echo $this->fadeIn; ?>"
data-type="logarithmic"
data-item="<?php echo $this->item2; ?>">
<span contenteditable="true" class="spl_text_input"><?php echo $this->fadeIn; ?></span> <span contenteditable="true" class="spl_text_input"><?php echo $this->fadeIn; ?></span>
</dd> </dd>
<dd class="edit-error"></dd> <dd class="edit-error"></dd>

4512
airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
View file

File diff suppressed because it is too large Load diff

4536
airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
View file

File diff suppressed because it is too large Load diff

4510
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
View file

File diff suppressed because it is too large Load diff

4512
airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
View file

File diff suppressed because it is too large Load diff

4511
airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
View file

File diff suppressed because it is too large Load diff

4511
airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
View file

File diff suppressed because it is too large Load diff

4511
airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
View file

File diff suppressed because it is too large Load diff

4511
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
View file

File diff suppressed because it is too large Load diff

4510
airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
View file

File diff suppressed because it is too large Load diff

4529
airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
View file

File diff suppressed because it is too large Load diff

4527
airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
View file

File diff suppressed because it is too large Load diff

4508
airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
View file

File diff suppressed because it is too large Load diff

4508
airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
View file

File diff suppressed because it is too large Load diff

4529
airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
View file

File diff suppressed because it is too large Load diff

4343
airtime_mvc/locale/template/airtime.po
View file

File diff suppressed because it is too large Load diff

4513
airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
View file

File diff suppressed because it is too large Load diff

20
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -598,7 +598,9 @@ var AIRTIME = (function(AIRTIME){
//remove show waveform buttons since web audio api is not supported. //remove show waveform buttons since web audio api is not supported.
if (!(window.AudioContext || window.webkitAudioContext)) { if (!(window.AudioContext || window.webkitAudioContext)) {
temp.find('.pl-waveform-cues-btn').parent().remove(); temp.find('.pl-waveform-cues-btn')
.parent()
.html($.i18n._("Waveform features are available in a browser supporting the Web Audio API"));
} }
} }
@ -613,7 +615,9 @@ var AIRTIME = (function(AIRTIME){
//remove show waveform buttons since web audio api is not supported. //remove show waveform buttons since web audio api is not supported.
if (!(window.AudioContext || window.webkitAudioContext)) { if (!(window.AudioContext || window.webkitAudioContext)) {
temp.find('.pl-waveform-fades-btn').parent().remove(); temp.find('.pl-waveform-fades-btn')
.parent()
.html($.i18n._("Waveform features are available in a browser supporting the Web Audio API"));
} }
} }
@ -1217,14 +1221,14 @@ var AIRTIME = (function(AIRTIME){
$html.dialog({ $html.dialog({
modal: true, modal: true,
title: "Fade Editor", title: $.i18n._("Fade Editor"),
show: 'clip', show: 'clip',
hide: 'clip', hide: 'clip',
width: dim.width - 100, width: dim.width - 100,
height: dim.height - 100, height: dim.height - 100,
buttons: [ buttons: [
{text: "Cancel", class: "btn btn-small", click: removeDialog}, {text: $.i18n._("Cancel"), class: "btn btn-small", click: removeDialog},
{text: "Save", class: "btn btn-small btn-inverse", click: function() { {text: $.i18n._("Save"), class: "btn btn-small btn-inverse", click: function() {
var json = playlistEditor.getJson(), var json = playlistEditor.getJson(),
offset, offset,
fadeIn, fadeOut, fadeIn, fadeOut,
@ -1325,14 +1329,14 @@ var AIRTIME = (function(AIRTIME){
$html.dialog({ $html.dialog({
modal: true, modal: true,
title: "Cue Editor", title: $.i18n._("Cue Editor"),
show: 'clip', show: 'clip',
hide: 'clip', hide: 'clip',
width: dim.width - 100, width: dim.width - 100,
height: dim.height - 100, height: dim.height - 100,
buttons: [ buttons: [
{text: "Cancel", class: "btn btn-small", click: removeDialog}, {text: $.i18n._("Cancel"), class: "btn btn-small", click: removeDialog},
{text: "Save", class: "btn btn-small btn-inverse", click: function() { {text: $.i18n._("Save"), class: "btn btn-small btn-inverse", click: function() {
var cueIn = $html.find('.editor-cue-in').html(), var cueIn = $html.find('.editor-cue-in').html(),
cueOut = $html.find('.editor-cue-out').html(); cueOut = $html.find('.editor-cue-out').html();