make Item::set_position() do nothing if the position doesn't change

[ardour.git] / gtk2_ardour / plugin_ui.cc

diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index 5b281f33ab9bde78c1690ea4a503391888822620..ac5f7fd9a627b02e339f0fd7b048f6d0c2bd013e 100644 (file)
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -40,8 +40,6 @@
 #include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/application.h>
 
-#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 <lrdf.h>
-
 #include "ardour_window.h"
 #include "ardour_ui.h"
 #include "prompter.h"
@@ -82,11 +78,10 @@ using namespace Gtkmm2ext;
 using namespace Gtk;
 
 PluginUIWindow::PluginUIWindow (
-       Gtk::Window*                    win,
        boost::shared_ptr<PluginInsert> insert,
        bool                            scrollable,
        bool                            editor)
-       : parent (win)
+       : ArdourWindow (string())
        , was_visible (false)
        , _keyboard_focused (false)
 #ifdef AUDIOUNIT_SUPPORT
@@ -96,7 +91,6 @@ PluginUIWindow::PluginUIWindow (
 
 {
        bool have_gui = false;
-
        Label* label = manage (new Label());
        label->set_markup ("<b>THIS IS THE PLUGIN UI</b>");
 
@@ -147,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<Window*> (this)), false);
        insert->DropReferences.connect (death_connection, invalidator (*this), boost::bind (&PluginUIWindow::plugin_going_away, this), gui_context());
 
        gint h = _pluginui->get_preferred_height ();
@@ -167,54 +159,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 ();
-#ifdef __APPLE__
-       set_keep_above (true);
-#endif // __APPLE__
-}
-
-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 ()
 {
@@ -236,10 +186,6 @@ PluginUIWindow::on_show ()
                        Window::on_show ();
                }
        }
-
-       if (parent) {
-               // set_transient_for (*parent);
-       }
 }
 
 void
@@ -460,8 +406,6 @@ PluginUIWindow::plugin_going_away ()
        }
 
        death_connection.disconnect ();
-
-       delete_when_idle (this);
 }
 
 PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi)
@@ -570,7 +514,6 @@ 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"));
-               latency_dialog->set_position (WIN_POS_MOUSE);
                /* use both keep-above and transient for to try cover as many
                   different WM's as possible.
                */
@@ -618,9 +561,14 @@ PlugUIBase::preset_selected ()
        }
 }
 
+#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 ()) {
@@ -639,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