defaults for mxf format + android/termux patches from Andrew

[goodguy/cinelerra.git] / cinelerra-5.1 / guicast / linklist.h

diff --git a/cinelerra-5.1/guicast/linklist.h b/cinelerra-5.1/guicast/linklist.h
index 0c580defded3c95b8ff8836fbdf562c98ebd9792..b424a2aca5d1f64d9ebe3d79b2683cb8137507b1 100644 (file)
--- a/cinelerra-5.1/guicast/linklist.h
+++ b/cinelerra-5.1/guicast/linklist.h
@@ -9,9 +9,9 @@ public:
        TYPE *previous, *next;
        List<TYPE> *list;
 
-       int get_item_number() { return !list ? -1 : list->number_of(this); }
+       int get_item_number() { return !list ? -1 : list->number_of((TYPE*)this); }
        ListItem() { list = 0;  previous = next = 0; }
-       ListItem(List<TYPE> &me) { list = me;  previous = next = 0; }
+       ListItem(List<TYPE> *me) { list = me;  previous = next = 0; }
        virtual ~ListItem() { if( list ) list->remove_pointer(this); }
 };
 
@@ -28,6 +28,7 @@ public:
        void remove_pointer(ListItem<TYPE> *item);
        TYPE *append(TYPE *new_item);
        TYPE *append() { return append(new TYPE()); }
+       void destroy() { while(last) delete last; }
        TYPE *insert_before(TYPE *here, TYPE *item);
        TYPE *insert_before(TYPE *here) { return insert_before(here, new TYPE()); }
        TYPE *insert_after(TYPE *here, TYPE *item);
@@ -45,8 +46,9 @@ public:
        void swap(TYPE *item1, TYPE *item2);
        void sort(TYPE *ap=0, TYPE *bp=0) { return sort(cmpr,ap,bp); }
        void sort(int (*cmp)(TYPE *a, TYPE *b), TYPE *ap=0, TYPE *bp=0);
+       void concat(List<TYPE> &b);
        List() { first = last = 0; }
-       virtual ~List() { while(last) delete last; }
+       virtual ~List() { destroy(); }
 };
 
 // convenience macros
@@ -132,4 +134,14 @@ void List<TYPE>::sort(int (*cmpr)(TYPE *a, TYPE *b), TYPE *ll, TYPE *rr)
        }
 }
 
+template<class TYPE>
+void List<TYPE>::concat(List<TYPE> &b)
+{
+       if( !b.first ) return;
+       *(last ? &last->next : &first) = b.first;
+       b.first->previous = last;  last = b.last;
+       TYPE *bp = b.first;  b.first = b.last = 0;
+       while( bp ) { bp->list = this;  bp = bp->next; }
+}
+
 #endif