resourcethread redraw speedup/fixes, replace vectorscope graticule IQ

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / resourcethread.C

diff --git a/cinelerra-5.1/cinelerra/resourcethread.C b/cinelerra-5.1/cinelerra/resourcethread.C
index 70138be063718066ce11e5474bbb1849ca1e21ac..895dd506c3f963ab20e5576f5289ce16ac83c348 100644 (file)
--- a/cinelerra-5.1/cinelerra/resourcethread.C
+++ b/cinelerra-5.1/cinelerra/resourcethread.C
@@ -174,6 +174,7 @@ ResourceThread::ResourceThread(MWindow *mwindow, MWindowGUI *gui)
        prev_l = 0;
        operation_count = 0;
        render_engine = 0;
+       render_engine_id = -1;
 
        audio_asset = 0;
        audio_source = 0;
@@ -251,6 +252,17 @@ void ResourceThread::add_wave(ResourcePixmap *pixmap,
        item_lock->unlock();
 }
 
+void ResourceThread::reset(int pane_number)
+{
+       item_lock->lock("ResourceThread::reset");
+       ResourceThreadItem *item = items.first;
+       while( item ) {
+               ResourceThreadItem *next_item = item->next;
+               if( item->pane_number == pane_number ) delete item;
+               item = next_item;
+       }
+       item_lock->unlock();
+}
 
 
 
@@ -270,8 +282,11 @@ void ResourceThread::stop_draw(int reset)
 
 //printf("ResourceThread::stop_draw %d %d\n", __LINE__, reset);
 //BC_Signals::dump_stack();
-               if(reset) items.remove_all_objects();
-               operation_count++;
+               if( reset ) {
+                       ResourceThreadItem *item;
+                       while( (item=items.last) != 0 ) delete item;
+                       ++operation_count;
+               }
                item_lock->unlock();
                prev_x = -1;
                prev_h = 0;
@@ -283,9 +298,9 @@ void ResourceThread::start_draw()
 {
        interrupted = 0;
 // Tag last audio item to cause refresh.
-       int i = items.total;
-       while( --i>=0 && items[i]->data_type!=TRACK_AUDIO );
-       if( i >= 0 ) items[i]->last = 1;
+       ResourceThreadItem *item = items.last;
+       while( item && item->data_type!=TRACK_AUDIO ) item = item->previous;
+       if( item ) item->last = 1;
        timer->update();
        draw_lock->unlock();
 }
@@ -300,16 +315,11 @@ void ResourceThread::run()
                {
 // Pull off item
                        item_lock->lock("ResourceThread::run");
-                       int total_items = items.size();
-                       ResourceThreadItem *item = 0;
-                       if(items.size())
-                       {
-                               item = items[0];
-                               items.remove_number(0);
-                       }
+                       ResourceThreadItem *item = items.first;
+                       items.remove_pointer(item);
                        item_lock->unlock();
 //printf("ResourceThread::run %d %d\n", __LINE__, items.size());
-                       if(!total_items) break;
+                       if(!item) break;
 
                        switch( item->data_type ) {
                        case TRACK_VIDEO:
@@ -757,7 +767,7 @@ void ResourceThread::do_audio(AResourceThreadItem *item)
                                        low);
                        if(timer->get_difference() > 250 || item->last)
                        {
-                               mwindow->gui->update(0, 3, 0, 0, 0, 0, 0);
+                               mwindow->gui->update(0, IGNORE_THREAD, 0, 0, 0, 0, 0);
                                timer->update();
                        }
                }