diff options
| author | Robin Gareus <robin@gareus.org> | 2015-12-30 13:51:09 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-12-30 13:51:09 +0100 |
| commit | 63c455a5577bd551138f9c855c0a81bb4b4a41ef (patch) | |
| tree | 59d938c7172c2c8778249fd2eb5a1832212d29e7 /gtk2_ardour/linux_vst_gui_support.cc | |
| parent | bcaae13e3e7c764d8e3184d151f348676056ba17 (diff) | |
small VST code cleanup: mostly NO-OP. thread attributes and static vars
Diffstat (limited to 'gtk2_ardour/linux_vst_gui_support.cc')
| -rw-r--r-- | gtk2_ardour/linux_vst_gui_support.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gtk2_ardour/linux_vst_gui_support.cc b/gtk2_ardour/linux_vst_gui_support.cc index e5722b2be0..37f046ec28 100644 --- a/gtk2_ardour/linux_vst_gui_support.cc +++ b/gtk2_ardour/linux_vst_gui_support.cc @@ -56,20 +56,19 @@ static VSTState * vstfx_first = NULL; const char magic[] = "VSTFX Plugin State v002"; -int gui_thread_id = 0; static int gui_quit = 0; /*This will be our connection to X*/ -Display* LXVST_XDisplay = NULL; +static Display* LXVST_XDisplay = NULL; /*The thread handle for the GUI event loop*/ -pthread_t LXVST_gui_event_thread; +static pthread_t LXVST_gui_event_thread; /*Util functions to get the value of a property attached to an XWindow*/ -bool LXVST_xerror; +static bool LXVST_xerror; int TempErrorHandler(Display *display, XErrorEvent *e) { @@ -525,7 +524,7 @@ int vstfx_init (void* ptr) /*Create the thread - use default attrs for now, don't think we need anything special*/ - thread_create_result = pthread_create(&LXVST_gui_event_thread, NULL, gui_event_loop, NULL); + thread_create_result = pthread_create(&LXVST_gui_event_thread, &thread_attributes, gui_event_loop, NULL); if(thread_create_result!=0) { @@ -534,6 +533,7 @@ int vstfx_init (void* ptr) vstfx_error ("** ERROR ** VSTFX: Failed starting GUI event thread"); XCloseDisplay(LXVST_XDisplay); + gui_quit = 1; return -1; } @@ -545,6 +545,9 @@ int vstfx_init (void* ptr) void vstfx_exit() { + if (gui_quit) { + return; + } gui_quit = 1; /*We need to pthread_join the gui_thread here so |