Add in MXF file as a supported video format

[ardour.git] / gtk2_ardour / linux_vst_gui_support.cc

diff --git a/gtk2_ardour/linux_vst_gui_support.cc b/gtk2_ardour/linux_vst_gui_support.cc
index 4d90bdd4aa98e1388fababee0ba0be087e7d8671..c54430c4e64ede4a06a3d06be674251f2afa8138 100644 (file)
--- a/gtk2_ardour/linux_vst_gui_support.cc
+++ b/gtk2_ardour/linux_vst_gui_support.cc
@@ -22,13 +22,10 @@
 /** VSTFX - An engine based on FST for handling linuxVST plugins **/
 /******************************************************************/
 
-/** EDITOR tab stops at 4 **/
-
 #include <stdlib.h>
 #include <stdio.h>
-#include <jack/jack.h>
-#include <jack/thread.h>
 #include <libgen.h>
+#include <assert.h>
 
 #include <pthread.h>
 #include <signal.h>
@@ -44,6 +41,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <pthread.h>
+#include <sys/time.h>
 
 struct ERect{
     short top;
@@ -335,10 +333,11 @@ windows, that is if they don't manage their own UIs **/
 void* gui_event_loop (void* ptr)
 {
        VSTState* vstfx;
-       int LXVST_sched_event_timer = 0;
-       int LXVST_sched_timer_interval = 50; //ms
+       int LXVST_sched_timer_interval = 40; //ms, 25fps
        XEvent event;
+       uint64_t clock1, clock2;
        
+       clock1 = g_get_monotonic_time();
        /*The 'Forever' loop - runs the plugin UIs etc - based on the FST gui event loop*/
        
        while (!gui_quit)
@@ -349,11 +348,18 @@ void* gui_event_loop (void* ptr)
                /*Look at the XEvent queue - if there are any XEvents we need to handle them,
                including passing them to all the plugin (eventProcs) we are currently managing*/
                
+               bool may_sleep = true;
+
                if(LXVST_XDisplay)
                {
                        /*See if there are any events in the queue*/
                
                        int num_events = XPending(LXVST_XDisplay);
+
+                       if (num_events > 0) {
+                               // keep dispatching events as fast as possible
+                               may_sleep = false;
+                       }
                        
                        /*process them if there are any*/
                
@@ -380,14 +386,14 @@ void* gui_event_loop (void* ptr)
 
                Glib::usleep(1000);
                
-               LXVST_sched_event_timer++;
-               
-               LXVST_sched_event_timer = LXVST_sched_event_timer & 0x00FFFFFF;
-
                /*See if its time for us to do a scheduled event pass on all the plugins*/
 
-               if((LXVST_sched_timer_interval!=0) && (!(LXVST_sched_event_timer% LXVST_sched_timer_interval)))
+               clock2 = g_get_monotonic_time();
+               const int64_t elapsed_time_ms = (clock2 - clock1) / 1000;
+
+               if((LXVST_sched_timer_interval != 0) && elapsed_time_ms >= LXVST_sched_timer_interval)
                {
+                       //printf("elapsed %d ms ^= %.2f Hz\n", elapsed_time_ms, 1000.0/(double)elapsed_time_ms); // DEBUG
                        pthread_mutex_lock (&plugin_mutex);
                    
 again:
@@ -462,6 +468,12 @@ again:
                                pthread_mutex_unlock (&vstfx->lock);
                        }
                        pthread_mutex_unlock (&plugin_mutex);
+
+                       clock1 = g_get_monotonic_time();
+               }
+
+               if (may_sleep && elapsed_time_ms + 1 < LXVST_sched_timer_interval) {
+                       Glib::usleep(1000 * (LXVST_sched_timer_interval - elapsed_time_ms - 1));
                }
        }
 
@@ -770,6 +782,10 @@ vstfx_event_loop_remove_plugin (VSTState* vstfx)
                }
        }
 
+       // if this function is called, there must be
+       // at least one plugin in the linked list
+       assert(vstfx_first);
+
        if (vstfx_first == vstfx) {
                vstfx_first = vstfx_first->next;
        }