Chart editor all supported sound formats

Lasercar · Lasercar · commit 4933ef861935 · 2026-02-27T01:47:39.000+10:00
diff --git a/source/funkin/audio/FunkinSound.hx b/source/funkin/audio/FunkinSound.hx
@@ -57,16 +57,16 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
    * Waveform data for this sound.
    * This is lazily loaded, so it will be built the first time it is accessed.
    */
-  public var waveformData(get, never):WaveformData;
+  public var waveformData(get, never):Null<WaveformData>;
 
   var _waveformData:Null<WaveformData> = null;
 
-  function get_waveformData():WaveformData
+  function get_waveformData():Null<WaveformData>
   {
     if (_waveformData == null)
     {
       _waveformData = WaveformDataParser.interpretFlxSound(this);
-      if (_waveformData == null) throw 'Could not interpret waveform data!';
+      if (_waveformData == null) trace('Could not interpret waveform data!');
     }
     return _waveformData;
   }
diff --git a/source/funkin/audio/waveform/WaveformData.hx b/source/funkin/audio/waveform/WaveformData.hx
@@ -195,6 +195,8 @@ class WaveformData
       var thatChannel = that.channel(channelIndex);
       var resultChannel = result.channel(channelIndex);
 
+      if (thatChannel == null) return this.clone();
+
       for (index in 0...this.length)
       {
         var thisMinSample = thisChannel.minSample(index);
diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -148,9 +148,6 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
   public static final CHART_EDITOR_TOOLBOX_FREEPLAY_LAYOUT:String = Paths.ui('chart-editor/toolbox/freeplay');
   public static final CHART_EDITOR_TOOLBOX_PLAYTEST_PROPERTIES_LAYOUT:String = Paths.ui('chart-editor/toolbox/playtest-properties');
 
-  // Validation
-  public static final SUPPORTED_MUSIC_FORMATS:Array<String> = #if sys ['ogg'] #else ['mp3'] #end;
-
   // Layout
 
   /**
diff --git a/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadVocalsDialog.hx b/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadVocalsDialog.hx
@@ -109,7 +109,7 @@ class ChartEditorUploadVocalsDialog extends ChartEditorBaseDialog
 
       vocalsEntry.onClick = function(_event)
       {
-        Dialogs.openBinaryFile('Open $charName Vocals', [{label: 'Audio File (.ogg)', extension: 'ogg'}], function(selectedFile)
+        Dialogs.openBinaryFile('Open $charName Vocals', FileUtil.FILE_EXTENSION_INFO_AUDIO, function(selectedFile)
         {
           if (selectedFile != null && selectedFile.bytes != null)
           {
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorAudioHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorAudioHandler.hx
@@ -13,6 +13,7 @@ import funkin.audio.waveform.WaveformSprite;
 import flixel.util.FlxColor;
 import haxe.io.Bytes;
 import haxe.io.Path;
+import lime.media.AudioBuffer;
 
 /**
  * Functions for loading audio for the chart editor.
@@ -69,6 +70,7 @@ class ChartEditorAudioHandler
    */
   public static function loadVocalsFromBytes(state:ChartEditorState, bytes:Bytes, charId:String, instId:String = '', wipeFirst:Bool = false):Bool
   {
+    if (AudioBuffer.getCodec(bytes) == null) return false;
     var trackId:String = '${charId}${instId == '' ? '' : '-${instId}'}';
     if (wipeFirst) wipeVocalData(state);
     state.audioVocalTrackData.set(trackId, bytes);
@@ -119,9 +121,11 @@ class ChartEditorAudioHandler
    */
   public static function loadInstFromBytes(state:ChartEditorState, bytes:Bytes, instId:String = '', wipeFirst:Bool = false):Bool
   {
+    if (AudioBuffer.getCodec(bytes) == null) return false;
     if (instId == '') instId = 'default';
     if (wipeFirst) wipeInstrumentalData(state);
     state.audioInstTrackData.set(instId, bytes);
+    trace('instId: ${instId} bytes:${state.audioInstTrackData.get(instId)?.length}');
     return true;
   }
 
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
@@ -532,7 +532,7 @@ class ChartEditorDialogHandler
 
     instrumentalBox.onClick = function(_)
     {
-      Dialogs.openBinaryFile('Open Instrumental', [{label: 'Audio File (.ogg)', extension: 'ogg'}], function(selectedFile:SelectedFileInfo)
+      Dialogs.openBinaryFile('Open Instrumental', FileUtil.FILE_EXTENSION_INFO_AUDIO, function(selectedFile:SelectedFileInfo)
       {
         if (selectedFile != null && selectedFile.bytes != null)
         {
@@ -567,17 +567,8 @@ class ChartEditorDialogHandler
       }
       else
       {
-        var message:String = if (!ChartEditorState.SUPPORTED_MUSIC_FORMATS.contains(path.ext ?? ''))
-        {
-          'File format (${path.ext}) not supported for instrumental track (${path.file}.${path.ext})';
-        }
-        else
-        {
-          'Failed to load instrumental track (${path.file}.${path.ext}) for variation (${state.selectedVariation})';
-        }
-
         // Tell the user the load was successful.
-        state.error('Failed to Load Instrumental', message);
+        state.error('Failed to Load Instrumental', 'Failed to load instrumental track (${path.file}.${path.ext}) for variation (${state.selectedVariation})');
       }
     };
 
diff --git a/source/funkin/ui/debug/charting/toolboxes/ChartEditorFreeplayToolbox.hx b/source/funkin/ui/debug/charting/toolboxes/ChartEditorFreeplayToolbox.hx
@@ -324,7 +324,7 @@ class ChartEditorFreeplayToolbox extends ChartEditorBaseToolbox
     for (index in 0...numberOfTicks)
     {
       var tickPos = chartEditorState.offsetTickBitmap.width / 2 * index;
-      var tickTime = tickPos * (waveformScale / BASE_SCALE * waveformMagicFactor) / waveformMusic.waveform.waveformData.pointsPerSecond();
+      var tickTime = tickPos * (waveformScale / BASE_SCALE * waveformMagicFactor) / waveformMusic.waveform.waveformData?.pointsPerSecond();
 
       var tickLabel:Label = new Label();
       tickLabel.text = formatTime(tickTime);
@@ -397,7 +397,7 @@ class ChartEditorFreeplayToolbox extends ChartEditorBaseToolbox
 
     // Move the audio preview to the playhead position.
     var currentWaveformIndex:Int = Std.int(playheadAbsolutePos * (waveformScale / BASE_SCALE * waveformMagicFactor));
-    var targetSongTimeSeconds:Float = waveformMusic.waveform.waveformData.indexToSeconds(currentWaveformIndex);
+    var targetSongTimeSeconds:Float = waveformMusic.waveform.waveformData?.indexToSeconds(currentWaveformIndex);
     audioPreviewTracks.time = targetSongTimeSeconds * Constants.MS_PER_SEC;
   }
 
@@ -452,11 +452,11 @@ class ChartEditorFreeplayToolbox extends ChartEditorBaseToolbox
 
     var previewStartPosAbsolute = waveformDragPreviewStartPos + waveformScrollview.hscrollPos;
     var previewStartPosIndex:Int = Std.int(previewStartPosAbsolute * (waveformScale / BASE_SCALE * waveformMagicFactor));
-    var previewStartPosMs:Int = Std.int(waveformMusic.waveform.waveformData.indexToSeconds(previewStartPosIndex) * Constants.MS_PER_SEC);
+    var previewStartPosMs:Int = Std.int(waveformMusic.waveform.waveformData?.indexToSeconds(previewStartPosIndex) * Constants.MS_PER_SEC);
 
     var previewEndPosAbsolute = waveformDragPreviewEndPos + waveformScrollview.hscrollPos;
     var previewEndPosIndex:Int = Std.int(previewEndPosAbsolute * (waveformScale / BASE_SCALE * waveformMagicFactor));
-    var previewEndPosMs:Int = Std.int(waveformMusic.waveform.waveformData.indexToSeconds(previewEndPosIndex) * Constants.MS_PER_SEC);
+    var previewEndPosMs:Int = Std.int(waveformMusic.waveform.waveformData?.indexToSeconds(previewEndPosIndex) * Constants.MS_PER_SEC);
 
     chartEditorState.performCommand(new SetFreeplayPreviewCommand(previewStartPosMs, previewEndPosMs));
 
@@ -629,7 +629,7 @@ class ChartEditorFreeplayToolbox extends ChartEditorBaseToolbox
 
     if (audioPreviewTracks.playing)
     {
-      var targetScrollPos:Float = waveformMusic.waveform.waveformData.secondsToIndex(audioPreviewTracks.time / Constants.MS_PER_SEC) / (waveformScale / BASE_SCALE * waveformMagicFactor);
+      var targetScrollPos:Float = waveformMusic.waveform.waveformData?.secondsToIndex(audioPreviewTracks.time / Constants.MS_PER_SEC) / (waveformScale / BASE_SCALE * waveformMagicFactor);
       // waveformScrollview.hscrollPos = targetScrollPos;
       var prevPlayheadAbsolutePos = playheadAbsolutePos;
       playheadAbsolutePos = targetScrollPos;
@@ -652,11 +652,11 @@ class ChartEditorFreeplayToolbox extends ChartEditorBaseToolbox
     {
       var previewStartPosAbsolute = waveformDragPreviewStartPos + waveformScrollview.hscrollPos;
       var previewStartPosIndex:Int = Std.int(previewStartPosAbsolute * (waveformScale / BASE_SCALE * waveformMagicFactor));
-      var previewStartPosMs:Int = Std.int(waveformMusic.waveform.waveformData.indexToSeconds(previewStartPosIndex) * Constants.MS_PER_SEC);
+      var previewStartPosMs:Int = Std.int(waveformMusic.waveform.waveformData?.indexToSeconds(previewStartPosIndex) * Constants.MS_PER_SEC);
 
       var previewEndPosAbsolute = waveformDragPreviewEndPos + waveformScrollview.hscrollPos;
       var previewEndPosIndex:Int = Std.int(previewEndPosAbsolute * (waveformScale / BASE_SCALE * waveformMagicFactor));
-      var previewEndPosMs:Int = Std.int(waveformMusic.waveform.waveformData.indexToSeconds(previewEndPosIndex) * Constants.MS_PER_SEC);
+      var previewEndPosMs:Int = Std.int(waveformMusic.waveform.waveformData?.indexToSeconds(previewEndPosIndex) * Constants.MS_PER_SEC);
 
       // Set the values in milliseconds.
       freeplayPreviewStart.value = previewStartPosMs;
@@ -667,8 +667,8 @@ class ChartEditorFreeplayToolbox extends ChartEditorBaseToolbox
     }
     else
     {
-      previewBoxStartPosAbsolute = waveformMusic.waveform.waveformData.secondsToIndex(chartEditorState.currentSongFreeplayPreviewStart / Constants.MS_PER_SEC) / (waveformScale / BASE_SCALE * waveformMagicFactor);
-      previewBoxEndPosAbsolute = waveformMusic.waveform.waveformData.secondsToIndex(chartEditorState.currentSongFreeplayPreviewEnd / Constants.MS_PER_SEC) / (waveformScale / BASE_SCALE * waveformMagicFactor);
+      previewBoxStartPosAbsolute = waveformMusic.waveform.waveformData?.secondsToIndex(chartEditorState.currentSongFreeplayPreviewStart / Constants.MS_PER_SEC) / (waveformScale / BASE_SCALE * waveformMagicFactor);
+      previewBoxEndPosAbsolute = waveformMusic.waveform.waveformData?.secondsToIndex(chartEditorState.currentSongFreeplayPreviewEnd / Constants.MS_PER_SEC) / (waveformScale / BASE_SCALE * waveformMagicFactor);
 
       freeplayPreviewStart.value = chartEditorState.currentSongFreeplayPreviewStart;
       freeplayPreviewEnd.value = chartEditorState.currentSongFreeplayPreviewEnd;
@@ -679,7 +679,7 @@ class ChartEditorFreeplayToolbox extends ChartEditorBaseToolbox
   {
     super.refresh();
 
-    waveformMagicFactor = MAGIC_SCALE_BASE_TIME / (chartEditorState.offsetTickBitmap.width / waveformMusic.waveform.waveformData.pointsPerSecond());
+    waveformMagicFactor = MAGIC_SCALE_BASE_TIME / (chartEditorState.offsetTickBitmap.width / waveformMusic.waveform.waveformData?.pointsPerSecond());
 
     var currentZoomFactor = waveformScale / BASE_SCALE * waveformMagicFactor;
 
diff --git a/source/funkin/ui/debug/charting/toolboxes/ChartEditorOffsetsToolbox.hx b/source/funkin/ui/debug/charting/toolboxes/ChartEditorOffsetsToolbox.hx
@@ -211,7 +211,7 @@ class ChartEditorOffsetsToolbox extends ChartEditorBaseToolbox
         {
           // We have to change the song time to match the playhead position when we move it.
           var currentWaveformIndex:Int = Std.int(playheadAbsolutePos * (waveformScale / BASE_SCALE * waveformMagicFactor));
-          var targetSongTimeSeconds:Float = waveformPlayer.waveform.waveformData.indexToSeconds(currentWaveformIndex);
+          var targetSongTimeSeconds:Float = waveformPlayer.waveform.waveformData?.indexToSeconds(currentWaveformIndex);
           audioPreviewTracks.time = targetSongTimeSeconds * Constants.MS_PER_SEC;
         }
 
@@ -323,7 +323,7 @@ class ChartEditorOffsetsToolbox extends ChartEditorBaseToolbox
     for (index in 0...numberOfTicks)
     {
       var tickPos = chartEditorState.offsetTickBitmap.width / 2 * index;
-      var tickTime = tickPos * (waveformScale / BASE_SCALE * waveformMagicFactor) / waveformInstrumental.waveform.waveformData.pointsPerSecond();
+      var tickTime = tickPos * (waveformScale / BASE_SCALE * waveformMagicFactor) / waveformInstrumental.waveform.waveformData?.pointsPerSecond();
 
       var tickLabel:Label = new Label();
       tickLabel.text = formatTime(tickTime);
@@ -396,7 +396,7 @@ class ChartEditorOffsetsToolbox extends ChartEditorBaseToolbox
 
     // Move the audio preview to the playhead position.
     var currentWaveformIndex:Int = Std.int(playheadAbsolutePos * (waveformScale / BASE_SCALE * waveformMagicFactor));
-    var targetSongTimeSeconds:Float = waveformPlayer.waveform.waveformData.indexToSeconds(currentWaveformIndex);
+    var targetSongTimeSeconds:Float = waveformPlayer.waveform.waveformData?.indexToSeconds(currentWaveformIndex);
     audioPreviewTracks.time = targetSongTimeSeconds * Constants.MS_PER_SEC;
   }
 
@@ -424,11 +424,11 @@ class ChartEditorOffsetsToolbox extends ChartEditorBaseToolbox
     var deltaMilliseconds:Float = switch (dragWaveform)
     {
       case PLAYER:
-        deltaPixels / waveformPlayer.waveform.waveformData.pointsPerSecond() * Constants.MS_PER_SEC;
+        deltaPixels / waveformPlayer.waveform.waveformData?.pointsPerSecond() * Constants.MS_PER_SEC;
       case OPPONENT:
-        deltaPixels / waveformOpponent.waveform.waveformData.pointsPerSecond() * Constants.MS_PER_SEC;
+        deltaPixels / waveformOpponent.waveform.waveformData?.pointsPerSecond() * Constants.MS_PER_SEC;
       case INSTRUMENTAL:
-        deltaPixels / waveformInstrumental.waveform.waveformData.pointsPerSecond() * Constants.MS_PER_SEC;
+        deltaPixels / waveformInstrumental.waveform.waveformData?.pointsPerSecond() * Constants.MS_PER_SEC;
     };
 
     switch (dragWaveform)
@@ -732,7 +732,7 @@ class ChartEditorOffsetsToolbox extends ChartEditorBaseToolbox
     {
       trace('Playback time: ${audioPreviewTracks.time}');
 
-      var targetScrollPos:Float = waveformInstrumental.waveform.waveformData.secondsToIndex(audioPreviewTracks.time / Constants.MS_PER_SEC) / (waveformScale / BASE_SCALE * waveformMagicFactor);
+      var targetScrollPos:Float = waveformInstrumental.waveform.waveformData?.secondsToIndex(audioPreviewTracks.time / Constants.MS_PER_SEC) / (waveformScale / BASE_SCALE * waveformMagicFactor);
       // waveformScrollview.hscrollPos = targetScrollPos;
       var prevPlayheadAbsolutePos = playheadAbsolutePos;
       playheadAbsolutePos = targetScrollPos;
@@ -805,7 +805,7 @@ class ChartEditorOffsetsToolbox extends ChartEditorBaseToolbox
   {
     super.refresh();
 
-    waveformMagicFactor = MAGIC_SCALE_BASE_TIME / (chartEditorState.offsetTickBitmap.width / waveformInstrumental.waveform.waveformData.pointsPerSecond());
+    waveformMagicFactor = MAGIC_SCALE_BASE_TIME / (chartEditorState.offsetTickBitmap.width / waveformInstrumental.waveform.waveformData?.pointsPerSecond());
 
     var currentZoomFactor = waveformScale / BASE_SCALE * waveformMagicFactor;
 
diff --git a/source/funkin/util/FileUtil.hx b/source/funkin/util/FileUtil.hx
@@ -49,6 +49,12 @@ class FileUtil
   };
   #end
 
+  // All supported audio file formats supported by haxeflixel.
+  public static final FILE_EXTENSION_INFO_AUDIO:Array<FileDialogExtensionInfo> = [{
+    extension: 'ogg, mp3, wav, opus, flac',
+    label: 'Audio File (*.ogg, *.mp3, *.wav, *.opus, *.flac)',
+  }];
+
   /**
    * Paths which should not be deleted or modified by scripts.
    */

Original file line number	Diff line number	Diff line change
`@@ -57,16 +57,16 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>`
`57`	`57`	`* Waveform data for this sound.`
`58`	`58`	`* This is lazily loaded, so it will be built the first time it is accessed.`
`59`	`59`	`*/`
`60`		`- public var waveformData(get, never):WaveformData;`
	`60`	`+ public var waveformData(get, never):Null<WaveformData>;`
`61`	`61`
`62`	`62`	`var _waveformData:Null<WaveformData> = null;`
`63`	`63`
`64`		`- function get_waveformData():WaveformData`
	`64`	`+ function get_waveformData():Null<WaveformData>`
`65`	`65`	`{`
`66`	`66`	`if (_waveformData == null)`
`67`	`67`	`{`
`68`	`68`	`_waveformData = WaveformDataParser.interpretFlxSound(this);`
`69`		`- if (_waveformData == null) throw 'Could not interpret waveform data!';`
	`69`	`+ if (_waveformData == null) trace('Could not interpret waveform data!');`
`70`	`70`	`}`
`71`	`71`	`return _waveformData;`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,8 @@ class WaveformData`
`195`	`195`	`var thatChannel = that.channel(channelIndex);`
`196`	`196`	`var resultChannel = result.channel(channelIndex);`
`197`	`197`
	`198`	`+ if (thatChannel == null) return this.clone();`
	`199`	`+`
`198`	`200`	`for (index in 0...this.length)`
`199`	`201`	`{`
`200`	`202`	`var thisMinSample = thisChannel.minSample(index);`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ class ChartEditorUploadVocalsDialog extends ChartEditorBaseDialog`
`109`	`109`
`110`	`110`	`vocalsEntry.onClick = function(_event)`
`111`	`111`	`{`
`112`		`- Dialogs.openBinaryFile('Open $charName Vocals', [{label: 'Audio File (.ogg)', extension: 'ogg'}], function(selectedFile)`
	`112`	`+ Dialogs.openBinaryFile('Open $charName Vocals', FileUtil.FILE_EXTENSION_INFO_AUDIO, function(selectedFile)`
`113`	`113`	`{`
`114`	`114`	`if (selectedFile != null && selectedFile.bytes != null)`
`115`	`115`	`{`
Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,7 @@ class ChartEditorDialogHandler`
`532`	`532`
`533`	`533`	`instrumentalBox.onClick = function(_)`
`534`	`534`	`{`
`535`		`- Dialogs.openBinaryFile('Open Instrumental', [{label: 'Audio File (.ogg)', extension: 'ogg'}], function(selectedFile:SelectedFileInfo)`
	`535`	`+ Dialogs.openBinaryFile('Open Instrumental', FileUtil.FILE_EXTENSION_INFO_AUDIO, function(selectedFile:SelectedFileInfo)`
`536`	`536`	`{`
`537`	`537`	`if (selectedFile != null && selectedFile.bytes != null)`
`538`	`538`	`{`
`@@ -567,17 +567,8 @@ class ChartEditorDialogHandler`
`567`	`567`	`}`
`568`	`568`	`else`
`569`	`569`	`{`
`570`		`- var message:String = if (!ChartEditorState.SUPPORTED_MUSIC_FORMATS.contains(path.ext ?? ''))`
`571`		`- {`
`572`		`- 'File format (${path.ext}) not supported for instrumental track (${path.file}.${path.ext})';`
`573`		`- }`
`574`		`- else`
`575`		`- {`
`576`		`- 'Failed to load instrumental track (${path.file}.${path.ext}) for variation (${state.selectedVariation})';`
`577`		`- }`
`578`		`-`
`579`	`570`	`// Tell the user the load was successful.`
`580`		`- state.error('Failed to Load Instrumental', message);`
	`571`	`+ state.error('Failed to Load Instrumental', 'Failed to load instrumental track (${path.file}.${path.ext}) for variation (${state.selectedVariation})');`
`581`	`572`	`}`
`582`	`573`	`};`
`583`	`574`