diff options
Diffstat (limited to 'gtk2_ardour')
| -rwxr-xr-x | gtk2_ardour/lxvst_pluginui.cc | 36 | ||||
| -rw-r--r-- | gtk2_ardour/windows_vst_plugin_ui.cc | 14 |
2 files changed, 25 insertions, 25 deletions
diff --git a/gtk2_ardour/lxvst_pluginui.cc b/gtk2_ardour/lxvst_pluginui.cc index b8f751ff08..9c79503a1d 100755 --- a/gtk2_ardour/lxvst_pluginui.cc +++ b/gtk2_ardour/lxvst_pluginui.cc @@ -45,10 +45,10 @@ LXVSTPluginUI::LXVSTPluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ { create_preset_store (); - vstfx_run_editor (lxvst->vstfx()); + vstfx_run_editor (lxvst->state ()); - if (lxvst->vstfx()->current_program != -1) { - lxvst_preset_combo.set_active (lxvst->vstfx()->current_program); + if (lxvst->state()->current_program != -1) { + lxvst_preset_combo.set_active (lxvst->state()->current_program); } else { lxvst_preset_combo.set_active (0); } @@ -104,17 +104,17 @@ LXVSTPluginUI::resize_callback() /*We could maybe use this to resize the plugin GTK parent window if required*/ - if(lxvst->vstfx()->want_resize) - { - int new_height = lxvst->vstfx()->height; - int new_width = lxvst->vstfx()->width; + if (lxvst->state()->want_resize) { + int new_height = lxvst->state()->height; + int new_width = lxvst->state()->width; - void* gtk_parent_window = lxvst->vstfx()->extra_data; + void* gtk_parent_window = lxvst->state()->extra_data; - if(gtk_parent_window) + if (gtk_parent_window) { ((Gtk::Window*)gtk_parent_window)->resize(new_width, new_height + LXVST_H_FIDDLE); + } - lxvst->vstfx()->want_resize = 0; + lxvst->state()->want_resize = 0; } } @@ -130,7 +130,7 @@ LXVSTPluginUI::preset_chosen () { // we can't dispatch directly here, too many plugins only expects one GUI thread. - lxvst->vstfx()->want_program = lxvst_preset_combo.get_active_row_number (); + lxvst->state()->want_program = lxvst_preset_combo.get_active_row_number (); socket.grab_focus (); } @@ -144,13 +144,13 @@ LXVSTPluginUI::get_preferred_height () and we can't realise it until we have told it how big we would like it to be which we can't do until it is realised etc*/ - return (lxvst->vstfx()->height) + LXVST_H_FIDDLE; //May not be 40 for all screen res etc + return (lxvst->state()->height) + LXVST_H_FIDDLE; //May not be 40 for all screen res etc } int LXVSTPluginUI::get_preferred_width () { - return lxvst->vstfx()->width; + return lxvst->state()->width; } int @@ -167,12 +167,12 @@ LXVSTPluginUI::package (Gtk::Window& win) /* this assumes that the window's owner understands the XEmbed protocol. */ - socket.add_id (vstfx_get_XID (lxvst->vstfx())); + socket.add_id (vstfx_get_XID (lxvst->state ())); - vstfx_move_window_into_view (lxvst->vstfx()); + vstfx_move_window_into_view (lxvst->state ()); - lxvst->vstfx()->extra_data = (void*)(&win); - lxvst->vstfx()->want_resize = 0; + lxvst->state()->extra_data = (void*)(&win); + lxvst->state()->want_resize = 0; return 0; } @@ -226,7 +226,7 @@ LXVSTPluginUI::forward_key_event (GdkEventKey* ev) void LXVSTPluginUI::create_preset_store () { - VSTState* vstfx = lxvst->vstfx(); + VSTState* vstfx = lxvst->state (); int vst_version = vstfx->plugin->dispatcher (vstfx->plugin, effGetVstVersion, 0, 0, NULL, 0.0f); diff --git a/gtk2_ardour/windows_vst_plugin_ui.cc b/gtk2_ardour/windows_vst_plugin_ui.cc index 1a966109ae..3c80951ff0 100644 --- a/gtk2_ardour/windows_vst_plugin_ui.cc +++ b/gtk2_ardour/windows_vst_plugin_ui.cc @@ -35,7 +35,7 @@ WindowsVSTPluginUI::WindowsVSTPluginUI (boost::shared_ptr<PluginInsert> pi, boos : PlugUIBase (pi), vst (vp) { - fst_run_editor (vst->fst()); + fst_run_editor (vst->state()); preset_box.set_spacing (6); preset_box.set_border_width (6); @@ -69,13 +69,13 @@ WindowsVSTPluginUI::preset_selected () int WindowsVSTPluginUI::get_preferred_height () { - return vst->fst()->height; + return vst->state()->height; } int WindowsVSTPluginUI::get_preferred_width () { - return vst->fst()->width; + return vst->state()->width; } int @@ -89,9 +89,9 @@ WindowsVSTPluginUI::package (Gtk::Window& win) this assumes that the window's owner understands the XEmbed protocol. */ - socket.add_id (fst_get_XID (vst->fst())); + socket.add_id (fst_get_XID (vst->state ())); - fst_move_window_into_view (vst->fst()); + fst_move_window_into_view (vst->state ()); return 0; } @@ -140,7 +140,7 @@ WindowsVSTPluginUI::forward_key_event (GdkEventKey* ev) { if (ev->type == GDK_KEY_PRESS) { - VSTState* fst = vst->fst (); + VSTState* fst = vst->state (); pthread_mutex_lock (&fst->lock); if (fst->n_pending_keys == (sizeof (fst->pending_keys) * sizeof (VSTKey))) { @@ -204,6 +204,6 @@ windows_vst_gui_init (int *argc, char **argv[]) wine_error_handler = XSetErrorHandler (NULL); gtk_init (argc, argv); the_gtk_display = gdk_x11_display_get_xdisplay (gdk_display_get_default()); - gtk_error_handler = XSetErrorHandler( fst_xerror_handler ); + gtk_error_handler = XSetErrorHandler (fst_xerror_handler); } |