myxelium/Bridge-Multi
1
0
Fork 0
mirror of https://github.com/Myxelium/Bridge-Multi.git synced 2026-04-09 05:09:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve audio length detection

Browse Source
This commit is contained in:
Geomitron
2024-08-04 15:19:58 -05:00
parent bdb355e0cd
commit d0afb4b455
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src-angular/app/components/browse/chart-sidebar/chart-sidebar-preview/chart-sidebar-preview.component.ts
View File

@@ -94,7 +94,7 @@ export class ChartSidebarPreviewComponent implements OnInit, OnDestroy {
this.instrument, this.instrument,
this.difficulty, this.difficulty,
(this.selectedChart.delay ?? 0) + (this.selectedChart.chart_offset ?? 0) * 1000, (this.selectedChart.delay ?? 0) + (this.selectedChart.chart_offset ?? 0) * 1000,
this.selectedChart.song_length ?? 5 * 60 * 1000, // TODO: have a better way to detect the audio length? this.selectedChart.song_length ?? 5 * 60 * 1000,
this.previewDiv.nativeElement, this.previewDiv.nativeElement,
) )
this.chartPreview.on('progress', percentComplete => { this.chartPreview.on('progress', percentComplete => {

9
src-angular/app/components/browse/chart-sidebar/chart-sidebar-preview/render.ts
View File

@@ -80,7 +80,7 @@ export class ChartPreview {
chartPreview.camera = new ChartCamera(divContainer) chartPreview.camera = new ChartCamera(divContainer)
chartPreview.renderer = new ChartRenderer(divContainer) chartPreview.renderer = new ChartRenderer(divContainer)
chartPreview.audioManager = await (AudioContext ? chartPreview.audioManager = await (AudioContext ?
AudioManager.create(audioFiles, startDelayMs, audioLengthMs) AudioManager.create(audioFiles, startDelayMs)
: SilentAudioManager.create(startDelayMs, audioLengthMs)) : SilentAudioManager.create(startDelayMs, audioLengthMs))
chartPreview.audioManager.on('end', () => chartPreview.eventEmitter.emit('end')) chartPreview.audioManager.on('end', () => chartPreview.eventEmitter.emit('end'))
chartPreview.notesManager = new NotesManager(parsedChart, instrument, difficulty, chartPreview.scene, textures.noteTextures) chartPreview.notesManager = new NotesManager(parsedChart, instrument, difficulty, chartPreview.scene, textures.noteTextures)
@@ -258,11 +258,11 @@ class AudioManager {
private _volume = 0.5 private _volume = 0.5
private lastSeekChartTimeMs = 0 private lastSeekChartTimeMs = 0
private lastAudioCtxCurrentTime = 0 // Necessary because audioCtx.currentTime doesn't reset to 0 on seek private lastAudioCtxCurrentTime = 0 // Necessary because audioCtx.currentTime doesn't reset to 0 on seek
private audioLengthMs: number
private constructor( private constructor(
private audioFiles: Uint8Array[], private audioFiles: Uint8Array[],
private startDelayMs: number, private startDelayMs: number,
private audioLengthMs: number,
) { } ) { }
/** /**
@@ -270,8 +270,8 @@ class AudioManager {
* @param startDelayMs The amount of time to delay the start of the audio. (can be negative) * @param startDelayMs The amount of time to delay the start of the audio. (can be negative)
* @param audioLengthMs The length of the longest audio file stem. * @param audioLengthMs The length of the longest audio file stem.
*/ */
static async create(audioFiles: Uint8Array[], startDelayMs: number, audioLengthMs: number) { static async create(audioFiles: Uint8Array[], startDelayMs: number) {
const audioManager = new AudioManager(audioFiles, startDelayMs, audioLengthMs) const audioManager = new AudioManager(audioFiles, startDelayMs)
await audioManager.initAudio() await audioManager.initAudio()
return audioManager return audioManager
} }
@@ -339,6 +339,7 @@ class AudioManager {
// TODO: use audio-decode library instead if this fails // TODO: use audio-decode library instead if this fails
this.audioFiles.map(file => this.audioCtx.decodeAudioData(file.slice(0).buffer)), this.audioFiles.map(file => this.audioCtx.decodeAudioData(file.slice(0).buffer)),
) )
this.audioLengthMs = Math.max(...audioBuffers.map(b => b.duration)) * 1000
this.gainNode = this.audioCtx.createGain() this.gainNode = this.audioCtx.createGain()
this.gainNode.gain.value = this._volume this.gainNode.gain.value = this._volume