diff options
Diffstat (limited to 'editor/editor_audio_buses.cpp')
-rw-r--r-- | editor/editor_audio_buses.cpp | 161 |
1 files changed, 46 insertions, 115 deletions
diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index 55bdd2070b..f8dec13a5c 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -30,7 +30,7 @@ #include "editor_audio_buses.h" -#include "core/input/input_filter.h" +#include "core/input/input.h" #include "core/io/resource_saver.h" #include "core/os/keyboard.h" #include "editor_node.h" @@ -40,10 +40,8 @@ #include "servers/audio_server.h" void EditorAudioBus::_update_visible_channels() { - int i = 0; for (; i < cc; i++) { - if (!channel[i].vu_l->is_visible()) { channel[i].vu_l->show(); } @@ -53,7 +51,6 @@ void EditorAudioBus::_update_visible_channels() { } for (; i < CHANNELS_MAX; i++) { - if (channel[i].vu_l->is_visible()) { channel[i].vu_l->hide(); } @@ -64,10 +61,8 @@ void EditorAudioBus::_update_visible_channels() { } void EditorAudioBus::_notification(int p_what) { - switch (p_what) { case NOTIFICATION_READY: { - for (int i = 0; i < CHANNELS_MAX; i++) { channel[i].vu_l->set_under_texture(get_theme_icon("BusVuEmpty", "EditorIcons")); channel[i].vu_l->set_progress_texture(get_theme_icon("BusVuFull", "EditorIcons")); @@ -95,7 +90,6 @@ void EditorAudioBus::_notification(int p_what) { set_process(true); } break; case NOTIFICATION_DRAW: { - if (is_master) { draw_style_box(get_theme_stylebox("disabled", "Button"), Rect2(Vector2(), get_size())); } else if (has_focus()) { @@ -111,7 +105,6 @@ void EditorAudioBus::_notification(int p_what) { } } break; case NOTIFICATION_PROCESS: { - if (cc != AudioServer::get_singleton()->get_bus_channels(get_index())) { cc = AudioServer::get_singleton()->get_bus_channels(get_index()); _update_visible_channels(); @@ -156,7 +149,6 @@ void EditorAudioBus::_notification(int p_what) { } } break; case NOTIFICATION_VISIBILITY_CHANGED: { - for (int i = 0; i < CHANNELS_MAX; i++) { channel[i].peak_l = -100; channel[i].peak_r = -100; @@ -166,7 +158,6 @@ void EditorAudioBus::_notification(int p_what) { set_process(is_visible_in_tree()); } break; case NOTIFICATION_THEME_CHANGED: { - for (int i = 0; i < CHANNELS_MAX; i++) { channel[i].vu_l->set_under_texture(get_theme_icon("BusVuEmpty", "EditorIcons")); channel[i].vu_l->set_progress_texture(get_theme_icon("BusVuFull", "EditorIcons")); @@ -185,7 +176,6 @@ void EditorAudioBus::_notification(int p_what) { } break; case NOTIFICATION_MOUSE_EXIT: case NOTIFICATION_DRAG_END: { - if (hovering_drop) { hovering_drop = false; update(); @@ -195,7 +185,6 @@ void EditorAudioBus::_notification(int p_what) { } void EditorAudioBus::update_send() { - send->clear(); if (is_master) { send->set_disabled(true); @@ -218,9 +207,9 @@ void EditorAudioBus::update_send() { } void EditorAudioBus::update_bus() { - - if (updating_bus) + if (updating_bus) { return; + } updating_bus = true; @@ -229,8 +218,9 @@ void EditorAudioBus::update_bus() { float db_value = AudioServer::get_singleton()->get_bus_volume_db(index); slider->set_value(_scaled_db_to_normalized_volume(db_value)); track_name->set_text(AudioServer::get_singleton()->get_bus_name(index)); - if (is_master) + if (is_master) { track_name->set_editable(false); + } solo->set_pressed(AudioServer::get_singleton()->is_bus_solo(index)); mute->set_pressed(AudioServer::get_singleton()->is_bus_mute(index)); @@ -240,7 +230,6 @@ void EditorAudioBus::update_bus() { TreeItem *root = effects->create_item(); for (int i = 0; i < AudioServer::get_singleton()->get_bus_effect_count(index); i++) { - Ref<AudioEffect> afx = AudioServer::get_singleton()->get_bus_effect(index, i); TreeItem *fx = effects->create_item(root); @@ -263,18 +252,16 @@ void EditorAudioBus::update_bus() { } void EditorAudioBus::_name_changed(const String &p_new_name) { - - if (p_new_name == AudioServer::get_singleton()->get_bus_name(get_index())) + if (p_new_name == AudioServer::get_singleton()->get_bus_name(get_index())) { return; + } String attempt = p_new_name; int attempts = 1; while (true) { - bool name_free = true; for (int i = 0; i < AudioServer::get_singleton()->get_bus_count(); i++) { - if (AudioServer::get_singleton()->get_bus_name(i) == attempt) { name_free = false; break; @@ -317,15 +304,15 @@ void EditorAudioBus::_name_changed(const String &p_new_name) { } void EditorAudioBus::_volume_changed(float p_normalized) { - - if (updating_bus) + if (updating_bus) { return; + } updating_bus = true; const float p_db = this->_normalized_volume_to_scaled_db(p_normalized); - if (InputFilter::get_singleton()->is_key_pressed(KEY_CONTROL)) { + if (Input::get_singleton()->is_key_pressed(KEY_CONTROL)) { // Snap the value when holding Ctrl for easier editing. // To do so, it needs to be converted back to normalized volume (as the slider uses that unit). slider->set_value(_scaled_db_to_normalized_volume(Math::round(p_db))); @@ -384,9 +371,8 @@ float EditorAudioBus::_scaled_db_to_normalized_volume(float db) { } void EditorAudioBus::_show_value(float slider_value) { - float db; - if (InputFilter::get_singleton()->is_key_pressed(KEY_CONTROL)) { + if (Input::get_singleton()->is_key_pressed(KEY_CONTROL)) { // Display the correct (snapped) value when holding Ctrl db = Math::round(_normalized_volume_to_scaled_db(slider_value)); } else { @@ -415,7 +401,6 @@ void EditorAudioBus::_hide_value_preview() { } void EditorAudioBus::_solo_toggled() { - updating_bus = true; UndoRedo *ur = EditorNode::get_undo_redo(); @@ -428,8 +413,8 @@ void EditorAudioBus::_solo_toggled() { updating_bus = false; } -void EditorAudioBus::_mute_toggled() { +void EditorAudioBus::_mute_toggled() { updating_bus = true; UndoRedo *ur = EditorNode::get_undo_redo(); @@ -442,8 +427,8 @@ void EditorAudioBus::_mute_toggled() { updating_bus = false; } -void EditorAudioBus::_bypass_toggled() { +void EditorAudioBus::_bypass_toggled() { updating_bus = true; UndoRedo *ur = EditorNode::get_undo_redo(); @@ -458,7 +443,6 @@ void EditorAudioBus::_bypass_toggled() { } void EditorAudioBus::_send_selected(int p_which) { - updating_bus = true; UndoRedo *ur = EditorNode::get_undo_redo(); @@ -473,14 +457,13 @@ void EditorAudioBus::_send_selected(int p_which) { } void EditorAudioBus::_effect_selected() { - TreeItem *effect = effects->get_selected(); - if (!effect) + if (!effect) { return; + } updating_bus = true; if (effect->get_metadata(0) != Variant()) { - int index = effect->get_metadata(0); Ref<AudioEffect> effect2 = AudioServer::get_singleton()->get_bus_effect(get_index(), index); if (effect2.is_valid()) { @@ -492,13 +475,14 @@ void EditorAudioBus::_effect_selected() { } void EditorAudioBus::_effect_edited() { - - if (updating_bus) + if (updating_bus) { return; + } TreeItem *effect = effects->get_edited(); - if (!effect) + if (!effect) { return; + } if (effect->get_metadata(0) == Variant()) { Rect2 area = effects->get_item_rect(effect); @@ -523,9 +507,9 @@ void EditorAudioBus::_effect_edited() { } void EditorAudioBus::_effect_add(int p_which) { - - if (updating_bus) + if (updating_bus) { return; + } StringName name = effect_options->get_item_metadata(p_which); @@ -547,7 +531,6 @@ void EditorAudioBus::_effect_add(int p_which) { } void EditorAudioBus::_gui_input(const Ref<InputEvent> &p_event) { - Ref<InputEventKey> k = p_event; if (k.is_valid() && k->is_pressed() && k->get_keycode() == KEY_DELETE && !k->is_echo()) { accept_event(); @@ -556,7 +539,6 @@ void EditorAudioBus::_gui_input(const Ref<InputEvent> &p_event) { Ref<InputEventMouseButton> mb = p_event; if (mb.is_valid() && mb->get_button_index() == 2 && mb->is_pressed()) { - Vector2 pos = Vector2(mb->get_position().x, mb->get_position().y); bus_popup->set_position(get_global_position() + pos); bus_popup->popup(); @@ -564,7 +546,6 @@ void EditorAudioBus::_gui_input(const Ref<InputEvent> &p_event) { } void EditorAudioBus::_bus_popup_pressed(int p_option) { - if (p_option == 2) { // Reset volume emit_signal("vol_reset_request"); @@ -577,7 +558,6 @@ void EditorAudioBus::_bus_popup_pressed(int p_option) { } Variant EditorAudioBus::get_drag_data(const Point2 &p_point) { - if (get_index() == 0) { return Variant(); } @@ -602,7 +582,6 @@ Variant EditorAudioBus::get_drag_data(const Point2 &p_point) { } bool EditorAudioBus::can_drop_data(const Point2 &p_point, const Variant &p_data) const { - if (get_index() == 0) { return false; } @@ -617,13 +596,11 @@ bool EditorAudioBus::can_drop_data(const Point2 &p_point, const Variant &p_data) } void EditorAudioBus::drop_data(const Point2 &p_point, const Variant &p_data) { - Dictionary d = p_data; emit_signal("dropped", d["index"], get_index()); } Variant EditorAudioBus::get_drag_data_fw(const Point2 &p_point, Control *p_from) { - TreeItem *item = effects->get_item_at_position(p_point); if (!item) { return Variant(); @@ -647,14 +624,15 @@ Variant EditorAudioBus::get_drag_data_fw(const Point2 &p_point, Control *p_from) } bool EditorAudioBus::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const { - Dictionary d = p_data; - if (!d.has("type") || String(d["type"]) != "audio_bus_effect") + if (!d.has("type") || String(d["type"]) != "audio_bus_effect") { return false; + } TreeItem *item = effects->get_item_at_position(p_point); - if (!item) + if (!item) { return false; + } effects->set_drop_mode_flags(Tree::DROP_MODE_INBETWEEN); @@ -662,12 +640,12 @@ bool EditorAudioBus::can_drop_data_fw(const Point2 &p_point, const Variant &p_da } void EditorAudioBus::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) { - Dictionary d = p_data; TreeItem *item = effects->get_item_at_position(p_point); - if (!item) + if (!item) { return; + } int pos = effects->get_drop_section_at_position(p_point); Variant md = item->get_metadata(0); @@ -677,8 +655,9 @@ void EditorAudioBus::drop_data_fw(const Point2 &p_point, const Variant &p_data, if (md.get_type() == Variant::INT) { paste_at = md; - if (pos > 0) + if (pos > 0) { paste_at++; + } if (bus == get_index() && paste_at > effect) { paste_at--; @@ -720,13 +699,14 @@ void EditorAudioBus::drop_data_fw(const Point2 &p_point, const Variant &p_data, } void EditorAudioBus::_delete_effect_pressed(int p_option) { - TreeItem *item = effects->get_selected(); - if (!item) + if (!item) { return; + } - if (item->get_metadata(0).get_type() != Variant::INT) + if (item->get_metadata(0).get_type() != Variant::INT) { return; + } int index = item->get_metadata(0); @@ -741,20 +721,20 @@ void EditorAudioBus::_delete_effect_pressed(int p_option) { } void EditorAudioBus::_effect_rmb(const Vector2 &p_pos) { - TreeItem *item = effects->get_selected(); - if (!item) + if (!item) { return; + } - if (item->get_metadata(0).get_type() != Variant::INT) + if (item->get_metadata(0).get_type() != Variant::INT) { return; + } delete_effect_popup->set_position(get_global_mouse_position()); delete_effect_popup->popup(); } void EditorAudioBus::_bind_methods() { - ClassDB::bind_method("update_bus", &EditorAudioBus::update_bus); ClassDB::bind_method("update_send", &EditorAudioBus::update_send); ClassDB::bind_method("_gui_input", &EditorAudioBus::_gui_input); @@ -770,7 +750,6 @@ void EditorAudioBus::_bind_methods() { } EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) { - buses = p_buses; updating_bus = false; is_master = p_is_master; @@ -926,8 +905,9 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) { ClassDB::get_inheriters_from_class("AudioEffect", &effects); effects.sort_custom<StringName::AlphCompare>(); for (List<StringName>::Element *E = effects.front(); E; E = E->next()) { - if (!ClassDB::can_instance(E->get())) + if (!ClassDB::can_instance(E->get())) { continue; + } Ref<Texture2D> icon = EditorNode::get_singleton()->get_class_icon(E->get()); String name = E->get().operator String().replace("AudioEffect", ""); @@ -950,7 +930,6 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) { } void EditorAudioBusDrop::_notification(int p_what) { - switch (p_what) { case NOTIFICATION_DRAW: { draw_style_box(get_theme_stylebox("normal", "Button"), Rect2(Vector2(), get_size())); @@ -962,7 +941,6 @@ void EditorAudioBusDrop::_notification(int p_what) { } } break; case NOTIFICATION_MOUSE_ENTER: { - if (!hovering_drop) { hovering_drop = true; update(); @@ -970,7 +948,6 @@ void EditorAudioBusDrop::_notification(int p_what) { } break; case NOTIFICATION_MOUSE_EXIT: case NOTIFICATION_DRAG_END: { - if (hovering_drop) { hovering_drop = false; update(); @@ -980,37 +957,31 @@ void EditorAudioBusDrop::_notification(int p_what) { } bool EditorAudioBusDrop::can_drop_data(const Point2 &p_point, const Variant &p_data) const { - Dictionary d = p_data; return (d.has("type") && String(d["type"]) == "move_audio_bus"); } void EditorAudioBusDrop::drop_data(const Point2 &p_point, const Variant &p_data) { - Dictionary d = p_data; emit_signal("dropped", d["index"], AudioServer::get_singleton()->get_bus_count()); } void EditorAudioBusDrop::_bind_methods() { - ADD_SIGNAL(MethodInfo("dropped")); } EditorAudioBusDrop::EditorAudioBusDrop() { - hovering_drop = false; } void EditorAudioBuses::_update_buses() { - while (bus_hb->get_child_count() > 0) { memdelete(bus_hb->get_child(0)); } - drop_end = NULL; + drop_end = nullptr; for (int i = 0; i < AudioServer::get_singleton()->get_bus_count(); i++) { - bool is_master = (i == 0); EditorAudioBus *audio_bus = memnew(EditorAudioBus(this, is_master)); bus_hb->add_child(audio_bus); @@ -1023,33 +994,27 @@ void EditorAudioBuses::_update_buses() { } EditorAudioBuses *EditorAudioBuses::register_editor() { - EditorAudioBuses *audio_buses = memnew(EditorAudioBuses); EditorNode::get_singleton()->add_bottom_panel_item(TTR("Audio"), audio_buses); return audio_buses; } void EditorAudioBuses::_notification(int p_what) { - switch (p_what) { case NOTIFICATION_ENTER_TREE: case NOTIFICATION_THEME_CHANGED: { - bus_scroll->add_theme_style_override("bg", get_theme_stylebox("bg", "Tree")); } break; case NOTIFICATION_READY: { - _update_buses(); } break; case NOTIFICATION_DRAG_END: { - if (drop_end) { drop_end->queue_delete(); - drop_end = NULL; + drop_end = nullptr; } } break; case NOTIFICATION_PROCESS: { - // Check if anything was edited. bool edited = AudioServer::get_singleton()->is_edited(); for (int i = 0; i < AudioServer::get_singleton()->get_bus_count(); i++) { @@ -1072,7 +1037,6 @@ void EditorAudioBuses::_notification(int p_what) { } void EditorAudioBuses::_add_bus() { - UndoRedo *ur = EditorNode::get_undo_redo(); ur->create_action(TTR("Add Audio Bus")); @@ -1084,22 +1048,20 @@ void EditorAudioBuses::_add_bus() { } void EditorAudioBuses::_update_bus(int p_index) { - - if (p_index >= bus_hb->get_child_count()) + if (p_index >= bus_hb->get_child_count()) { return; + } bus_hb->get_child(p_index)->call("update_bus"); } void EditorAudioBuses::_update_sends() { - for (int i = 0; i < bus_hb->get_child_count(); i++) { bus_hb->get_child(i)->call("update_send"); } } void EditorAudioBuses::_delete_bus(Object *p_which) { - EditorAudioBus *bus = Object::cast_to<EditorAudioBus>(p_which); int index = bus->get_index(); if (index == 0) { @@ -1119,7 +1081,6 @@ void EditorAudioBuses::_delete_bus(Object *p_which) { ur->add_undo_method(AudioServer::get_singleton(), "set_bus_mute", index, AudioServer::get_singleton()->is_bus_mute(index)); ur->add_undo_method(AudioServer::get_singleton(), "set_bus_bypass_effects", index, AudioServer::get_singleton()->is_bus_bypassing_effects(index)); for (int i = 0; i < AudioServer::get_singleton()->get_bus_effect_count(index); i++) { - ur->add_undo_method(AudioServer::get_singleton(), "add_bus_effect", index, AudioServer::get_singleton()->get_bus_effect(index, i)); ur->add_undo_method(AudioServer::get_singleton(), "set_bus_effect_enabled", index, i, AudioServer::get_singleton()->is_bus_effect_enabled(index, i)); } @@ -1129,7 +1090,6 @@ void EditorAudioBuses::_delete_bus(Object *p_which) { } void EditorAudioBuses::_duplicate_bus(int p_which) { - int add_at_pos = p_which + 1; UndoRedo *ur = EditorNode::get_undo_redo(); ur->create_action(TTR("Duplicate Audio Bus")); @@ -1141,7 +1101,6 @@ void EditorAudioBuses::_duplicate_bus(int p_which) { ur->add_do_method(AudioServer::get_singleton(), "set_bus_mute", add_at_pos, AudioServer::get_singleton()->is_bus_mute(p_which)); ur->add_do_method(AudioServer::get_singleton(), "set_bus_bypass_effects", add_at_pos, AudioServer::get_singleton()->is_bus_bypassing_effects(p_which)); for (int i = 0; i < AudioServer::get_singleton()->get_bus_effect_count(p_which); i++) { - ur->add_do_method(AudioServer::get_singleton(), "add_bus_effect", add_at_pos, AudioServer::get_singleton()->get_bus_effect(p_which, i)); ur->add_do_method(AudioServer::get_singleton(), "set_bus_effect_enabled", add_at_pos, i, AudioServer::get_singleton()->is_bus_effect_enabled(p_which, i)); } @@ -1152,7 +1111,6 @@ void EditorAudioBuses::_duplicate_bus(int p_which) { } void EditorAudioBuses::_reset_bus_volume(Object *p_which) { - EditorAudioBus *bus = Object::cast_to<EditorAudioBus>(p_which); int index = bus->get_index(); @@ -1166,7 +1124,6 @@ void EditorAudioBuses::_reset_bus_volume(Object *p_which) { } void EditorAudioBuses::_request_drop_end() { - if (!drop_end && bus_hb->get_child_count()) { drop_end = memnew(EditorAudioBusDrop); @@ -1177,7 +1134,6 @@ void EditorAudioBuses::_request_drop_end() { } void EditorAudioBuses::_drop_at_index(int p_bus, int p_index) { - UndoRedo *ur = EditorNode::get_undo_redo(); ur->create_action(TTR("Move Audio Bus")); @@ -1192,18 +1148,15 @@ void EditorAudioBuses::_drop_at_index(int p_bus, int p_index) { } void EditorAudioBuses::_server_save() { - Ref<AudioBusLayout> state = AudioServer::get_singleton()->generate_bus_layout(); ResourceSaver::save(edited_path, state); } void EditorAudioBuses::_select_layout() { - EditorNode::get_singleton()->get_filesystem_dock()->select_file(edited_path); } void EditorAudioBuses::_save_as_layout() { - file_dialog->set_file_mode(EditorFileDialog::FILE_MODE_SAVE_FILE); file_dialog->set_title(TTR("Save Audio Bus Layout As...")); file_dialog->set_current_path(edited_path); @@ -1212,7 +1165,6 @@ void EditorAudioBuses::_save_as_layout() { } void EditorAudioBuses::_new_layout() { - file_dialog->set_file_mode(EditorFileDialog::FILE_MODE_SAVE_FILE); file_dialog->set_title(TTR("Location for New Layout...")); file_dialog->set_current_path(edited_path); @@ -1221,7 +1173,6 @@ void EditorAudioBuses::_new_layout() { } void EditorAudioBuses::_load_layout() { - file_dialog->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE); file_dialog->set_title(TTR("Open Audio Bus Layout")); file_dialog->set_current_path(edited_path); @@ -1230,7 +1181,6 @@ void EditorAudioBuses::_load_layout() { } void EditorAudioBuses::_load_default_layout() { - String layout_path = ProjectSettings::get_singleton()->get("audio/default_bus_layout"); Ref<AudioBusLayout> state = ResourceLoader::load(layout_path, "", true); @@ -1248,7 +1198,6 @@ void EditorAudioBuses::_load_default_layout() { } void EditorAudioBuses::_file_dialog_callback(const String &p_string) { - if (file_dialog->get_file_mode() == EditorFileDialog::FILE_MODE_OPEN_FILE) { Ref<AudioBusLayout> state = ResourceLoader::load(p_string, "", true); if (state.is_null()) { @@ -1264,7 +1213,6 @@ void EditorAudioBuses::_file_dialog_callback(const String &p_string) { call_deferred("_select_layout"); } else if (file_dialog->get_file_mode() == EditorFileDialog::FILE_MODE_SAVE_FILE) { - if (new_layout) { Ref<AudioBusLayout> empty_state; empty_state.instance(); @@ -1287,7 +1235,6 @@ void EditorAudioBuses::_file_dialog_callback(const String &p_string) { } void EditorAudioBuses::_bind_methods() { - ClassDB::bind_method("_update_buses", &EditorAudioBuses::_update_buses); ClassDB::bind_method("_update_bus", &EditorAudioBuses::_update_bus); ClassDB::bind_method("_update_sends", &EditorAudioBuses::_update_sends); @@ -1295,8 +1242,7 @@ void EditorAudioBuses::_bind_methods() { } EditorAudioBuses::EditorAudioBuses() { - - drop_end = NULL; + drop_end = nullptr; top_hb = memnew(HBoxContainer); add_child(top_hb); @@ -1372,7 +1318,6 @@ EditorAudioBuses::EditorAudioBuses() { } void EditorAudioBuses::open_layout(const String &p_path) { - EditorNode::get_singleton()->make_bottom_panel_item_visible(this); Ref<AudioBusLayout> state = ResourceLoader::load(p_path, "", true); @@ -1390,9 +1335,7 @@ void EditorAudioBuses::open_layout(const String &p_path) { } void AudioBusesEditorPlugin::edit(Object *p_node) { - if (Object::cast_to<AudioBusLayout>(p_node)) { - String path = Object::cast_to<AudioBusLayout>(p_node)->get_path(); if (path.is_resource_file()) { audio_bus_editor->open_layout(path); @@ -1401,15 +1344,13 @@ void AudioBusesEditorPlugin::edit(Object *p_node) { } bool AudioBusesEditorPlugin::handles(Object *p_node) const { - - return (Object::cast_to<AudioBusLayout>(p_node) != NULL); + return (Object::cast_to<AudioBusLayout>(p_node) != nullptr); } void AudioBusesEditorPlugin::make_visible(bool p_visible) { } AudioBusesEditorPlugin::AudioBusesEditorPlugin(EditorAudioBuses *p_node) { - audio_bus_editor = p_node; } @@ -1417,12 +1358,10 @@ AudioBusesEditorPlugin::~AudioBusesEditorPlugin() { } void EditorAudioMeterNotches::add_notch(float p_normalized_offset, float p_db_value, bool p_render_value) { - notches.push_back(AudioNotch(p_normalized_offset, p_db_value, p_render_value)); } Size2 EditorAudioMeterNotches::get_minimum_size() const { - Ref<Font> font = get_theme_font("font", "Label"); float font_height = font->get_height(); @@ -1441,13 +1380,11 @@ Size2 EditorAudioMeterNotches::get_minimum_size() const { } void EditorAudioMeterNotches::_bind_methods() { - ClassDB::bind_method("add_notch", &EditorAudioMeterNotches::add_notch); ClassDB::bind_method("_draw_audio_notches", &EditorAudioMeterNotches::_draw_audio_notches); } void EditorAudioMeterNotches::_notification(int p_what) { - switch (p_what) { case NOTIFICATION_THEME_CHANGED: { notch_color = EditorSettings::get_singleton()->is_dark_theme() ? Color(1, 1, 1) : Color(0, 0, 0); @@ -1459,7 +1396,6 @@ void EditorAudioMeterNotches::_notification(int p_what) { } void EditorAudioMeterNotches::_draw_audio_notches() { - Ref<Font> font = get_theme_font("font", "Label"); float font_height = font->get_height(); @@ -1480,11 +1416,6 @@ void EditorAudioMeterNotches::_draw_audio_notches() { } } -EditorAudioMeterNotches::EditorAudioMeterNotches() : - line_length(5.0f), - label_space(2.0f), - btm_padding(9.0f), - top_padding(5.0f) { - +EditorAudioMeterNotches::EditorAudioMeterNotches() { notch_color = EditorSettings::get_singleton()->is_dark_theme() ? Color(1, 1, 1) : Color(0, 0, 0); } |