X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fresourcethread.C;h=70138be063718066ce11e5474bbb1849ca1e21ac;hp=62aee466094c33fdc751cc803bdcc969b5cd8d78;hb=a19a685a46ddc630010788707d9e5b9d2342af46;hpb=48c313de28fe6d39d9431dbe2dca6ffb176541ff diff --git a/cinelerra-5.1/cinelerra/resourcethread.C b/cinelerra-5.1/cinelerra/resourcethread.C index 62aee466..70138be0 100644 --- a/cinelerra-5.1/cinelerra/resourcethread.C +++ b/cinelerra-5.1/cinelerra/resourcethread.C @@ -164,7 +164,6 @@ ResourceThread::ResourceThread(MWindow *mwindow, MWindowGUI *gui) temp_picon = 0; temp_picon2 = 0; draw_lock = new Condition(0, "ResourceThread::draw_lock", 0); - source_lock = new Condition(1, "ResourceThread::source_lock", 0); item_lock = new Mutex("ResourceThread::item_lock"); audio_buffer = 0; for(int i = 0; i < MAXCHANNELS; i++) @@ -186,7 +185,6 @@ ResourceThread::~ResourceThread() { stop(); delete draw_lock; - delete source_lock; delete item_lock; delete temp_picon; delete temp_picon2; @@ -298,7 +296,6 @@ void ResourceThread::run() { draw_lock->lock("ResourceThread::run"); - source_lock->lock("ResourceThread::run"); while(!interrupted) { // Pull off item @@ -329,7 +326,6 @@ void ResourceThread::run() get_audio_source(0); get_video_source(0); mwindow->age_caches(); - source_lock->unlock(); } } @@ -452,7 +448,7 @@ void ResourceThread::do_video(VResourceThreadItem *item) if(!temp_picon) { - temp_picon = new VFrame(source_w, source_h, source_cmodel, 0); + temp_picon = new VFrame(0, -1, source_w, source_h, source_cmodel, -1); } // Get temporary to copy cached frame to