|
@@ -50,7 +50,8 @@ function drawAudioLevelCanvas(id, audioLevel) {
|
50
|
50
|
* been observed to pile into the console, strain the CPU.
|
51
|
51
|
*/
|
52
|
52
|
if (audioLevelCanvasOrig) {
|
53
|
|
- audioLevelCanvasCache[id] = CanvasUtil.cloneCanvas(audioLevelCanvasOrig);
|
|
53
|
+ audioLevelCanvasCache[id]
|
|
54
|
+ = CanvasUtil.cloneCanvas(audioLevelCanvasOrig);
|
54
|
55
|
}
|
55
|
56
|
}
|
56
|
57
|
|
|
@@ -68,13 +69,14 @@ function drawAudioLevelCanvas(id, audioLevel) {
|
68
|
69
|
|
69
|
70
|
if (shadowLevel > 0) {
|
70
|
71
|
// drawContext, x, y, w, h, r, shadowColor, shadowLevel
|
71
|
|
- CanvasUtil.drawRoundRectGlow(drawContext,
|
72
|
|
- interfaceConfig.CANVAS_EXTRA / 2, interfaceConfig.CANVAS_EXTRA / 2,
|
73
|
|
- canvas.width - interfaceConfig.CANVAS_EXTRA,
|
74
|
|
- canvas.height - interfaceConfig.CANVAS_EXTRA,
|
75
|
|
- interfaceConfig.CANVAS_RADIUS,
|
76
|
|
- interfaceConfig.SHADOW_COLOR,
|
77
|
|
- shadowLevel);
|
|
72
|
+ CanvasUtil.drawRoundRectGlow(
|
|
73
|
+ drawContext,
|
|
74
|
+ interfaceConfig.CANVAS_EXTRA / 2, interfaceConfig.CANVAS_EXTRA / 2,
|
|
75
|
+ canvas.width - interfaceConfig.CANVAS_EXTRA,
|
|
76
|
+ canvas.height - interfaceConfig.CANVAS_EXTRA,
|
|
77
|
+ interfaceConfig.CANVAS_RADIUS,
|
|
78
|
+ interfaceConfig.SHADOW_COLOR,
|
|
79
|
+ shadowLevel);
|
78
|
80
|
}
|
79
|
81
|
}
|
80
|
82
|
|
|
@@ -88,11 +90,14 @@ function getShadowLevel (audioLevel) {
|
88
|
90
|
let shadowLevel = 0;
|
89
|
91
|
|
90
|
92
|
if (audioLevel <= 0.3) {
|
91
|
|
- shadowLevel = Math.round(interfaceConfig.CANVAS_EXTRA/2*(audioLevel/0.3));
|
|
93
|
+ shadowLevel
|
|
94
|
+ = Math.round(interfaceConfig.CANVAS_EXTRA/2*(audioLevel/0.3));
|
92
|
95
|
} else if (audioLevel <= 0.6) {
|
93
|
|
- shadowLevel = Math.round(interfaceConfig.CANVAS_EXTRA/2*((audioLevel - 0.3) / 0.3));
|
|
96
|
+ shadowLevel
|
|
97
|
+ = Math.round(interfaceConfig.CANVAS_EXTRA/2*((audioLevel - 0.3) / 0.3));
|
94
|
98
|
} else {
|
95
|
|
- shadowLevel = Math.round(interfaceConfig.CANVAS_EXTRA/2*((audioLevel - 0.6) / 0.4));
|
|
99
|
+ shadowLevel
|
|
100
|
+ = Math.round(interfaceConfig.CANVAS_EXTRA/2*((audioLevel - 0.6) / 0.4));
|
96
|
101
|
}
|
97
|
102
|
|
98
|
103
|
return shadowLevel;
|
|
@@ -203,7 +208,8 @@ const AudioLevels = {
|
203
|
208
|
},
|
204
|
209
|
|
205
|
210
|
updateDominantSpeakerAudioLevel (audioLevel) {
|
206
|
|
- if($("#domiantSpeaker").css("visibility") == "hidden" || ASDrawContext === null) {
|
|
211
|
+ if($("#dominantSpeaker").css("visibility") == "hidden"
|
|
212
|
+ || ASDrawContext === null) {
|
207
|
213
|
return;
|
208
|
214
|
}
|
209
|
215
|
|
|
@@ -214,7 +220,6 @@ const AudioLevels = {
|
214
|
220
|
|
215
|
221
|
ASDrawContext.shadowBlur = getShadowLevel(audioLevel);
|
216
|
222
|
|
217
|
|
-
|
218
|
223
|
// Fill the shape.
|
219
|
224
|
ASDrawContext.fill();
|
220
|
225
|
},
|
|
@@ -223,7 +228,10 @@ const AudioLevels = {
|
223
|
228
|
let canvasWidth = thumbWidth + interfaceConfig.CANVAS_EXTRA;
|
224
|
229
|
let canvasHeight = thumbHeight + interfaceConfig.CANVAS_EXTRA;
|
225
|
230
|
|
226
|
|
- BottomToolbar.getThumbs().children('canvas').width(canvasWidth).height(canvasHeight);
|
|
231
|
+ BottomToolbar.getThumbs().children('canvas').each(function () {
|
|
232
|
+ $(this).attr('width', canvasWidth);
|
|
233
|
+ $(this).attr('height', canvasHeight);
|
|
234
|
+ });
|
227
|
235
|
|
228
|
236
|
Object.keys(audioLevelCanvasCache).forEach(function (id) {
|
229
|
237
|
audioLevelCanvasCache[id].width = canvasWidth;
|