Forgotten files.

Sorry about the breakage.

CVS patchset: 7855
CVS date: 2006/01/28 17:09:59

1 files changed, 7 insertions, 79 deletions

diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 725c3e9e6..d54509123 100644
--- a/src/xine-utils/xineutils.h
+++ b/src/xine-utils/xineutils.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xineutils.h,v 1.98 2005/08/29 15:28:17 valtri Exp $
+ * $Id: xineutils.h,v 1.99 2006/01/28 17:09:59 tmattern Exp $
  *
  */
 #ifndef XINEUTILS_H
@@ -43,6 +43,9 @@ extern "C" {
 #  include "xmlparser.h"
 #  include "xine_buffer.h"
 #  include "configfile.h"
+#  include "list.h"
+#  include "array.h"
+#  include "sorted_array.h"
 #else
 #  ifdef WIN32
 #    include <winsock.h>
@@ -55,6 +58,9 @@ extern "C" {
 #  include <xine/xmlparser.h>
 #  include <xine/xine_buffer.h>
 #  include <xine/configfile.h>
+#  include <xine/list.h>
+#  include <xine/array.h>
+#  include <xine/sorted_array.h>
 #endif
 
 #include <stdio.h>
@@ -956,84 +962,6 @@ void xine_xprintf(xine_t *xine, int verbose, const char *fmt, ...);
 #  define XINE_PROFILE_ACCUMULATE(function) function
 #endif /* DEBUG */
 
-
-/******** double chained lists with builtin iterator *******/
-
-typedef struct xine_node_s {
-
-  struct xine_node_s    *next, *prev;
-
-  void                  *content;
-
-  int                    priority;
-
-} xine_node_t;
-
-
-typedef struct {
-
-  xine_node_t    *first, *last, *cur;
-
-} xine_list_t;
-
-
-
-xine_list_t *xine_list_new (void);
-
-
-/**
- * dispose the whole list.
- * note: disposes _only_ the list structure, content must be free()d elsewhere
- */
-void xine_list_free(xine_list_t *l);
-
-
-/**
- * returns: Boolean
- */
-int xine_list_is_empty (xine_list_t *l);
-
-/**
- * return content of first entry in list.
- */
-void *xine_list_first_content (xine_list_t *l);
-
-/**
- * return next content in list.
- */
-void *xine_list_next_content (xine_list_t *l);
-
-/**
- * Return last content of list.
- */
-void *xine_list_last_content (xine_list_t *l);
-
-/**
- * Return previous content of list.
- */
-void *xine_list_prev_content (xine_list_t *l);
-
-/**
- * Append content to list, sorted by decreasing priority.
- */
-void xine_list_append_priority_content (xine_list_t *l, void *content, int priority);
-
-/**
- * Append content to list.
- */
-void xine_list_append_content (xine_list_t *l, void *content);
-
-/**
- * Insert content in list.
- */
-void xine_list_insert_content (xine_list_t *l, void *content);
-
-/**
- * Remove current content in list.
- * note: removes only the list entry; content must be free()d elsewhere.
- */
-void xine_list_delete_current (xine_list_t *l);
-
 /**
  * get encoding of current locale
  */