smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

Push most of LXVSTPlugin and WindowsVSTPlugin up to VSTPlugin parent.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10773 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-11-22 15:14:41 +00:00
parent 84f2049023
commit d1226a8628
9 changed files with 68 additions and 1574 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gtk2_ardour/windows_vst_plugin_ui.cc
View file

@ -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);
}