ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

clean up 6cc2812f2e (interim vst fixes)

Browse Source
This commit is contained in:
Robin Gareus 2014-04-14 15:10:28 +02:00
parent 56b9398208
commit 15c5d12321
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/ardour_ui.cc
View File

@ -1013,9 +1013,7 @@ If you still wish to quit, please use the\n\n\
halt_connection.disconnect ();
AudioEngine::instance()->stop ();
#ifdef WINDOWS_VST_SUPPORT
#ifndef PLATFORM_WINDOWS
fst_stop_threading();
#endif
#endif
quit ();
}
@ -2926,17 +2924,13 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
}
#ifdef WINDOWS_VST_SUPPORT
#ifndef PLATFORM_WINDOWS
fst_stop_threading();
#endif
#endif
flush_pending ();
#ifdef WINDOWS_VST_SUPPORT
#ifndef PLATFORM_WINDOWS
fst_start_threading();
#endif
#endif
retval = 0;

8
libs/fst/vstwin.c
View File

@ -320,20 +320,20 @@ fst_init (void* possible_hmodule)
return 0;
}
#ifndef PLATFORM_WINDOWS /* linux + wine */
void
fst_start_threading(void)
{
#ifndef PLATFORM_WINDOWS /* linux + wine */
if (idle_id == 0) {
gui_quit = 0;
idle_id = g_idle_add (g_idle_call, NULL);
}
}
#endif
}
#ifndef PLATFORM_WINDOWS /* linux + wine */
void
fst_stop_threading(void) {
#ifndef PLATFORM_WINDOWS /* linux + wine */
if (idle_id != 0) {
gui_quit = 1;
PostQuitMessage (0);
@ -341,8 +341,8 @@ fst_stop_threading(void) {
//g_source_remove(idle_id);
idle_id = 0;
}
}
#endif
}
void
fst_exit (void)