X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fplugin_ui.cc;h=ac5f7fd9a627b02e339f0fd7b048f6d0c2bd013e;hb=79d2a686ff74a334c6a682b73f38b27407e72d21;hp=2d73e62d9544692977a3e602883c977f89c9b409;hpb=013b31f1bb17dd54c41aafc879984d9d2b17633d;p=ardour.git diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index 2d73e62d95..ac5f7fd9a6 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -40,8 +40,6 @@ #include #include -#include "midi++/manager.h" - #include "ardour/session.h" #include "ardour/plugin.h" #include "ardour/plugin_insert.h" @@ -59,8 +57,6 @@ #include "lv2_plugin_ui.h" #endif -#include - #include "ardour_window.h" #include "ardour_ui.h" #include "prompter.h" @@ -82,21 +78,22 @@ using namespace Gtkmm2ext; using namespace Gtk; PluginUIWindow::PluginUIWindow ( - Gtk::Window* win, boost::shared_ptr insert, bool scrollable, bool editor) - : parent (win) + : ArdourWindow (string()) , was_visible (false) , _keyboard_focused (false) +#ifdef AUDIOUNIT_SUPPORT + , pre_deactivate_x (-1) + , pre_deactivate_y (-1) +#endif + { bool have_gui = false; - Label* label = manage (new Label()); label->set_markup ("THIS IS THE PLUGIN UI"); - std::cout << "SHOW UI " << insert->plugin()->unique_id() - << " editor: " << editor << std::endl; if (editor && insert->plugin()->has_editor()) { switch (insert->type()) { case ARDOUR::Windows_VST: @@ -121,7 +118,7 @@ PluginUIWindow::PluginUIWindow ( default: #ifndef WINDOWS_VST_SUPPORT - error << _("unknown type of editor-supplying plugin (note: no VST support in this version of ardour)") + error << string_compose (_("unknown type of editor-supplying plugin (note: no VST support in this version of %1)"), PROGRAM_NAME) << endmsg; #else error << _("unknown type of editor-supplying plugin") @@ -144,11 +141,9 @@ PluginUIWindow::PluginUIWindow ( signal_unmap_event().connect (sigc::mem_fun (*pu, &GenericPluginUI::stop_updating)); } - // set_position (Gtk::WIN_POS_MOUSE); set_name ("PluginEditor"); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), reinterpret_cast (this)), false); insert->DropReferences.connect (death_connection, invalidator (*this), boost::bind (&PluginUIWindow::plugin_going_away, this), gui_context()); gint h = _pluginui->get_preferred_height (); @@ -156,64 +151,20 @@ PluginUIWindow::PluginUIWindow ( if (scrollable) { if (h > 600) h = 600; - if (w > 600) w = 600; - - if (w < 0) { - w = 450; - } } set_default_size (w, h); + set_resizable (_pluginui->resizable()); } PluginUIWindow::~PluginUIWindow () { +#ifndef NDEBUG + cerr << "PluginWindow deleted for " << this << endl; +#endif delete _pluginui; } -void -PluginUIWindow::set_parent (Gtk::Window* win) -{ - parent = win; -} - -void -PluginUIWindow::on_map () -{ - Window::on_map (); - set_keep_above (true); -} - -bool -PluginUIWindow::on_enter_notify_event (GdkEventCrossing *ev) -{ - Keyboard::the_keyboard().enter_window (ev, this); - return false; -} - -bool -PluginUIWindow::on_leave_notify_event (GdkEventCrossing *ev) -{ - Keyboard::the_keyboard().leave_window (ev, this); - return false; -} - -bool -PluginUIWindow::on_focus_in_event (GdkEventFocus *ev) -{ - Window::on_focus_in_event (ev); - //Keyboard::the_keyboard().magic_widget_grab_focus (); - return false; -} - -bool -PluginUIWindow::on_focus_out_event (GdkEventFocus *ev) -{ - Window::on_focus_out_event (ev); - //Keyboard::the_keyboard().magic_widget_drop_focus (); - return false; -} - void PluginUIWindow::on_show () { @@ -225,19 +176,25 @@ PluginUIWindow::on_show () } if (_pluginui) { +#if defined (HAVE_AUDIOUNITS) && defined(GTKOSX) + if (pre_deactivate_x >= 0) { + move (pre_deactivate_x, pre_deactivate_y); + } +#endif + if (_pluginui->on_window_show (_title)) { Window::on_show (); } } - - if (parent) { - // set_transient_for (*parent); - } } void PluginUIWindow::on_hide () { +#if defined (HAVE_AUDIOUNITS) && defined(GTKOSX) + get_position (pre_deactivate_x, pre_deactivate_y); +#endif + Window::on_hide (); if (_pluginui) { @@ -266,8 +223,8 @@ PluginUIWindow::create_windows_vst_editor(boost::shared_ptr) boost::shared_ptr vp; if ((vp = boost::dynamic_pointer_cast (insert->plugin())) == 0) { - error << _("unknown type of editor-supplying plugin (note: no VST support in this version of ardour)") - << endmsg; + error << string_compose (_("unknown type of editor-supplying plugin (note: no VST support in this version of %1)"), PROGRAM_NAME) + << endmsg; throw failed_constructor (); } else { WindowsVSTPluginUI* vpu = new WindowsVSTPluginUI (insert, vp); @@ -296,8 +253,8 @@ PluginUIWindow::create_lxvst_editor(boost::shared_ptr) boost::shared_ptr lxvp; if ((lxvp = boost::dynamic_pointer_cast (insert->plugin())) == 0) { - error << _("unknown type of editor-supplying plugin (note: no linuxVST support in this version of ardour)") - << endmsg; + error << string_compose (_("unknown type of editor-supplying plugin (note: no linuxVST support in this version of %1)"), PROGRAM_NAME) + << endmsg; throw failed_constructor (); } else { LXVSTPluginUI* lxvpu = new LXVSTPluginUI (insert, lxvp); @@ -313,13 +270,13 @@ PluginUIWindow::create_lxvst_editor(boost::shared_ptr) } bool -#ifdef GTKOSX +#ifdef AUDIOUNIT_SUPPORT PluginUIWindow::create_audiounit_editor (boost::shared_ptr insert) #else PluginUIWindow::create_audiounit_editor (boost::shared_ptr) #endif { -#ifndef GTKOSX +#ifndef AUDIOUNIT_SUPPORT return false; #else VBox* box; @@ -340,16 +297,20 @@ PluginUIWindow::app_activated (bool yn) PluginUIWindow::app_activated (bool) #endif { -#ifdef GTKOSX +#ifdef AUDIOUNIT_SUPPORT if (_pluginui) { if (yn) { if (was_visible) { _pluginui->activate (); + if (pre_deactivate_x >= 0) { + move (pre_deactivate_x, pre_deactivate_y); + } present (); was_visible = true; } } else { was_visible = is_visible(); + get_position (pre_deactivate_x, pre_deactivate_y); hide (); _pluginui->deactivate (); } @@ -445,8 +406,6 @@ PluginUIWindow::plugin_going_away () } death_connection.disconnect (); - - delete_when_idle (this); } PlugUIBase::PlugUIBase (boost::shared_ptr pi) @@ -456,9 +415,10 @@ PlugUIBase::PlugUIBase (boost::shared_ptr pi) , save_button (_("Save")) , delete_button (_("Delete")) , bypass_button (ArdourButton::led_default_elements) + , description_expander (_("Description")) + , plugin_analysis_expander (_("Plugin analysis")) , latency_gui (0) , latency_dialog (0) - , plugin_analysis_expander (_("Plugin analysis")) , eqgui (0) { _preset_modified.set_size_request (16, -1); @@ -486,13 +446,7 @@ PlugUIBase::PlugUIBase (boost::shared_ptr pi) bypass_button.set_name ("plugin bypass button"); bypass_button.set_text (_("Bypass")); - - if (!pi->active()) { - bypass_button.set_active_state (Gtkmm2ext::Active); - } else { - bypass_button.unset_active_state (); - } - + bypass_button.set_active (!pi->active()); bypass_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PlugUIBase::bypass_button_release)); focus_button.add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK); @@ -509,6 +463,9 @@ PlugUIBase::PlugUIBase (boost::shared_ptr pi) 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")); + description_expander.property_expanded().signal_changed().connect( sigc::mem_fun(*this, &PlugUIBase::toggle_description)); + description_expander.set_expanded(false); + plugin_analysis_expander.property_expanded().signal_changed().connect( sigc::mem_fun(*this, &PlugUIBase::toggle_plugin_analysis)); plugin_analysis_expander.set_expanded(false); @@ -532,7 +489,6 @@ PlugUIBase::plugin_going_away () /* drop references to the plugin/insert */ insert.reset (); plugin.reset (); - death_connection.disconnect (); } void @@ -544,7 +500,7 @@ PlugUIBase::set_latency_label () string t; if (l < sr / 1000) { - t = string_compose (_("latency (%1 samples)"), l); + t = string_compose (P_("latency (%1 sample)", "latency (%1 samples)", l), l); } else { t = string_compose (_("latency (%1 ms)"), (float) l / ((float) sr / 1000.0f)); } @@ -558,6 +514,14 @@ PlugUIBase::latency_button_clicked () if (!latency_gui) { latency_gui = new LatencyGUI (*(insert.get()), insert->session().frame_rate(), insert->session().get_block_size()); latency_dialog = new ArdourWindow (_("Edit Latency")); + /* use both keep-above and transient for to try cover as many + different WM's as possible. + */ + latency_dialog->set_keep_above (true); + Window* win = dynamic_cast (bypass_button.get_toplevel ()); + if (win) { + latency_dialog->set_transient_for (*win); + } latency_dialog->add (*latency_gui); latency_dialog->signal_hide().connect (sigc::mem_fun (*this, &PlugUIBase::set_latency_label)); } @@ -572,11 +536,7 @@ PlugUIBase::processor_active_changed (boost::weak_ptr weak_p) boost::shared_ptr p (weak_p.lock()); if (p) { - if (!p->active()) { - bypass_button.set_active_state (Gtkmm2ext::Active); - } else { - bypass_button.unset_active_state (); - } + bypass_button.set_active (!p->active()); } } @@ -595,12 +555,20 @@ PlugUIBase::preset_selected () warning << string_compose(_("Plugin preset %1 not found"), _preset_combo.get_active_text()) << endmsg; } + } else { + // blank selected = no preset + plugin->clear_preset(); } } +#ifdef NO_PLUGIN_STATE +static bool seen_saving_message = false; +#endif + void PlugUIBase::add_plugin_setting () { +#ifndef NO_PLUGIN_STATE NewPluginPresetDialog d (plugin); switch (d.run ()) { @@ -619,23 +587,49 @@ PlugUIBase::add_plugin_setting () } break; } +#else + if (!seen_saving_message) { + info << string_compose (_("Plugin presets are not supported in this build of %1. Consider paying for a full version"), + PROGRAM_NAME) + << endmsg; + seen_saving_message = true; + } +#endif } void PlugUIBase::save_plugin_setting () { +#ifndef NO_PLUGIN_STATE string const name = _preset_combo.get_active_text (); plugin->remove_preset (name); Plugin::PresetRecord const r = plugin->save_preset (name); if (!r.uri.empty ()) { plugin->load_preset (r); } +#else + if (!seen_saving_message) { + info << string_compose (_("Plugin presets are not supported in this build of %1. Consider paying for a newer version"), + PROGRAM_NAME) + << endmsg; + seen_saving_message = true; + } +#endif } void PlugUIBase::delete_plugin_setting () { +#ifndef NO_PLUGIN_STATE plugin->remove_preset (_preset_combo.get_active_text ()); +#else + if (!seen_saving_message) { + info << string_compose (_("Plugin presets are not supported in this build of %1. Consider paying for a newer version"), + PROGRAM_NAME) + << endmsg; + seen_saving_message = true; + } +#endif } bool @@ -676,11 +670,34 @@ PlugUIBase::focus_toggled (GdkEventButton*) return true; } +void +PlugUIBase::toggle_description() +{ + if (description_expander.get_expanded() && + !description_expander.get_child()) { + const std::string text = plugin->get_docs(); + if (text.empty()) { + return; + } + + Gtk::Label* label = manage(new Gtk::Label(text)); + label->set_line_wrap(true); + label->set_line_wrap_mode(Pango::WRAP_WORD); + description_expander.add(*label); + description_expander.show_all(); + } + + if (!description_expander.get_expanded()) { + description_expander.remove(); + } +} + + void PlugUIBase::toggle_plugin_analysis() { if (plugin_analysis_expander.get_expanded() && - !plugin_analysis_expander.get_child()) { + !plugin_analysis_expander.get_child()) { // Create the GUI if (eqgui == 0) { eqgui = new PluginEqGui (insert); @@ -698,7 +715,6 @@ PlugUIBase::toggle_plugin_analysis() } if (!plugin_analysis_expander.get_expanded()) { - // Hide & remove from expander eqgui->hide (); @@ -725,6 +741,8 @@ PlugUIBase::update_preset_list () preset_labels.push_back (i->label); } + preset_labels.push_back(""); + set_popdown_strings (_preset_combo, preset_labels); --_no_load_preset; @@ -748,6 +766,7 @@ PlugUIBase::update_preset () void PlugUIBase::update_preset_modified () { + if (plugin->last_preset().uri.empty()) { _preset_modified.set_text (""); return; @@ -772,3 +791,4 @@ PlugUIBase::preset_added_or_removed () update_preset_list (); update_preset (); } +