projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove excessive printing during note dragging.
[ardour.git]
/
gtk2_ardour
/
plugin_ui.cc
diff --git
a/gtk2_ardour/plugin_ui.cc
b/gtk2_ardour/plugin_ui.cc
index 4619d50359755ee15855d479f32e668ffda3bc8d..935fc6000d6134de5f6fa43250a51a652e667142 100644
(file)
--- a/
gtk2_ardour/plugin_ui.cc
+++ b/
gtk2_ardour/plugin_ui.cc
@@
-15,7
+15,6
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <climits>
*/
#include <climits>
@@
-38,7
+37,7
@@
#include <midi++/manager.h>
#include <ardour/plugin.h>
#include <midi++/manager.h>
#include <ardour/plugin.h>
-#include <ardour/insert.h>
+#include <ardour/
plugin_
insert.h>
#include <ardour/ladspa_plugin.h>
#ifdef VST_SUPPORT
#include <ardour/vst_plugin.h>
#include <ardour/ladspa_plugin.h>
#ifdef VST_SUPPORT
#include <ardour/vst_plugin.h>
@@
-62,7
+61,7
@@
using namespace Gtkmm2ext;
using namespace Gtk;
using namespace sigc;
using namespace Gtk;
using namespace sigc;
-PluginUIWindow::PluginUIWindow (boost::shared_ptr<PluginInsert> insert, bool scrollable)
+PluginUIWindow::PluginUIWindow (boost::shared_ptr<PluginInsert> insert,
nframes64_t sr, nframes64_t period,
bool scrollable)
: ArdourDialog ("plugin ui")
{
if (insert->plugin()->has_editor()) {
: ArdourDialog ("plugin ui")
{
if (insert->plugin()->has_editor()) {
@@
-74,7
+73,7
@@
PluginUIWindow::PluginUIWindow (boost::shared_ptr<PluginInsert> insert, bool scr
if ((vp = boost::dynamic_pointer_cast<VSTPlugin> (insert->plugin())) != 0) {
if ((vp = boost::dynamic_pointer_cast<VSTPlugin> (insert->plugin())) != 0) {
- VSTPluginUI* vpu = new VSTPluginUI (insert, vp);
+ VSTPluginUI* vpu = new VSTPluginUI (insert, vp
, session.frame_rate(), session.engine().frames_per_cycle()
);
_pluginui = vpu;
get_vbox()->add (*vpu);
_pluginui = vpu;
get_vbox()->add (*vpu);
@@
-91,11
+90,13
@@
PluginUIWindow::PluginUIWindow (boost::shared_ptr<PluginInsert> insert, bool scr
} else {
} else {
- LadspaPluginUI* pu = new LadspaPluginUI (insert, scrollable);
+ LadspaPluginUI* pu = new LadspaPluginUI (insert, s
r, period, s
crollable);
_pluginui = pu;
get_vbox()->add (*pu);
_pluginui = pu;
get_vbox()->add (*pu);
+ set_wmclass (X_("ardour_plugin_editor"), "Ardour");
+
signal_map_event().connect (mem_fun (*pu, &LadspaPluginUI::start_updating));
signal_unmap_event().connect (mem_fun (*pu, &LadspaPluginUI::stop_updating));
}
signal_map_event().connect (mem_fun (*pu, &LadspaPluginUI::start_updating));
signal_unmap_event().connect (mem_fun (*pu, &LadspaPluginUI::stop_updating));
}
@@
-118,32
+119,38
@@
PluginUIWindow::PluginUIWindow (boost::shared_ptr<PluginInsert> insert, bool scr
PluginUIWindow::~PluginUIWindow ()
{
}
PluginUIWindow::~PluginUIWindow ()
{
}
+
bool
PluginUIWindow::on_key_press_event (GdkEventKey* event)
{
bool
PluginUIWindow::on_key_press_event (GdkEventKey* event)
{
- return PublicEditor::instance().on_key_press_event(event);
+ if (!key_press_focus_accelerator_handler (*this, event)) {
+ return PublicEditor::instance().on_key_press_event(event);
+ } else {
+ return true;
+ }
}
bool
PluginUIWindow::on_key_release_event (GdkEventKey* event)
{
}
bool
PluginUIWindow::on_key_release_event (GdkEventKey* event)
{
- return
PublicEditor::instance().on_key_release_event(event)
;
+ return
true
;
}
void
}
void
-PluginUIWindow::plugin_going_away (
ARDOUR::Redirect* ignored
)
+PluginUIWindow::plugin_going_away ()
{
{
- ENSURE_GUI_THREAD(
bind (mem_fun(*this, &PluginUIWindow::plugin_going_away), ignored
));
+ ENSURE_GUI_THREAD(
mem_fun(*this, &PluginUIWindow::plugin_going_away
));
_pluginui->stop_updating(0);
delete_when_idle (this);
}
_pluginui->stop_updating(0);
delete_when_idle (this);
}
-PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi)
+PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi
, nframes64_t sr, nframes64_t period
)
: insert (pi),
plugin (insert->plugin()),
save_button(_("Add")),
: insert (pi),
plugin (insert->plugin()),
save_button(_("Add")),
- bypass_button (_("Bypass"))
+ bypass_button (_("Bypass")),
+ latency_gui (*pi, sr, period)
{
//combo.set_use_arrows_always(true);
set_popdown_strings (combo, plugin->get_presets());
{
//combo.set_use_arrows_always(true);
set_popdown_strings (combo, plugin->get_presets());
@@
-202,6
+209,6
@@
PlugUIBase::bypass_toggled ()
bool x;
if ((x = bypass_button.get_active()) == insert->active()) {
bool x;
if ((x = bypass_button.get_active()) == insert->active()) {
- insert->set_active (!x
, this
);
+ insert->set_active (!x);
}
}
}
}