prev/next label fix in viewer, inout highlight, modify folder layout, ffmpeg scan...

[goodguy/history.git] / cinelerra-5.1 / guicast / thread.C

diff --git a/cinelerra-5.1/guicast/thread.C b/cinelerra-5.1/guicast/thread.C
index b27f43a25856198a5e82909b4d788cb677970dad..dff53e61ec4e5eb656a09236f4486ef680ee7484 100644 (file)
--- a/cinelerra-5.1/guicast/thread.C
+++ b/cinelerra-5.1/guicast/thread.C
@@ -150,7 +150,7 @@ int Thread::join()   // join this thread
                while( running() && !cancelled ) {
                        int ret = pthread_kill(tid, 0);
                        if( ret ) break;
-                       usleep(200000);
+                       usleep(10000);
                }
                tid = ((pthread_t)-1);
        }
@@ -243,6 +243,6 @@ int Thread::get_realtime()
 
 unsigned long Thread::get_tid()
 {
-       return tid;
+       return (unsigned long)tid;
 }