Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/main/Timeline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ const Waveforms: React.FC<{}> = () => {

// Update based on current fetching status
const [images, setImages] = useState<string[]>([])
const [waveformWorkerError, setWaveformWorkerError] = useState<boolean>(false)

const waveformDisplayTestStyle = css({
display: 'flex',
Expand Down Expand Up @@ -343,7 +344,13 @@ const Waveforms: React.FC<{}> = () => {
var file = new File([blob], blob)

// Start waveform worker with blob
const waveformWorker : any = new Waveform({type: 'img', width: '2000', height: '230', samples: 100000, media: file});
const waveformWorker : any = new Waveform({type: 'img', width: '2000', height: '230', samples: 100000, media: file})

waveformWorker.onarne = function(error: string) {
setWaveformWorkerError(true)
console.log("Waveform could not be generated:" + error)
}

// When done, save path to generated waveform img
waveformWorker.oncomplete = function(image: any, numSamples: any) {
images.push(image)
Expand All @@ -354,6 +361,7 @@ const Waveforms: React.FC<{}> = () => {
}
}
}

xhr.send()
})
}
Expand All @@ -367,7 +375,12 @@ const Waveforms: React.FC<{}> = () => {
<img key={index} alt='Waveform' src={image ? image : ""} css={{minHeight: 0}}></img>
)
);
} else {
} else if (waveformWorkerError) {
return (
<div>{"Waveform could not be generated"}</div>
);
}
else {
return (
<>
<FontAwesomeIcon icon={faSpinner} spin size="3x"/>
Expand Down
20 changes: 19 additions & 1 deletion src/util/waveform.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ export function Waveform(opts) {
});
}
})
.catch(e => console.log(e));
.catch((e) => {
console.log("Waveform Worker: " + e);
this.onarne = e.toString();
});
}

var _completeFuncs = [];
Expand All @@ -62,6 +65,21 @@ export function Waveform(opts) {
}
}
});

var _error = "";
Object.defineProperty(this, 'onarne', {
get: function() {
return _error;
},
set: function(fn, opt) {
if (typeof fn == 'function') {
fn(_error);
} else {
_error = fn
}
return;
}
});
}

Waveform.prototype = {
Expand Down