X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplugin_ui.cc;h=1f70537a41dc4cc402c09a7e47faba3dc1e593b4;hb=1a7fd81f4095e3ee8cb42e63c232a51529412846;hp=f9208369f13a791cae71ca45ba1721f209854bf1;hpb=60589268e8b92c299cfe4d6e8bf5019907b34914;p=ardour.git diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index f9208369f1..1f70537a41 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -68,8 +68,9 @@ #include "latency_gui.h" #include "plugin_eq_gui.h" #include "new_plugin_preset_dialog.h" +#include "tooltips.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -100,7 +101,7 @@ PluginUIWindow::PluginUIWindow ( case ARDOUR::Windows_VST: have_gui = create_windows_vst_editor (insert); break; - + case ARDOUR::LXVST: have_gui = create_lxvst_editor (insert); break; @@ -177,10 +178,10 @@ PluginUIWindow::on_show () } if (_pluginui) { -#if defined (HAVE_AUDIOUNITS) && defined(GTKOSX) - if (pre_deactivate_x >= 0) { +#if defined (HAVE_AUDIOUNITS) && defined(__APPLE__) + if (pre_deactivate_x >= 0) { move (pre_deactivate_x, pre_deactivate_y); - } + } #endif if (_pluginui->on_window_show (_title)) { @@ -192,8 +193,8 @@ PluginUIWindow::on_show () void PluginUIWindow::on_hide () { -#if defined (HAVE_AUDIOUNITS) && defined(GTKOSX) - get_position (pre_deactivate_x, pre_deactivate_y); +#if defined (HAVE_AUDIOUNITS) && defined(__APPLE__) + get_position (pre_deactivate_x, pre_deactivate_y); #endif Window::on_hide (); @@ -292,7 +293,7 @@ PluginUIWindow::create_audiounit_editor (boost::shared_ptr) } void -#ifdef GTKOSX +#ifdef __APPLE__ PluginUIWindow::app_activated (bool yn) #else PluginUIWindow::app_activated (bool) @@ -361,27 +362,26 @@ PluginUIWindow::on_key_press_event (GdkEventKey* event) } } return true; - } else { - /* for us to be getting key press events, there really - MUST be a _pluginui, but just to be safe, check ... - */ + } + /* for us to be getting key press events, there really + MUST be a _pluginui, but just to be safe, check ... + */ - if (_pluginui) { - _pluginui->grab_focus(); - if (_pluginui->non_gtk_gui()) { - /* pass editor window as the window for the event - to be handled in, not this one, because there are - no widgets in this window that we want to have - key focus. - */ - return relay_key_press (event, &PublicEditor::instance()); - } else { - return relay_key_press (event, this); - } + if (_pluginui) { + _pluginui->grab_focus(); + if (_pluginui->non_gtk_gui()) { + /* pass main window as the window for the event + to be handled in, not this one, because there are + no widgets in this window that we want to have + key focus. + */ + return relay_key_press (event, &ARDOUR_UI::instance()->main_window()); } else { - return false; + return relay_key_press (event, this); } } + + return false; } bool @@ -418,6 +418,7 @@ PlugUIBase::PlugUIBase (boost::shared_ptr pi) , add_button (_("Add")) , save_button (_("Save")) , delete_button (_("Delete")) + , reset_button (_("Reset")) , bypass_button (ArdourButton::led_default_elements) , description_expander (_("Description")) , plugin_analysis_expander (_("Plugin analysis")) @@ -427,11 +428,12 @@ PlugUIBase::PlugUIBase (boost::shared_ptr pi) { _preset_modified.set_size_request (16, -1); _preset_combo.set_text("(default)"); - ARDOUR_UI::instance()->set_tip (_preset_combo, _("Presets (if any) for this plugin\n(Both factory and user-created)")); - ARDOUR_UI::instance()->set_tip (add_button, _("Save a new preset")); - ARDOUR_UI::instance()->set_tip (save_button, _("Save the current preset")); - ARDOUR_UI::instance()->set_tip (delete_button, _("Delete the current preset")); - ARDOUR_UI::instance()->set_tip (bypass_button, _("Disable signal processing by the plugin")); + set_tooltip (_preset_combo, _("Presets (if any) for this plugin\n(Both factory and user-created)")); + set_tooltip (add_button, _("Save a new preset")); + set_tooltip (save_button, _("Save the current preset")); + set_tooltip (delete_button, _("Delete the current preset")); + set_tooltip (reset_button, _("Reset parameters to default (if no parameters are in automation play mode)")); + set_tooltip (bypass_button, _("Disable signal processing by the plugin")); _no_load_preset = 0; update_preset_list (); @@ -446,11 +448,15 @@ PlugUIBase::PlugUIBase (boost::shared_ptr pi) delete_button.set_name ("generic button"); delete_button.signal_clicked.connect (sigc::mem_fun (*this, &PlugUIBase::delete_plugin_setting)); + reset_button.set_name ("generic button"); + reset_button.signal_clicked.connect (sigc::mem_fun (*this, &PlugUIBase::reset_plugin_parameters)); + + insert->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&PlugUIBase::processor_active_changed, this, boost::weak_ptr(insert)), gui_context()); bypass_button.set_name ("plugin bypass button"); bypass_button.set_text (_("Bypass")); - bypass_button.set_active (!pi->active()); + bypass_button.set_active (!pi->enabled ()); bypass_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PlugUIBase::bypass_button_release), false); focus_button.add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK); @@ -464,8 +470,8 @@ PlugUIBase::PlugUIBase (boost::shared_ptr pi) focus_button.add (*focus_out_image); - ARDOUR_UI::instance()->set_tip (focus_button, string_compose (_("Click to allow the plugin to receive keyboard events that %1 would normally use as a shortcut"), PROGRAM_NAME)); - ARDOUR_UI::instance()->set_tip (bypass_button, _("Click to enable/disable this plugin")); + set_tooltip (focus_button, string_compose (_("Click to allow the plugin to receive keyboard events that %1 would normally use as a shortcut"), PROGRAM_NAME)); + set_tooltip (bypass_button, _("Click to enable/disable this plugin")); description_expander.property_expanded().signal_changed().connect( sigc::mem_fun(*this, &PlugUIBase::toggle_description)); description_expander.set_expanded(false); @@ -478,7 +484,11 @@ PlugUIBase::PlugUIBase (boost::shared_ptr pi) plugin->PresetAdded.connect (*this, invalidator (*this), boost::bind (&PlugUIBase::preset_added_or_removed, this), gui_context ()); plugin->PresetRemoved.connect (*this, invalidator (*this), boost::bind (&PlugUIBase::preset_added_or_removed, this), gui_context ()); plugin->PresetLoaded.connect (*this, invalidator (*this), boost::bind (&PlugUIBase::update_preset, this), gui_context ()); - plugin->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&PlugUIBase::parameter_changed, this, _1, _2), gui_context ()); + plugin->PresetDirty.connect (*this, invalidator (*this), boost::bind (&PlugUIBase::update_preset_modified, this), gui_context ()); + + insert->AutomationStateChanged.connect (*this, invalidator (*this), boost::bind (&PlugUIBase::automation_state_changed, this), gui_context()); + + automation_state_changed(); } PlugUIBase::~PlugUIBase() @@ -540,7 +550,7 @@ PlugUIBase::processor_active_changed (boost::weak_ptr weak_p) boost::shared_ptr p (weak_p.lock()); if (p) { - bypass_button.set_active (!p->active()); + bypass_button.set_active (!p->enabled ()); } } @@ -551,7 +561,7 @@ PlugUIBase::preset_selected (Plugin::PresetRecord preset) return; } if (!preset.label.empty()) { - plugin->load_preset (preset); + insert->load_preset (preset); } else { // blank selected = no preset plugin->clear_preset(); @@ -579,7 +589,7 @@ void PlugUIBase::add_plugin_setting () { #ifndef NO_PLUGIN_STATE - NewPluginPresetDialog d (plugin); + NewPluginPresetDialog d (plugin, _("New Preset")); switch (d.run ()) { case Gtk::RESPONSE_ACCEPT: @@ -597,7 +607,7 @@ PlugUIBase::add_plugin_setting () } break; } -#else +#else if (!seen_saving_message) { seen_saving_message = true; show_no_plugin_message(); @@ -615,7 +625,7 @@ PlugUIBase::save_plugin_setting () if (!r.uri.empty ()) { plugin->load_preset (r); } -#else +#else if (!seen_saving_message) { seen_saving_message = true; show_no_plugin_message(); @@ -636,17 +646,25 @@ PlugUIBase::delete_plugin_setting () #endif } +void +PlugUIBase::automation_state_changed () +{ + reset_button.set_sensitive (insert->can_reset_all_parameters()); +} + +void +PlugUIBase::reset_plugin_parameters () +{ + insert->reset_parameters_to_default (); +} + bool PlugUIBase::bypass_button_release (GdkEventButton*) { bool view_says_bypassed = (bypass_button.active_state() != 0); - - if (view_says_bypassed != insert->active()) { - if (view_says_bypassed) { - insert->activate (); - } else { - insert->deactivate (); - } + + if (view_says_bypassed != insert->enabled ()) { + insert->enable (view_says_bypassed); } return false; @@ -660,14 +678,14 @@ PlugUIBase::focus_toggled (GdkEventButton*) focus_button.remove (); focus_button.add (*focus_out_image); focus_out_image->show (); - ARDOUR_UI::instance()->set_tip (focus_button, string_compose (_("Click to allow the plugin to receive keyboard events that %1 would normally use as a shortcut"), PROGRAM_NAME)); + set_tooltip (focus_button, string_compose (_("Click to allow the plugin to receive keyboard events that %1 would normally use as a shortcut"), PROGRAM_NAME)); KeyboardFocused (false); } else { Keyboard::the_keyboard().magic_widget_grab_focus(); focus_button.remove (); focus_button.add (*focus_in_image); focus_in_image->show (); - ARDOUR_UI::instance()->set_tip (focus_button, string_compose (_("Click to allow normal use of %1 keyboard shortcuts"), PROGRAM_NAME)); + set_tooltip (focus_button, string_compose (_("Click to allow normal use of %1 keyboard shortcuts"), PROGRAM_NAME)); KeyboardFocused (true); } @@ -690,9 +708,21 @@ PlugUIBase::toggle_description() description_expander.add(*label); description_expander.show_all(); } - + if (!description_expander.get_expanded()) { + const int child_height = description_expander.get_child ()->get_height (); + description_expander.remove(); + + Gtk::Window *toplevel = (Gtk::Window*) description_expander.get_ancestor (GTK_TYPE_WINDOW); + + if (toplevel) { + Gtk::Requisition wr; + toplevel->get_size (wr.width, wr.height); + wr.height -= child_height; + toplevel->resize (wr.width, wr.height); + } + } } @@ -707,12 +737,6 @@ PlugUIBase::toggle_plugin_analysis() eqgui = new PluginEqGui (insert); } - Gtk::Window *toplevel = (Gtk::Window*) plugin_analysis_expander.get_ancestor (GTK_TYPE_WINDOW); - - if (toplevel) { - toplevel->get_size (pre_eq_size.width, pre_eq_size.height); - } - plugin_analysis_expander.add (*eqgui); plugin_analysis_expander.show_all (); eqgui->start_listening (); @@ -720,6 +744,7 @@ PlugUIBase::toggle_plugin_analysis() if (!plugin_analysis_expander.get_expanded()) { // Hide & remove from expander + const int child_height = plugin_analysis_expander.get_child ()->get_height (); eqgui->hide (); eqgui->stop_listening (); @@ -728,7 +753,10 @@ PlugUIBase::toggle_plugin_analysis() Gtk::Window *toplevel = (Gtk::Window*) plugin_analysis_expander.get_ancestor (GTK_TYPE_WINDOW); if (toplevel) { - toplevel->resize (pre_eq_size.width, pre_eq_size.height); + Gtk::Requisition wr; + toplevel->get_size (wr.width, wr.height); + wr.height -= child_height; + toplevel->resize (wr.width, wr.height); } } } @@ -791,12 +819,6 @@ PlugUIBase::update_preset_modified () } } -void -PlugUIBase::parameter_changed (uint32_t, float) -{ - update_preset_modified (); -} - void PlugUIBase::preset_added_or_removed () {