Credit Andrew - updating patches for FFmpeg 7.0 as needed since 6.1, now at 7.0,...

[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..cacceae67dea9f7bcbef7e8612e316fe6216a819 100644 (file)
--- a/cinelerra-5.1/guicast/linklist.h
+++ b/cinelerra-5.1/guicast/linklist.h
@@ -1,3 +1,24 @@
+/*
+ * CINELERRA
+ * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 
+ */
+
+
 #ifndef LINKLIST_H
 #define LINKLIST_H
 
@@ -9,9 +30,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 +49,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 +67,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 +155,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