X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplugin_ui.cc;h=9f11f410f939fa129fe0d482bba9f828d31511fc;hb=38a874ecb8911629e4839be0cfd29cc6094e4cd4;hp=9357fc7136ce5bb919fcce785e3ceb72b5afd3ba;hpb=ffe5a6c5c2c46df6cc8723219529970ff17d84a9;p=ardour.git diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index 9357fc7136..9f11f410f9 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" @@ -77,26 +73,28 @@ using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; 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 +119,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 +142,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 (); @@ -164,52 +160,12 @@ PluginUIWindow::PluginUIWindow ( 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 () { @@ -221,19 +177,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) { @@ -262,11 +224,11 @@ 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); + WindowsVSTPluginUI* vpu = new WindowsVSTPluginUI (insert, vp, GTK_WIDGET(this->gobj())); _pluginui = vpu; _pluginui->KeyboardFocused.connect (sigc::mem_fun (*this, &PluginUIWindow::keyboard_focused)); @@ -292,8 +254,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); @@ -341,11 +303,15 @@ PluginUIWindow::app_activated (bool) 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 (); } @@ -441,8 +407,6 @@ PluginUIWindow::plugin_going_away () } death_connection.disconnect (); - - delete_when_idle (this); } PlugUIBase::PlugUIBase (boost::shared_ptr pi) @@ -484,7 +448,7 @@ PlugUIBase::PlugUIBase (boost::shared_ptr pi) bypass_button.set_name ("plugin bypass button"); bypass_button.set_text (_("Bypass")); bypass_button.set_active (!pi->active()); - bypass_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PlugUIBase::bypass_button_release)); + 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); focus_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PlugUIBase::focus_toggled)); @@ -526,7 +490,6 @@ PlugUIBase::plugin_going_away () /* drop references to the plugin/insert */ insert.reset (); plugin.reset (); - death_connection.disconnect (); } void @@ -538,7 +501,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)); } @@ -552,6 +515,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)); } @@ -585,12 +556,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 ()) { @@ -609,23 +588,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 @@ -737,6 +742,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; @@ -760,6 +767,7 @@ PlugUIBase::update_preset () void PlugUIBase::update_preset_modified () { + if (plugin->last_preset().uri.empty()) { _preset_modified.set_text (""); return; @@ -784,3 +792,4 @@ PlugUIBase::preset_added_or_removed () update_preset_list (); update_preset (); } +