diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/xine-utils/Makefile.am | 14 | ||||
| -rw-r--r-- | src/xine-utils/xineutils.h | 86 |
2 files changed, 19 insertions, 81 deletions
diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index e0a35cb1f..6e22f0ab2 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -25,7 +25,11 @@ libxineutils_la_SOURCES = $(pppc_files) \ xine_mutex.c \ xmllexer.c \ xine_buffer.c \ - xmlparser.c + xmlparser.c \ + array.c \ + sorted_array.c \ + pool.c \ + ring_buffer.c include_HEADERS = \ attributes.h \ @@ -33,7 +37,13 @@ include_HEADERS = \ xine_buffer.h \ xineutils.h \ xmllexer.h \ - xmlparser.h + xmlparser.h \ + list.h \ + array.h \ + sorted_array.h \ + pool.h \ + ring_buffer.h + noinst_HEADERS = ppcasm_string.h xine_check.h 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 */ |