dev@10
|
1 import {
|
dev@236
|
2 Component,
|
dev@236
|
3 OnInit,
|
dev@236
|
4 ViewChild,
|
dev@236
|
5 ElementRef,
|
dev@236
|
6 Input,
|
dev@236
|
7 AfterViewInit,
|
dev@236
|
8 NgZone,
|
dev@236
|
9 OnDestroy,
|
dev@236
|
10 ChangeDetectorRef
|
dev@10
|
11 } from '@angular/core';
|
dev@196
|
12 import {
|
dev@196
|
13 AudioPlayerService, AudioResource,
|
dev@196
|
14 AudioResourceError
|
dev@236
|
15 } from '../services/audio-player/audio-player.service';
|
dev@289
|
16 import wavesUI from 'waves-ui-piper';
|
dev@63
|
17 import {
|
dev@64
|
18 FeatureExtractionService
|
dev@236
|
19 } from '../services/feature-extraction/feature-extraction.service';
|
dev@236
|
20 import {Subscription} from 'rxjs/Subscription';
|
dev@63
|
21 import {
|
dev@63
|
22 FeatureCollection,
|
cannam@296
|
23 SimpleResponse,
|
cannam@296
|
24 VectorFeatures,
|
dev@301
|
25 MatrixFeatures
|
dev@236
|
26 } from 'piper/HigherLevelUtilities';
|
dev@236
|
27 import {toSeconds} from 'piper';
|
dev@236
|
28 import {FeatureList, Feature} from 'piper/Feature';
|
dev@81
|
29 import * as Hammer from 'hammerjs';
|
dev@236
|
30 import {WavesSpectrogramLayer} from '../spectrogram/Spectrogram';
|
dev@8
|
31
|
dev@54
|
32 type Layer = any;
|
dev@54
|
33 type Track = any;
|
dev@59
|
34 type Colour = string;
|
dev@6
|
35
|
dev@268
|
36
|
dev@268
|
37
|
dev@268
|
38 function* createColourGenerator(colours) {
|
cannam@257
|
39 let index = 0;
|
dev@268
|
40 const nColours = colours.length;
|
cannam@257
|
41 while (true) {
|
dev@268
|
42 yield colours[index = ++index % nColours];
|
cannam@257
|
43 }
|
dev@268
|
44 }
|
dev@268
|
45
|
dev@268
|
46 const defaultColourGenerator = createColourGenerator([
|
dev@268
|
47 '#0868ac', // "sapphire blue", our waveform / header colour
|
dev@268
|
48 '#c33c54', // "brick red"
|
dev@268
|
49 '#17bebb', // "tiffany blue"
|
dev@268
|
50 '#001021', // "rich black"
|
dev@268
|
51 '#fa8334', // "mango tango"
|
dev@268
|
52 '#034748' // "deep jungle green"
|
dev@268
|
53 ]);
|
cannam@257
|
54
|
dev@6
|
55 @Component({
|
dev@236
|
56 selector: 'ugly-waveform',
|
dev@6
|
57 templateUrl: './waveform.component.html',
|
dev@6
|
58 styleUrls: ['./waveform.component.css']
|
dev@6
|
59 })
|
cannam@257
|
60
|
dev@51
|
61 export class WaveformComponent implements OnInit, AfterViewInit, OnDestroy {
|
dev@20
|
62
|
dev@8
|
63 @ViewChild('track') trackDiv: ElementRef;
|
dev@285
|
64 @Input() set width(width: number) {
|
dev@285
|
65 if (this.timeline) {
|
dev@285
|
66 requestAnimationFrame(() => {
|
dev@285
|
67 this.timeline.timeContext.visibleWidth = width;
|
dev@285
|
68 this.timeline.tracks.update();
|
dev@285
|
69 });
|
dev@285
|
70 }
|
dev@285
|
71 }
|
dev@189
|
72 @Input() timeline: Timeline;
|
dev@189
|
73 @Input() trackIdPrefix: string;
|
dev@196
|
74 @Input() set isSubscribedToExtractionService(isSubscribed: boolean) {
|
dev@196
|
75 if (isSubscribed) {
|
dev@196
|
76 if (this.featureExtractionSubscription) {
|
dev@196
|
77 return;
|
dev@196
|
78 }
|
dev@268
|
79
|
dev@196
|
80 this.featureExtractionSubscription =
|
dev@196
|
81 this.piperService.featuresExtracted$.subscribe(
|
dev@196
|
82 features => {
|
dev@268
|
83 this.renderFeatures(features, defaultColourGenerator.next().value);
|
dev@196
|
84 });
|
dev@196
|
85 } else {
|
dev@196
|
86 if (this.featureExtractionSubscription) {
|
dev@196
|
87 this.featureExtractionSubscription.unsubscribe();
|
dev@196
|
88 }
|
dev@196
|
89 }
|
dev@196
|
90 }
|
dev@196
|
91 @Input() set isSubscribedToAudioService(isSubscribed: boolean) {
|
dev@196
|
92 this._isSubscribedToAudioService = isSubscribed;
|
dev@196
|
93 if (isSubscribed) {
|
dev@196
|
94 if (this.onAudioDataSubscription) {
|
dev@196
|
95 return;
|
dev@196
|
96 }
|
dev@196
|
97
|
dev@196
|
98 this.onAudioDataSubscription =
|
dev@196
|
99 this.audioService.audioLoaded$.subscribe(res => {
|
dev@196
|
100 const wasError = (res as AudioResourceError).message != null;
|
dev@196
|
101
|
dev@196
|
102 if (wasError) {
|
dev@196
|
103 console.warn('No audio, display error?');
|
dev@196
|
104 } else {
|
dev@196
|
105 this.audioBuffer = (res as AudioResource).samples;
|
dev@196
|
106 }
|
dev@196
|
107 });
|
dev@196
|
108 } else {
|
dev@196
|
109 if (this.onAudioDataSubscription) {
|
dev@196
|
110 this.onAudioDataSubscription.unsubscribe();
|
dev@196
|
111 }
|
dev@196
|
112 }
|
dev@196
|
113 }
|
dev@196
|
114
|
dev@196
|
115 get isSubscribedToAudioService(): boolean {
|
dev@196
|
116 return this._isSubscribedToAudioService;
|
dev@196
|
117 }
|
dev@196
|
118
|
dev@196
|
119 @Input() set isOneShotExtractor(isOneShot: boolean) {
|
dev@196
|
120 this._isOneShotExtractor = isOneShot;
|
dev@196
|
121 }
|
dev@196
|
122
|
dev@196
|
123 get isOneShotExtractor(): boolean {
|
dev@196
|
124 return this._isOneShotExtractor;
|
dev@196
|
125 }
|
dev@196
|
126
|
dev@196
|
127 @Input() set isSeeking(isSeeking: boolean) {
|
dev@196
|
128 this._isSeeking = isSeeking;
|
dev@196
|
129 if (isSeeking) {
|
dev@196
|
130 if (this.seekedSubscription) {
|
dev@196
|
131 return;
|
dev@196
|
132 }
|
dev@236
|
133 if (this.playingStateSubscription) {
|
dev@196
|
134 return;
|
dev@196
|
135 }
|
dev@196
|
136
|
dev@196
|
137 this.seekedSubscription = this.audioService.seeked$.subscribe(() => {
|
dev@236
|
138 if (!this.isPlaying) {
|
dev@196
|
139 this.animate();
|
dev@236
|
140 }
|
dev@196
|
141 });
|
dev@196
|
142 this.playingStateSubscription =
|
dev@196
|
143 this.audioService.playingStateChange$.subscribe(
|
dev@196
|
144 isPlaying => {
|
dev@196
|
145 this.isPlaying = isPlaying;
|
dev@236
|
146 if (this.isPlaying) {
|
dev@196
|
147 this.animate();
|
dev@236
|
148 }
|
dev@196
|
149 });
|
dev@196
|
150 } else {
|
dev@196
|
151 if (this.isPlaying) {
|
dev@196
|
152 this.isPlaying = false;
|
dev@196
|
153 }
|
dev@196
|
154 if (this.playingStateSubscription) {
|
dev@196
|
155 this.playingStateSubscription.unsubscribe();
|
dev@196
|
156 }
|
dev@196
|
157 if (this.seekedSubscription) {
|
dev@196
|
158 this.seekedSubscription.unsubscribe();
|
dev@196
|
159 }
|
dev@196
|
160 }
|
dev@196
|
161 }
|
dev@196
|
162
|
dev@196
|
163 get isSeeking(): boolean {
|
dev@196
|
164 return this._isSeeking;
|
dev@196
|
165 }
|
dev@196
|
166
|
dev@16
|
167 set audioBuffer(buffer: AudioBuffer) {
|
dev@16
|
168 this._audioBuffer = buffer || undefined;
|
cannam@117
|
169 if (this.audioBuffer) {
|
dev@20
|
170 this.renderWaveform(this.audioBuffer);
|
dev@180
|
171 // this.renderSpectrogram(this.audioBuffer);
|
cannam@117
|
172 }
|
dev@16
|
173 }
|
dev@16
|
174
|
dev@16
|
175 get audioBuffer(): AudioBuffer {
|
dev@16
|
176 return this._audioBuffer;
|
dev@16
|
177 }
|
dev@16
|
178
|
dev@196
|
179 private _audioBuffer: AudioBuffer;
|
dev@196
|
180 private _isSubscribedToAudioService: boolean;
|
dev@196
|
181 private _isOneShotExtractor: boolean;
|
dev@196
|
182 private _isSeeking: boolean;
|
dev@196
|
183 private cursorLayer: any;
|
cannam@254
|
184 private highlightLayer: any;
|
dev@196
|
185 private layers: Layer[];
|
dev@51
|
186 private featureExtractionSubscription: Subscription;
|
dev@53
|
187 private playingStateSubscription: Subscription;
|
dev@53
|
188 private seekedSubscription: Subscription;
|
dev@196
|
189 private onAudioDataSubscription: Subscription;
|
dev@53
|
190 private isPlaying: boolean;
|
dev@155
|
191 private zoomOnMouseDown: number;
|
dev@157
|
192 private offsetOnMouseDown: number;
|
dev@196
|
193 private hasShot: boolean;
|
dev@196
|
194 private isLoading: boolean;
|
dev@51
|
195
|
dev@236
|
196 private static changeColour(layer: Layer, colour: string): void {
|
dev@236
|
197 const butcherShapes = (shape) => {
|
dev@236
|
198 shape.install({color: () => colour});
|
dev@236
|
199 shape.params.color = colour;
|
dev@236
|
200 shape.update(layer._renderingContext, layer.data);
|
dev@236
|
201 };
|
dev@236
|
202
|
dev@236
|
203 layer._$itemCommonShapeMap.forEach(butcherShapes);
|
dev@236
|
204 layer._$itemShapeMap.forEach(butcherShapes);
|
dev@236
|
205 layer.render();
|
dev@236
|
206 layer.update();
|
dev@236
|
207 }
|
dev@236
|
208
|
dev@31
|
209 constructor(private audioService: AudioPlayerService,
|
dev@51
|
210 private piperService: FeatureExtractionService,
|
dev@234
|
211 private ngZone: NgZone,
|
dev@234
|
212 private ref: ChangeDetectorRef) {
|
dev@196
|
213 this.isSubscribedToAudioService = true;
|
dev@196
|
214 this.isSeeking = true;
|
dev@185
|
215 this.layers = [];
|
dev@196
|
216 this.audioBuffer = undefined;
|
dev@54
|
217 this.timeline = undefined;
|
dev@54
|
218 this.cursorLayer = undefined;
|
cannam@254
|
219 this.highlightLayer = undefined;
|
dev@53
|
220 this.isPlaying = false;
|
dev@196
|
221 this.isLoading = true;
|
dev@51
|
222 }
|
dev@51
|
223
|
dev@53
|
224 ngOnInit() {
|
dev@53
|
225 }
|
dev@10
|
226
|
dev@10
|
227 ngAfterViewInit(): void {
|
dev@236
|
228 this.trackIdPrefix = this.trackIdPrefix || 'default';
|
dev@196
|
229 if (this.timeline) {
|
dev@196
|
230 this.renderTimeline(null, true, true);
|
dev@196
|
231 } else {
|
dev@196
|
232 this.renderTimeline();
|
dev@196
|
233 }
|
dev@20
|
234 }
|
dev@20
|
235
|
dev@196
|
236 renderTimeline(duration: number = 1.0,
|
dev@196
|
237 useExistingDuration: boolean = false,
|
dev@196
|
238 isInitialRender: boolean = false): Timeline {
|
dev@18
|
239 const track: HTMLElement = this.trackDiv.nativeElement;
|
dev@236
|
240 track.innerHTML = '';
|
dev@18
|
241 const height: number = track.getBoundingClientRect().height;
|
dev@18
|
242 const width: number = track.getBoundingClientRect().width;
|
dev@18
|
243 const pixelsPerSecond = width / duration;
|
dev@196
|
244 const hasExistingTimeline = this.timeline instanceof wavesUI.core.Timeline;
|
dev@196
|
245
|
dev@196
|
246 if (hasExistingTimeline) {
|
dev@196
|
247 if (!useExistingDuration) {
|
dev@196
|
248 this.timeline.pixelsPerSecond = pixelsPerSecond;
|
dev@196
|
249 this.timeline.visibleWidth = width;
|
dev@196
|
250 }
|
dev@180
|
251 } else {
|
dev@180
|
252 this.timeline = new wavesUI.core.Timeline(pixelsPerSecond, width);
|
dev@180
|
253 }
|
dev@196
|
254 const waveTrack = this.timeline.createTrack(
|
dev@196
|
255 track,
|
dev@196
|
256 height,
|
dev@196
|
257 `wave-${this.trackIdPrefix}`
|
dev@196
|
258 );
|
dev@196
|
259 if (isInitialRender && hasExistingTimeline) {
|
dev@196
|
260 // time axis
|
dev@196
|
261 const timeAxis = new wavesUI.helpers.TimeAxisLayer({
|
dev@196
|
262 height: height,
|
dev@196
|
263 color: '#b0b0b0'
|
dev@196
|
264 });
|
dev@196
|
265 this.addLayer(timeAxis, waveTrack, this.timeline.timeContext, true);
|
dev@196
|
266 this.cursorLayer = new wavesUI.helpers.CursorLayer({
|
cannam@257
|
267 height: height,
|
cannam@257
|
268 color: '#c33c54'
|
dev@196
|
269 });
|
dev@196
|
270 this.addLayer(this.cursorLayer, waveTrack, this.timeline.timeContext);
|
dev@196
|
271 }
|
dev@196
|
272 if ('ontouchstart' in window) {
|
dev@196
|
273 interface Point {
|
dev@196
|
274 x: number;
|
dev@196
|
275 y: number;
|
dev@196
|
276 }
|
dev@196
|
277
|
dev@236
|
278 let zoomGestureJustEnded = false;
|
dev@196
|
279
|
dev@196
|
280 const pixelToExponent: Function = wavesUI.utils.scales.linear()
|
dev@196
|
281 .domain([0, 100]) // 100px => factor 2
|
dev@196
|
282 .range([0, 1]);
|
dev@196
|
283
|
dev@196
|
284 const calculateDistance: (p1: Point, p2: Point) => number = (p1, p2) => {
|
dev@196
|
285 return Math.pow(
|
dev@196
|
286 Math.pow(p2.x - p1.x, 2) +
|
dev@196
|
287 Math.pow(p2.y - p1.y, 2), 0.5);
|
dev@196
|
288 };
|
dev@196
|
289
|
dev@205
|
290 const calculateMidPoint: (p1: Point, p2: Point) => Point = (p1, p2) => {
|
dev@205
|
291 return {
|
dev@205
|
292 x: 0.5 * (p1.x + p2.x),
|
dev@205
|
293 y: 0.5 * (p1.y + p2.y)
|
dev@205
|
294 };
|
dev@205
|
295 };
|
dev@205
|
296
|
dev@205
|
297 const hammertime = new Hammer.Manager(this.trackDiv.nativeElement, {
|
dev@205
|
298 recognizers: [
|
dev@205
|
299 [Hammer.Pan, { direction: Hammer.DIRECTION_HORIZONTAL }]
|
dev@205
|
300 ]
|
dev@205
|
301 });
|
dev@204
|
302
|
dev@204
|
303 // it seems HammerJs binds the event to the window?
|
dev@204
|
304 // causing these events to propagate to other components?
|
dev@204
|
305 const componentTimeline = this.timeline;
|
dev@204
|
306 let initialZoom;
|
dev@204
|
307 let initialDistance;
|
dev@204
|
308 let offsetAtPanStart;
|
dev@205
|
309 let startX;
|
dev@205
|
310 let isZooming;
|
dev@204
|
311
|
dev@196
|
312 const scroll = (ev) => {
|
dev@236
|
313 if (ev.center.x - startX === 0) {
|
dev@236
|
314 return;
|
dev@236
|
315 }
|
dev@236
|
316
|
dev@196
|
317 if (zoomGestureJustEnded) {
|
dev@196
|
318 zoomGestureJustEnded = false;
|
dev@236
|
319 console.log('Skip this event: likely a single touch dangling from pinch');
|
dev@196
|
320 return;
|
dev@196
|
321 }
|
dev@204
|
322 componentTimeline.timeContext.offset = offsetAtPanStart +
|
dev@204
|
323 componentTimeline.timeContext.timeToPixel.invert(ev.deltaX);
|
dev@204
|
324 componentTimeline.tracks.update();
|
dev@196
|
325 };
|
dev@196
|
326
|
dev@196
|
327 const zoom = (ev) => {
|
dev@236
|
328 if (ev.touches.length < 2) {
|
dev@236
|
329 return;
|
dev@236
|
330 }
|
dev@236
|
331
|
dev@214
|
332 ev.preventDefault();
|
dev@204
|
333 const minZoom = componentTimeline.state.minZoom;
|
dev@204
|
334 const maxZoom = componentTimeline.state.maxZoom;
|
dev@205
|
335 const p1: Point = {
|
dev@218
|
336 x: ev.touches[0].clientX,
|
dev@218
|
337 y: ev.touches[0].clientY
|
dev@205
|
338 };
|
dev@205
|
339 const p2: Point = {
|
dev@218
|
340 x: ev.touches[1].clientX,
|
dev@218
|
341 y: ev.touches[1].clientY
|
dev@205
|
342 };
|
dev@205
|
343 const distance = calculateDistance(p1, p2);
|
dev@205
|
344 const midPoint = calculateMidPoint(p1, p2);
|
dev@196
|
345
|
dev@196
|
346 const lastCenterTime =
|
dev@205
|
347 componentTimeline.timeContext.timeToPixel.invert(midPoint.x);
|
dev@196
|
348
|
dev@204
|
349 const exponent = pixelToExponent(distance - initialDistance);
|
dev@204
|
350 const targetZoom = initialZoom * Math.pow(2, exponent);
|
dev@196
|
351
|
dev@204
|
352 componentTimeline.timeContext.zoom =
|
dev@196
|
353 Math.min(Math.max(targetZoom, minZoom), maxZoom);
|
dev@196
|
354
|
dev@196
|
355 const newCenterTime =
|
dev@205
|
356 componentTimeline.timeContext.timeToPixel.invert(midPoint.x);
|
dev@196
|
357
|
dev@204
|
358 componentTimeline.timeContext.offset += newCenterTime - lastCenterTime;
|
dev@204
|
359 componentTimeline.tracks.update();
|
dev@196
|
360 };
|
dev@205
|
361 hammertime.on('panstart', (ev) => {
|
dev@204
|
362 offsetAtPanStart = componentTimeline.timeContext.offset;
|
dev@205
|
363 startX = ev.center.x;
|
dev@196
|
364 });
|
dev@196
|
365 hammertime.on('panleft', scroll);
|
dev@196
|
366 hammertime.on('panright', scroll);
|
dev@205
|
367
|
dev@205
|
368
|
dev@205
|
369 const element: HTMLElement = this.trackDiv.nativeElement;
|
dev@205
|
370 element.addEventListener('touchstart', (e) => {
|
dev@236
|
371 if (e.touches.length < 2) {
|
dev@236
|
372 return;
|
dev@236
|
373 }
|
dev@236
|
374
|
dev@205
|
375 isZooming = true;
|
dev@204
|
376 initialZoom = componentTimeline.timeContext.zoom;
|
dev@196
|
377
|
dev@204
|
378 initialDistance = calculateDistance({
|
dev@218
|
379 x: e.touches[0].clientX,
|
dev@218
|
380 y: e.touches[0].clientY
|
dev@196
|
381 }, {
|
dev@218
|
382 x: e.touches[1].clientX,
|
dev@218
|
383 y: e.touches[1].clientY
|
dev@196
|
384 });
|
dev@196
|
385 });
|
dev@205
|
386 element.addEventListener('touchend', () => {
|
dev@205
|
387 if (isZooming) {
|
dev@205
|
388 isZooming = false;
|
dev@205
|
389 zoomGestureJustEnded = true;
|
dev@205
|
390 }
|
dev@301
|
391 });
|
dev@205
|
392 element.addEventListener('touchmove', zoom);
|
dev@196
|
393 }
|
dev@189
|
394 // this.timeline.createTrack(track, height/2, `wave-${this.trackIdPrefix}`);
|
dev@189
|
395 // this.timeline.createTrack(track, height/2, `grid-${this.trackIdPrefix}`);
|
dev@54
|
396 }
|
dev@18
|
397
|
cannam@108
|
398 estimatePercentile(matrix, percentile) {
|
cannam@108
|
399 // our sample is not evenly distributed across the whole data set:
|
cannam@108
|
400 // it is guaranteed to include at least one sample from every
|
cannam@108
|
401 // column, and could sample some values more than once. But it
|
cannam@108
|
402 // should be good enough in most cases (todo: show this)
|
cannam@109
|
403 if (matrix.length === 0) {
|
cannam@109
|
404 return 0.0;
|
cannam@109
|
405 }
|
cannam@108
|
406 const w = matrix.length;
|
cannam@108
|
407 const h = matrix[0].length;
|
cannam@108
|
408 const n = w * h;
|
cannam@109
|
409 const m = (n > 50000 ? 50000 : n); // should base that on the %ile
|
cannam@108
|
410 let m_per = Math.floor(m / w);
|
dev@236
|
411 if (m_per < 1) {
|
dev@236
|
412 m_per = 1;
|
dev@236
|
413 }
|
dev@236
|
414
|
dev@236
|
415 const sample = [];
|
cannam@108
|
416 for (let x = 0; x < w; ++x) {
|
cannam@108
|
417 for (let i = 0; i < m_per; ++i) {
|
cannam@108
|
418 const y = Math.floor(Math.random() * h);
|
cannam@109
|
419 const value = matrix[x][y];
|
cannam@109
|
420 if (!isNaN(value) && value !== Infinity) {
|
cannam@109
|
421 sample.push(value);
|
cannam@109
|
422 }
|
cannam@108
|
423 }
|
cannam@108
|
424 }
|
cannam@109
|
425 if (sample.length === 0) {
|
dev@236
|
426 console.log('WARNING: No samples gathered, even though we hoped for ' +
|
dev@301
|
427 (m_per * w) + ' of them');
|
cannam@109
|
428 return 0.0;
|
cannam@109
|
429 }
|
dev@236
|
430 sample.sort((a, b) => { return a - b; });
|
cannam@108
|
431 const ix = Math.floor((sample.length * percentile) / 100);
|
dev@236
|
432 console.log('Estimating ' + percentile + '-%ile of ' +
|
dev@301
|
433 n + '-sample dataset (' + w + ' x ' + h + ') as value ' + ix +
|
dev@301
|
434 ' of sorted ' + sample.length + '-sample subset');
|
cannam@108
|
435 const estimate = sample[ix];
|
dev@236
|
436 console.log('Estimate is: ' + estimate + ' (where min sampled value = ' +
|
dev@301
|
437 sample[0] + ' and max = ' + sample[sample.length - 1] + ')');
|
cannam@108
|
438 return estimate;
|
cannam@108
|
439 }
|
cannam@108
|
440
|
cannam@108
|
441 interpolatingMapper(hexColours) {
|
cannam@108
|
442 const colours = hexColours.map(n => {
|
cannam@108
|
443 const i = parseInt(n, 16);
|
cannam@118
|
444 return [ ((i >> 16) & 255) / 255.0,
|
dev@301
|
445 ((i >> 8) & 255) / 255.0,
|
dev@301
|
446 ((i) & 255) / 255.0 ];
|
cannam@108
|
447 });
|
cannam@108
|
448 const last = colours.length - 1;
|
cannam@108
|
449 return (value => {
|
cannam@108
|
450 const m = value * last;
|
cannam@108
|
451 if (m >= last) {
|
cannam@108
|
452 return colours[last];
|
cannam@108
|
453 }
|
cannam@108
|
454 if (m <= 0) {
|
cannam@108
|
455 return colours[0];
|
cannam@108
|
456 }
|
cannam@108
|
457 const base = Math.floor(m);
|
cannam@108
|
458 const prop0 = base + 1.0 - m;
|
cannam@108
|
459 const prop1 = m - base;
|
cannam@108
|
460 const c0 = colours[base];
|
dev@236
|
461 const c1 = colours[base + 1];
|
cannam@118
|
462 return [ c0[0] * prop0 + c1[0] * prop1,
|
dev@301
|
463 c0[1] * prop0 + c1[1] * prop1,
|
dev@301
|
464 c0[2] * prop0 + c1[2] * prop1 ];
|
cannam@108
|
465 });
|
cannam@108
|
466 }
|
dev@110
|
467
|
cannam@108
|
468 iceMapper() {
|
dev@236
|
469 const hexColours = [
|
cannam@108
|
470 // Based on ColorBrewer ylGnBu
|
dev@236
|
471 'ffffff', 'ffff00', 'f7fcf0', 'e0f3db', 'ccebc5', 'a8ddb5',
|
dev@236
|
472 '7bccc4', '4eb3d3', '2b8cbe', '0868ac', '084081', '042040'
|
cannam@108
|
473 ];
|
cannam@108
|
474 hexColours.reverse();
|
cannam@108
|
475 return this.interpolatingMapper(hexColours);
|
cannam@108
|
476 }
|
dev@110
|
477
|
cannam@118
|
478 hsv2rgb(h, s, v) { // all values in range [0, 1]
|
cannam@118
|
479 const i = Math.floor(h * 6);
|
cannam@118
|
480 const f = h * 6 - i;
|
cannam@118
|
481 const p = v * (1 - s);
|
cannam@118
|
482 const q = v * (1 - f * s);
|
cannam@118
|
483 const t = v * (1 - (1 - f) * s);
|
cannam@118
|
484 let r = 0, g = 0, b = 0;
|
cannam@118
|
485 switch (i % 6) {
|
dev@301
|
486 case 0: r = v; g = t; b = p; break;
|
dev@301
|
487 case 1: r = q; g = v; b = p; break;
|
dev@301
|
488 case 2: r = p; g = v; b = t; break;
|
dev@301
|
489 case 3: r = p; g = q; b = v; break;
|
dev@301
|
490 case 4: r = t; g = p; b = v; break;
|
dev@301
|
491 case 5: r = v; g = p; b = q; break;
|
cannam@118
|
492 }
|
cannam@118
|
493 return [ r, g, b ];
|
cannam@118
|
494 }
|
dev@122
|
495
|
cannam@118
|
496 greenMapper() {
|
cannam@118
|
497 const blue = 0.6666;
|
cannam@118
|
498 const pieslice = 0.3333;
|
cannam@118
|
499 return (value => {
|
cannam@118
|
500 const h = blue - value * 2.0 * pieslice;
|
cannam@118
|
501 const s = 0.5 + value / 2.0;
|
cannam@118
|
502 const v = value;
|
cannam@118
|
503 return this.hsv2rgb(h, s, v);
|
cannam@118
|
504 });
|
cannam@118
|
505 }
|
cannam@118
|
506
|
cannam@118
|
507 sunsetMapper() {
|
cannam@118
|
508 return (value => {
|
dev@236
|
509 const r = (value - 0.24) * 2.38;
|
dev@236
|
510 const g = (value - 0.64) * 2.777;
|
cannam@118
|
511 let b = (3.6 * value);
|
dev@236
|
512 if (value > 0.277) {
|
dev@236
|
513 b = 2.0 - b;
|
dev@236
|
514 }
|
cannam@118
|
515 return [ r, g, b ];
|
cannam@118
|
516 });
|
cannam@118
|
517 }
|
cannam@118
|
518
|
dev@122
|
519 clearTimeline(): void {
|
dev@122
|
520 // loop through layers and remove them, waves-ui provides methods for this but it seems to not work properly
|
dev@122
|
521 const timeContextChildren = this.timeline.timeContext._children;
|
dev@236
|
522 for (const track of this.timeline.tracks) {
|
dev@122
|
523 if (track.layers.length === 0) { continue; }
|
dev@122
|
524 const trackLayers = Array.from(track.layers);
|
dev@122
|
525 while (trackLayers.length) {
|
dev@236
|
526 const layer: Layer = trackLayers.pop();
|
dev@185
|
527 if (this.layers.includes(layer)) {
|
dev@185
|
528 track.remove(layer);
|
dev@185
|
529 this.layers.splice(this.layers.indexOf(layer), 1);
|
dev@185
|
530 const index = timeContextChildren.indexOf(layer.timeContext);
|
dev@185
|
531 if (index >= 0) {
|
dev@185
|
532 timeContextChildren.splice(index, 1);
|
dev@185
|
533 }
|
dev@185
|
534 layer.destroy();
|
dev@122
|
535 }
|
dev@122
|
536 }
|
dev@122
|
537 }
|
dev@122
|
538 }
|
dev@122
|
539
|
dev@54
|
540 renderWaveform(buffer: AudioBuffer): void {
|
dev@180
|
541 // const height: number = this.trackDiv.nativeElement.getBoundingClientRect().height / 2;
|
dev@180
|
542 const height: number = this.trackDiv.nativeElement.getBoundingClientRect().height;
|
dev@189
|
543 const waveTrack = this.timeline.getTrackById(`wave-${this.trackIdPrefix}`);
|
dev@54
|
544 if (this.timeline) {
|
dev@54
|
545 // resize
|
dev@54
|
546 const width = this.trackDiv.nativeElement.getBoundingClientRect().width;
|
dev@55
|
547
|
dev@122
|
548 this.clearTimeline();
|
dev@59
|
549
|
dev@54
|
550 this.timeline.visibleWidth = width;
|
dev@54
|
551 this.timeline.pixelsPerSecond = width / buffer.duration;
|
cannam@117
|
552 waveTrack.height = height;
|
dev@54
|
553 } else {
|
dev@236
|
554 this.renderTimeline(buffer.duration);
|
dev@54
|
555 }
|
dev@83
|
556 this.timeline.timeContext.offset = 0.5 * this.timeline.timeContext.visibleDuration;
|
cannam@106
|
557
|
dev@18
|
558 // time axis
|
dev@18
|
559 const timeAxis = new wavesUI.helpers.TimeAxisLayer({
|
dev@18
|
560 height: height,
|
cannam@106
|
561 color: '#b0b0b0'
|
dev@18
|
562 });
|
cannam@117
|
563 this.addLayer(timeAxis, waveTrack, this.timeline.timeContext, true);
|
dev@18
|
564
|
cannam@161
|
565 const nchannels = buffer.numberOfChannels;
|
cannam@161
|
566 const totalWaveHeight = height * 0.9;
|
cannam@161
|
567 const waveHeight = totalWaveHeight / nchannels;
|
dev@189
|
568
|
cannam@161
|
569 for (let ch = 0; ch < nchannels; ++ch) {
|
dev@236
|
570 console.log('about to construct a waveform layer for channel ' + ch);
|
cannam@161
|
571 const waveformLayer = new wavesUI.helpers.WaveformLayer(buffer, {
|
dev@236
|
572 top: (height - totalWaveHeight) / 2 + waveHeight * ch,
|
dev@236
|
573 height: waveHeight,
|
cannam@257
|
574 color: '#0868ac',
|
dev@236
|
575 channel: ch
|
cannam@161
|
576 });
|
cannam@161
|
577 this.addLayer(waveformLayer, waveTrack, this.timeline.timeContext);
|
cannam@161
|
578 }
|
cannam@117
|
579
|
dev@53
|
580 this.cursorLayer = new wavesUI.helpers.CursorLayer({
|
cannam@257
|
581 height: height,
|
cannam@257
|
582 color: '#c33c54'
|
dev@31
|
583 });
|
cannam@117
|
584 this.addLayer(this.cursorLayer, waveTrack, this.timeline.timeContext);
|
dev@51
|
585 this.timeline.state = new wavesUI.states.CenteredZoomState(this.timeline);
|
cannam@117
|
586 waveTrack.render();
|
cannam@117
|
587 waveTrack.update();
|
dev@81
|
588
|
dev@196
|
589 this.isLoading = false;
|
dev@234
|
590 this.ref.markForCheck();
|
dev@53
|
591 this.animate();
|
dev@53
|
592 }
|
dev@53
|
593
|
cannam@117
|
594 renderSpectrogram(buffer: AudioBuffer): void {
|
cannam@117
|
595 const height: number = this.trackDiv.nativeElement.getBoundingClientRect().height / 2;
|
dev@189
|
596 const gridTrack = this.timeline.getTrackById(`grid-${this.trackIdPrefix}`);
|
cannam@117
|
597
|
dev@129
|
598 const spectrogramLayer = new WavesSpectrogramLayer(buffer, {
|
cannam@221
|
599 top: 0,
|
cannam@221
|
600 height: height,
|
cannam@117
|
601 stepSize: 512,
|
dev@129
|
602 blockSize: 1024,
|
cannam@118
|
603 normalise: 'none',
|
cannam@118
|
604 mapper: this.sunsetMapper()
|
cannam@117
|
605 });
|
cannam@117
|
606 this.addLayer(spectrogramLayer, gridTrack, this.timeline.timeContext);
|
cannam@117
|
607
|
cannam@117
|
608 this.timeline.tracks.update();
|
cannam@117
|
609 }
|
cannam@117
|
610
|
dev@53
|
611 // TODO refactor - this doesn't belong here
|
dev@64
|
612 private renderFeatures(extracted: SimpleResponse, colour: Colour): void {
|
dev@196
|
613 if (this.isOneShotExtractor && !this.hasShot) {
|
dev@196
|
614 this.featureExtractionSubscription.unsubscribe();
|
dev@196
|
615 this.hasShot = true;
|
dev@196
|
616 }
|
dev@196
|
617
|
dev@236
|
618 if (!extracted.hasOwnProperty('features')
|
dev@236
|
619 || !extracted.hasOwnProperty('outputDescriptor')) {
|
dev@236
|
620 return;
|
dev@236
|
621 }
|
dev@236
|
622 if (!extracted.features.hasOwnProperty('shape')
|
dev@301
|
623 || !extracted.features.hasOwnProperty('collected')) {
|
dev@236
|
624 return;
|
dev@236
|
625 }
|
dev@64
|
626 const features: FeatureCollection = (extracted.features as FeatureCollection);
|
dev@64
|
627 const outputDescriptor = extracted.outputDescriptor;
|
dev@196
|
628 // const height = this.trackDiv.nativeElement.getBoundingClientRect().height / 2;
|
dev@196
|
629 const height = this.trackDiv.nativeElement.getBoundingClientRect().height;
|
dev@189
|
630 const waveTrack = this.timeline.getTrackById(`wave-${this.trackIdPrefix}`);
|
dev@64
|
631
|
dev@64
|
632 // TODO refactor all of this
|
dev@63
|
633 switch (features.shape) {
|
dev@301
|
634 case 'vector': {
|
dev@301
|
635 const collected = features.collected as VectorFeatures;
|
cannam@296
|
636 const stepDuration = collected.stepDuration;
|
cannam@296
|
637 const featureData = collected.data;
|
dev@236
|
638 if (featureData.length === 0) {
|
dev@236
|
639 return;
|
dev@236
|
640 }
|
dev@63
|
641 const plotData = [...featureData].map((feature, i) => {
|
dev@63
|
642 return {
|
dev@63
|
643 cx: i * stepDuration,
|
cannam@258
|
644 cy: feature
|
dev@63
|
645 };
|
dev@63
|
646 });
|
cannam@258
|
647 let min = featureData.reduce((m, f) => Math.min(m, f), Infinity);
|
cannam@258
|
648 let max = featureData.reduce((m, f) => Math.max(m, f), -Infinity);
|
cannam@258
|
649 if (min === Infinity) {
|
cannam@258
|
650 min = 0;
|
cannam@258
|
651 max = 1;
|
cannam@258
|
652 }
|
dev@301
|
653 console.log('adding line layer: min = ' + min + ', max = ' + max);
|
dev@301
|
654 if (min !== min || max !== max) {
|
dev@301
|
655 console.log('WARNING: min or max is NaN');
|
dev@301
|
656 min = 0;
|
dev@301
|
657 max = 1;
|
dev@301
|
658 }
|
dev@236
|
659 const lineLayer = new wavesUI.helpers.LineLayer(plotData, {
|
dev@63
|
660 color: colour,
|
cannam@258
|
661 height: height,
|
cannam@258
|
662 yDomain: [ min, max ]
|
dev@63
|
663 });
|
dev@122
|
664 this.addLayer(
|
dev@105
|
665 lineLayer,
|
cannam@117
|
666 waveTrack,
|
dev@63
|
667 this.timeline.timeContext
|
dev@122
|
668 );
|
cannam@265
|
669 const scaleLayer = new wavesUI.helpers.ScaleLayer({
|
cannam@266
|
670 tickColor: colour,
|
cannam@266
|
671 textColor: colour,
|
cannam@264
|
672 height: height,
|
cannam@264
|
673 yDomain: [ min, max ]
|
cannam@264
|
674 });
|
cannam@264
|
675 this.addLayer(
|
cannam@264
|
676 scaleLayer,
|
cannam@264
|
677 waveTrack,
|
cannam@264
|
678 this.timeline.timeContext
|
cannam@264
|
679 );
|
cannam@254
|
680 this.highlightLayer = new wavesUI.helpers.HighlightLayer(lineLayer, {
|
cannam@254
|
681 opacity: 0.7,
|
cannam@257
|
682 height: height,
|
cannam@258
|
683 color: '#c33c54',
|
cannam@266
|
684 labelOffset: 38,
|
cannam@258
|
685 yDomain: [ min, max ]
|
cannam@254
|
686 });
|
cannam@254
|
687 this.addLayer(
|
cannam@254
|
688 this.highlightLayer,
|
cannam@254
|
689 waveTrack,
|
cannam@254
|
690 this.timeline.timeContext
|
cannam@254
|
691 );
|
dev@63
|
692 break;
|
dev@64
|
693 }
|
dev@64
|
694 case 'list': {
|
dev@301
|
695 const featureData = features.collected as FeatureList;
|
dev@236
|
696 if (featureData.length === 0) {
|
dev@236
|
697 return;
|
dev@236
|
698 }
|
dev@64
|
699 // TODO look at output descriptor instead of directly inspecting features
|
dev@64
|
700 const hasDuration = outputDescriptor.configured.hasDuration;
|
dev@64
|
701 const isMarker = !hasDuration
|
dev@64
|
702 && outputDescriptor.configured.binCount === 0
|
dev@64
|
703 && featureData[0].featureValues == null;
|
dev@64
|
704 const isRegion = hasDuration
|
dev@64
|
705 && featureData[0].timestamp != null;
|
dev@236
|
706 console.log('Have list features: length ' + featureData.length +
|
dev@301
|
707 ', isMarker ' + isMarker + ', isRegion ' + isRegion +
|
dev@301
|
708 ', hasDuration ' + hasDuration);
|
dev@64
|
709 // TODO refactor, this is incomprehensible
|
dev@64
|
710 if (isMarker) {
|
dev@236
|
711 const plotData = featureData.map(feature => ({
|
dev@236
|
712 time: toSeconds(feature.timestamp),
|
dev@236
|
713 label: feature.label
|
dev@236
|
714 }));
|
dev@236
|
715 const featureLayer = new wavesUI.helpers.TickLayer(plotData, {
|
dev@64
|
716 height: height,
|
dev@64
|
717 color: colour,
|
cannam@152
|
718 labelPosition: 'bottom',
|
cannam@152
|
719 shadeSegments: true
|
dev@64
|
720 });
|
dev@122
|
721 this.addLayer(
|
cannam@149
|
722 featureLayer,
|
cannam@117
|
723 waveTrack,
|
dev@64
|
724 this.timeline.timeContext
|
dev@122
|
725 );
|
dev@64
|
726 } else if (isRegion) {
|
dev@236
|
727 console.log('Output is of region type');
|
dev@67
|
728 const binCount = outputDescriptor.configured.binCount || 0;
|
dev@67
|
729 const isBarRegion = featureData[0].featureValues.length >= 1 || binCount >= 1 ;
|
dev@64
|
730 const getSegmentArgs = () => {
|
dev@64
|
731 if (isBarRegion) {
|
dev@64
|
732
|
dev@67
|
733 // TODO refactor - this is messy
|
dev@67
|
734 interface FoldsToNumber<T> {
|
dev@67
|
735 reduce(fn: (previousValue: number,
|
dev@67
|
736 currentValue: T,
|
dev@67
|
737 currentIndex: number,
|
dev@67
|
738 array: ArrayLike<T>) => number,
|
dev@67
|
739 initialValue?: number): number;
|
dev@67
|
740 }
|
dev@64
|
741
|
dev@67
|
742 // TODO potentially change impl., i.e avoid reduce
|
dev@67
|
743 const findMin = <T>(arr: FoldsToNumber<T>, getElement: (x: T) => number): number => {
|
dev@67
|
744 return arr.reduce((min, val) => Math.min(min, getElement(val)), Infinity);
|
dev@67
|
745 };
|
dev@67
|
746
|
dev@67
|
747 const findMax = <T>(arr: FoldsToNumber<T>, getElement: (x: T) => number): number => {
|
dev@67
|
748 return arr.reduce((min, val) => Math.max(min, getElement(val)), -Infinity);
|
dev@67
|
749 };
|
dev@67
|
750
|
dev@67
|
751 const min = findMin<Feature>(featureData, (x: Feature) => {
|
dev@67
|
752 return findMin<number>(x.featureValues, y => y);
|
dev@67
|
753 });
|
dev@67
|
754
|
dev@67
|
755 const max = findMax<Feature>(featureData, (x: Feature) => {
|
dev@67
|
756 return findMax<number>(x.featureValues, y => y);
|
dev@67
|
757 });
|
dev@67
|
758
|
dev@67
|
759 const barHeight = 1.0 / height;
|
dev@64
|
760 return [
|
dev@67
|
761 featureData.reduce((bars, feature) => {
|
dev@67
|
762 const staticProperties = {
|
dev@64
|
763 x: toSeconds(feature.timestamp),
|
dev@64
|
764 width: toSeconds(feature.duration),
|
dev@67
|
765 height: min + barHeight,
|
dev@64
|
766 color: colour,
|
dev@64
|
767 opacity: 0.8
|
dev@67
|
768 };
|
dev@67
|
769 // TODO avoid copying Float32Array to an array - map is problematic here
|
dev@67
|
770 return bars.concat([...feature.featureValues]
|
dev@236
|
771 .map(val => Object.assign({}, staticProperties, {y: val})));
|
dev@67
|
772 }, []),
|
dev@67
|
773 {yDomain: [min, max + barHeight], height: height} as any
|
dev@67
|
774 ];
|
dev@64
|
775 } else {
|
dev@236
|
776 return [featureData.map(feature => ({
|
dev@236
|
777 x: toSeconds(feature.timestamp),
|
dev@236
|
778 width: toSeconds(feature.duration),
|
dev@236
|
779 color: colour,
|
dev@236
|
780 opacity: 0.8
|
dev@236
|
781 })), {height: height}];
|
dev@64
|
782 }
|
dev@64
|
783 };
|
dev@64
|
784
|
dev@236
|
785 const segmentLayer = new wavesUI.helpers.SegmentLayer(
|
dev@64
|
786 ...getSegmentArgs()
|
dev@64
|
787 );
|
dev@122
|
788 this.addLayer(
|
dev@64
|
789 segmentLayer,
|
cannam@117
|
790 waveTrack,
|
dev@64
|
791 this.timeline.timeContext
|
dev@122
|
792 );
|
dev@64
|
793 }
|
dev@64
|
794 break;
|
dev@64
|
795 }
|
cannam@106
|
796 case 'matrix': {
|
dev@301
|
797 const collected = features.collected as MatrixFeatures;
|
cannam@296
|
798 const stepDuration = collected.stepDuration;
|
dev@236
|
799 // !!! + start time
|
cannam@296
|
800 const matrixData = collected.data;
|
dev@236
|
801
|
dev@236
|
802 if (matrixData.length === 0) {
|
dev@236
|
803 return;
|
dev@236
|
804 }
|
dev@236
|
805
|
dev@236
|
806 console.log('matrix data length = ' + matrixData.length);
|
dev@236
|
807 console.log('height of first column = ' + matrixData[0].length);
|
cannam@109
|
808 const targetValue = this.estimatePercentile(matrixData, 95);
|
cannam@108
|
809 const gain = (targetValue > 0.0 ? (1.0 / targetValue) : 1.0);
|
dev@236
|
810 console.log('setting gain to ' + gain);
|
dev@301
|
811 const matrixEntity = new wavesUI.utils.PrefilledMatrixEntity(
|
dev@301
|
812 matrixData,
|
dev@301
|
813 0, // startTime
|
dev@301
|
814 stepDuration
|
dev@301
|
815 );
|
dev@236
|
816 const matrixLayer = new wavesUI.helpers.MatrixLayer(matrixEntity, {
|
cannam@108
|
817 gain,
|
cannam@221
|
818 top: 0,
|
cannam@221
|
819 height: height,
|
cannam@109
|
820 normalise: 'none',
|
cannam@108
|
821 mapper: this.iceMapper()
|
cannam@108
|
822 });
|
dev@122
|
823 this.addLayer(
|
cannam@108
|
824 matrixLayer,
|
cannam@117
|
825 waveTrack,
|
cannam@108
|
826 this.timeline.timeContext
|
dev@122
|
827 );
|
cannam@108
|
828 break;
|
cannam@106
|
829 }
|
dev@67
|
830 default:
|
dev@236
|
831 console.log(
|
dev@236
|
832 `Cannot render an appropriate layer for feature shape '${features.shape}'`
|
dev@236
|
833 );
|
dev@63
|
834 }
|
dev@59
|
835
|
dev@196
|
836 this.isLoading = false;
|
dev@234
|
837 this.ref.markForCheck();
|
dev@56
|
838 this.timeline.tracks.update();
|
dev@53
|
839 }
|
dev@53
|
840
|
dev@53
|
841 private animate(): void {
|
dev@236
|
842 if (!this.isSeeking) {
|
dev@236
|
843 return;
|
dev@236
|
844 }
|
dev@196
|
845
|
dev@31
|
846 this.ngZone.runOutsideAngular(() => {
|
dev@31
|
847 // listen for time passing...
|
dev@31
|
848 const updateSeekingCursor = () => {
|
dev@53
|
849 const currentTime = this.audioService.getCurrentTime();
|
dev@53
|
850 this.cursorLayer.currentPosition = currentTime;
|
dev@53
|
851 this.cursorLayer.update();
|
dev@53
|
852
|
cannam@254
|
853 if (typeof(this.highlightLayer) !== 'undefined') {
|
cannam@254
|
854 this.highlightLayer.currentPosition = currentTime;
|
cannam@254
|
855 this.highlightLayer.update();
|
cannam@254
|
856 }
|
cannam@254
|
857
|
dev@53
|
858 const currentOffset = this.timeline.timeContext.offset;
|
dev@53
|
859 const offsetTimestamp = currentOffset
|
dev@53
|
860 + currentTime;
|
dev@53
|
861
|
dev@53
|
862 const visibleDuration = this.timeline.timeContext.visibleDuration;
|
dev@53
|
863 // TODO reduce duplication between directions and make more declarative
|
dev@53
|
864 // this kinda logic should also be tested
|
dev@53
|
865 const mustPageForward = offsetTimestamp > visibleDuration;
|
dev@53
|
866 const mustPageBackward = currentTime < -currentOffset;
|
dev@53
|
867
|
dev@53
|
868 if (mustPageForward) {
|
dev@301
|
869 const hasSkippedMultiplePages = offsetTimestamp -
|
dev@301
|
870 visibleDuration > visibleDuration;
|
dev@53
|
871
|
dev@301
|
872 this.timeline.timeContext.offset = hasSkippedMultiplePages ?
|
dev@301
|
873 -currentTime + 0.5 * visibleDuration :
|
dev@301
|
874 currentOffset - visibleDuration;
|
dev@51
|
875 this.timeline.tracks.update();
|
dev@34
|
876 }
|
dev@53
|
877
|
dev@53
|
878 if (mustPageBackward) {
|
dev@301
|
879 const hasSkippedMultiplePages = currentTime +
|
dev@301
|
880 visibleDuration < -currentOffset;
|
dev@301
|
881 this.timeline.timeContext.offset = hasSkippedMultiplePages ?
|
dev@301
|
882 -currentTime + 0.5 * visibleDuration :
|
dev@301
|
883 currentOffset + visibleDuration;
|
dev@51
|
884 this.timeline.tracks.update();
|
dev@34
|
885 }
|
dev@53
|
886
|
dev@236
|
887 if (this.isPlaying) {
|
dev@53
|
888 requestAnimationFrame(updateSeekingCursor);
|
dev@236
|
889 }
|
dev@31
|
890 };
|
dev@31
|
891 updateSeekingCursor();
|
dev@31
|
892 });
|
dev@6
|
893 }
|
dev@16
|
894
|
dev@122
|
895 private addLayer(layer: Layer, track: Track, timeContext: any, isAxis: boolean = false): void {
|
dev@54
|
896 timeContext.zoom = 1.0;
|
dev@54
|
897 if (!layer.timeContext) {
|
dev@54
|
898 layer.setTimeContext(isAxis ?
|
dev@54
|
899 timeContext : new wavesUI.core.LayerTimeContext(timeContext));
|
dev@54
|
900 }
|
dev@54
|
901 track.add(layer);
|
dev@185
|
902 this.layers.push(layer);
|
dev@54
|
903 layer.render();
|
dev@54
|
904 layer.update();
|
dev@122
|
905 if (this.cursorLayer && track.$layout.contains(this.cursorLayer.$el)) {
|
dev@112
|
906 track.$layout.appendChild(this.cursorLayer.$el);
|
dev@112
|
907 }
|
dev@59
|
908 }
|
dev@59
|
909
|
dev@51
|
910 ngOnDestroy(): void {
|
dev@236
|
911 if (this.featureExtractionSubscription) {
|
dev@196
|
912 this.featureExtractionSubscription.unsubscribe();
|
dev@236
|
913 }
|
dev@236
|
914 if (this.playingStateSubscription) {
|
dev@196
|
915 this.playingStateSubscription.unsubscribe();
|
dev@236
|
916 }
|
dev@236
|
917 if (this.seekedSubscription) {
|
dev@196
|
918 this.seekedSubscription.unsubscribe();
|
dev@236
|
919 }
|
dev@236
|
920 if (this.onAudioDataSubscription) {
|
dev@196
|
921 this.onAudioDataSubscription.unsubscribe();
|
dev@236
|
922 }
|
dev@51
|
923 }
|
dev@154
|
924
|
dev@155
|
925 seekStart(): void {
|
dev@155
|
926 this.zoomOnMouseDown = this.timeline.timeContext.zoom;
|
dev@157
|
927 this.offsetOnMouseDown = this.timeline.timeContext.offset;
|
dev@155
|
928 }
|
dev@155
|
929
|
dev@155
|
930 seekEnd(x: number): void {
|
dev@157
|
931 const hasSameZoom: boolean = this.zoomOnMouseDown ===
|
dev@157
|
932 this.timeline.timeContext.zoom;
|
dev@157
|
933 const hasSameOffset: boolean = this.offsetOnMouseDown ===
|
dev@157
|
934 this.timeline.timeContext.offset;
|
dev@157
|
935 if (hasSameZoom && hasSameOffset) {
|
dev@155
|
936 this.seek(x);
|
dev@155
|
937 }
|
dev@155
|
938 }
|
dev@155
|
939
|
dev@154
|
940 seek(x: number): void {
|
dev@154
|
941 if (this.timeline) {
|
dev@154
|
942 const timeContext: any = this.timeline.timeContext;
|
dev@196
|
943 if (this.isSeeking) {
|
dev@196
|
944 this.audioService.seekTo(
|
dev@236
|
945 timeContext.timeToPixel.invert(x) - timeContext.offset
|
dev@196
|
946 );
|
dev@196
|
947 }
|
dev@154
|
948 }
|
dev@154
|
949 }
|
dev@6
|
950 }
|