Skip to content

[4.0] Fix crash in AudioStream preview #77664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
YuriSizov merged 1 commit into from
Jun 2, 2023
Merged

[4.0] Fix crash in AudioStream preview #77664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions editor/import/audio_stream_import_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ void AudioStreamImportSettings::_notification(int p_what) {
void AudioStreamImportSettings::_draw_preview() {
Rect2 rect = _preview->get_rect();
Size2 rect_size = rect.size;
int width = rect_size.width;

Ref<AudioStreamPreview> preview = AudioStreamPreviewGenerator::get_singleton()->generate_preview(stream);
float preview_offset = zoom_bar->get_value();
Expand All @@ -86,7 +87,7 @@ void AudioStreamImportSettings::_draw_preview() {
Ref<Font> beat_font = get_theme_font(SNAME("main"), SNAME("EditorFonts"));
int main_size = get_theme_font_size(SNAME("main_size"), SNAME("EditorFonts"));
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_inactive = color_active;
color_inactive.a *= 0.5;
Expand All @@ -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_n = preview_offset + (i + 1) * preview_len / rect_size.width;
float max = preview->get_max(ofs, ofs_n) * 0.5 + 0.5;
Expand Down Expand Up @@ -140,7 +141,7 @@ void AudioStreamImportSettings::_draw_preview() {
int bar_beats = stream->get_bar_beats();

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;
int beat = int(ofs / beat_size);
if (beat != prev_beat) {
Expand Down
8 changes: 6 additions & 2 deletions editor/plugins/audio_stream_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,18 @@ void AudioStreamEditor::_notification(int p_what) {
void AudioStreamEditor::_draw_preview() {
Rect2 rect = _preview->get_rect();
Size2 size = get_size();
int width = size.width;
Comment thread
RedworkDE marked this conversation as resolved.
Outdated
if (width <= 0) {
return; // No points to draw.
}

Ref<AudioStreamPreview> preview = AudioStreamPreviewGenerator::get_singleton()->generate_preview(stream);
float preview_len = preview->get_length();

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_n = (i + 1) * preview_len / size.width;
float max = preview->get_max(ofs, ofs_n) * 0.5 + 0.5;
Expand Down