godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash in AudioStream preview

Browse Source
This commit is contained in:
RedworkDE 2023-05-30 16:49:58 +02:00
parent 70fa4d26d7
commit ebc3ac0934
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/import/audio_stream_import_settings.cpp
View File

@ -78,6 +78,7 @@ void AudioStreamImportSettings::_notification(int p_what) {
void AudioStreamImportSettings::_draw_preview() { void AudioStreamImportSettings::_draw_preview() {
Rect2 rect = _preview->get_rect(); Rect2 rect = _preview->get_rect();
Size2 rect_size = rect.size; Size2 rect_size = rect.size;
int width = rect_size.width;
Ref<AudioStreamPreview> preview = AudioStreamPreviewGenerator::get_singleton()->generate_preview(stream); Ref<AudioStreamPreview> preview = AudioStreamPreviewGenerator::get_singleton()->generate_preview(stream);
float preview_offset = zoom_bar->get_value(); float preview_offset = zoom_bar->get_value();
@ -86,7 +87,7 @@ void AudioStreamImportSettings::_draw_preview() {
Ref<Font> beat_font = get_theme_font(SNAME("main"), SNAME("EditorFonts")); Ref<Font> beat_font = get_theme_font(SNAME("main"), SNAME("EditorFonts"));
int main_size = get_theme_font_size(SNAME("main_size"), SNAME("EditorFonts")); int main_size = get_theme_font_size(SNAME("main_size"), SNAME("EditorFonts"));
Vector<Vector2> lines; Vector<Vector2> lines;
lines.resize(rect_size.width * 2); lines.resize(width * 2);
Color color_active = get_theme_color(SNAME("contrast_color_2"), SNAME("Editor")); Color color_active = get_theme_color(SNAME("contrast_color_2"), SNAME("Editor"));
Color color_inactive = color_active; Color color_inactive = color_active;
color_inactive.a *= 0.5; color_inactive.a *= 0.5;
@ -108,7 +109,7 @@ void AudioStreamImportSettings::_draw_preview() {
} }
} }
for (int i = 0; i < rect_size.width; i++) { for (int i = 0; i < width; i++) {
float ofs = preview_offset + i * preview_len / rect_size.width; float ofs = preview_offset + i * preview_len / rect_size.width;
float ofs_n = preview_offset + (i + 1) * preview_len / rect_size.width; float ofs_n = preview_offset + (i + 1) * preview_len / rect_size.width;
float max = preview->get_max(ofs, ofs_n) * 0.5 + 0.5; float max = preview->get_max(ofs, ofs_n) * 0.5 + 0.5;
@ -140,7 +141,7 @@ void AudioStreamImportSettings::_draw_preview() {
int bar_beats = stream->get_bar_beats(); int bar_beats = stream->get_bar_beats();
int last_text_end_x = 0; int last_text_end_x = 0;
for (int i = 0; i < rect_size.width; i++) { for (int i = 0; i < width; i++) {
float ofs = preview_offset + i * preview_len / rect_size.width; float ofs = preview_offset + i * preview_len / rect_size.width;
int beat = int(ofs / beat_size); int beat = int(ofs / beat_size);
if (beat != prev_beat) { if (beat != prev_beat) {

8
editor/plugins/audio_stream_editor_plugin.cpp
View File

@ -76,14 +76,18 @@ void AudioStreamEditor::_notification(int p_what) {
void AudioStreamEditor::_draw_preview() { void AudioStreamEditor::_draw_preview() {
Rect2 rect = _preview->get_rect(); Rect2 rect = _preview->get_rect();
Size2 size = get_size(); Size2 size = get_size();
int width = size.width;
if (width <= 0) {
return; // No points to draw.
}
Ref<AudioStreamPreview> preview = AudioStreamPreviewGenerator::get_singleton()->generate_preview(stream); Ref<AudioStreamPreview> preview = AudioStreamPreviewGenerator::get_singleton()->generate_preview(stream);
float preview_len = preview->get_length(); float preview_len = preview->get_length();
Vector<Vector2> lines; Vector<Vector2> lines;
lines.resize(size.width * 2); lines.resize(width * 2);
for (int i = 0; i < size.width; i++) { for (int i = 0; i < width; i++) {
float ofs = i * preview_len / size.width; float ofs = i * preview_len / size.width;
float ofs_n = (i + 1) * preview_len / size.width; float ofs_n = (i + 1) * preview_len / size.width;
float max = preview->get_max(ofs, ofs_n) * 0.5 + 0.5; float max = preview->get_max(ofs, ofs_n) * 0.5 + 0.5;