summaryrefslogtreecommitdiff
path: root/src/xine-utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-utils')
-rw-r--r--src/xine-utils/Makefile.am2
-rw-r--r--src/xine-utils/list.c205
-rw-r--r--src/xine-utils/memcpy.c23
-rw-r--r--src/xine-utils/xineutils.h76
4 files changed, 294 insertions, 12 deletions
diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am
index 2b6182585..bcd604db8 100644
--- a/src/xine-utils/Makefile.am
+++ b/src/xine-utils/Makefile.am
@@ -12,7 +12,7 @@ endif
CFLAGS = @CFLAGS@ $(THREAD_CFLAGS)
-libxineutils_la_SOURCES = $(pppc_files) utils.c memcpy.c monitor.c cpu_accel.c xine_mutex.c xmllexer.c xmlparser.c color.c
+libxineutils_la_SOURCES = $(pppc_files) utils.c memcpy.c monitor.c cpu_accel.c xine_mutex.c xmllexer.c xmlparser.c color.c list.c
libxineutils_la_LIBADD = $(THREAD_LIBS)
libxineutils_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
diff --git a/src/xine-utils/list.c b/src/xine-utils/list.c
new file mode 100644
index 000000000..1ef36fb05
--- /dev/null
+++ b/src/xine-utils/list.c
@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2000-2002 the xine project
+ *
+ * This file is part of xine, a unix video player.
+ *
+ * xine 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.
+ *
+ * xine 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
+ *
+ * $Id: list.c,v 1.2 2002/09/04 23:31:13 guenter Exp $
+ *
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <inttypes.h>
+
+#include "xineutils.h"
+
+/*
+ * create a new, empty list
+ */
+xine_list_t *xine_list_new (void) {
+ xine_list_t *list;
+
+ list = (xine_list_t *) xine_xmalloc(sizeof(xine_list_t));
+
+ list->first=NULL;
+ list->last =NULL;
+ list->cur =NULL;
+
+ return list;
+}
+
+/*
+ * dispose a list (and only the list, contents have to be managed separately)
+ * TODO: this is easy to fix by using "content destructors"
+ */
+void xine_list_free(xine_list_t *l) {
+ xine_node_t *node;
+
+ if (!l) {
+ fprintf(stderr, "%s(): No list.\n", __FUNCTION__);
+ return;
+ }
+
+ if(!l->first) {
+ return;
+ }
+
+ node = l->first;
+
+ while(node) {
+ xine_node_t *n = node;
+
+ /* TODO: support for content destructors */
+ node = n->next;
+ free(n);
+ }
+
+ l->first = l->cur = l->last = NULL; /* FIXME: free(l) instead */
+}
+
+void *xine_list_first_content (xine_list_t *l) {
+
+ l->cur = l->first;
+
+ if (l->first)
+ return l->first->content;
+ else
+ return NULL;
+}
+
+void *xine_list_next_content (xine_list_t *l) {
+ if (l->cur) {
+
+ if (l->cur->next) {
+ l->cur = l->cur->next;
+ return l->cur->content;
+ }
+ else
+ return NULL;
+
+ }
+ else {
+ fprintf(stderr,"%s() WARNING: passed end of list\n", __FUNCTION__);
+ return NULL;
+ }
+}
+
+int xine_list_is_empty (xine_list_t *l) {
+
+ if (l == NULL){
+ fprintf(stderr, "%s(): list is NULL\n", __FUNCTION__);
+ return -1;
+ }
+ return (l->first != NULL);
+}
+
+void *xine_list_last_content (xine_list_t *l) {
+
+ if (l->last) {
+ l->cur = l->last;
+ return l->last->content;
+ }
+ else {
+ fprintf(stderr, "xine_list: wanted last of empty list\n");
+ return NULL;
+ }
+}
+
+void *xine_list_prev_content (xine_list_t *l) {
+
+ if (l->cur) {
+ if (l->cur->prev) {
+ l->cur = l->cur->prev;
+ return l->cur->content;
+ }
+ else
+ return NULL;
+ }
+ else {
+ fprintf(stderr, "xine_list: passed begin of list\n");
+ return NULL;
+ }
+}
+
+void xine_list_append_content (xine_list_t *l, void *content) {
+ xine_node_t *node;
+
+ node = (xine_node_t *) xine_xmalloc(sizeof(xine_node_t));
+ node->content = content;
+
+ if (l->last) {
+ node->next = NULL;
+ node->prev = l->last;
+ l->last->next = node;
+ l->last = node;
+ l->cur = node;
+ }
+ else {
+ l->first = l->last = l->cur = node;
+ node->prev = node->next = NULL;
+ }
+}
+
+void xine_list_insert_content (xine_list_t *l, void *content) {
+ xine_node_t *nodecur, *nodenext, *nodenew;
+
+ if(l->cur->next) {
+ nodenew = (xine_node_t *) xine_xmalloc(sizeof(xine_node_t));
+
+ nodenew->content = content;
+ nodecur = l->cur;
+ nodenext = l->cur->next;
+ nodecur->next = nodenew;
+ nodenext->prev = nodenew;
+ nodenew->prev = nodecur;
+ nodenew->next = nodenext;
+ l->cur = nodenew;
+ }
+ else { /* current is last, append to the list */
+ xine_list_append_content(l, content);
+ }
+
+}
+
+void xine_list_delete_current (xine_list_t *l) {
+ xine_node_t *node_cur;
+
+ node_cur = l->cur;
+
+ if(node_cur->prev) {
+ node_cur->prev->next = node_cur->next;
+ }
+ else { /* First entry */
+ l->first = node_cur->next;
+ }
+
+ if(node_cur->next) {
+ node_cur->next->prev = node_cur->prev;
+ l->cur = node_cur->next;
+ }
+ else { /* last entry in the list */
+ l->last = node_cur->prev;
+ l->cur = node_cur->prev;
+ }
+
+ /* TODO: support content destructors */
+ free(node_cur);
+}
diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c
index a27cce1d3..0b4e28c2c 100644
--- a/src/xine-utils/memcpy.c
+++ b/src/xine-utils/memcpy.c
@@ -1,7 +1,7 @@
/*
- * Copyright (C) 2001 the xine project
+ * Copyright (C) 2001-2002 the xine project
*
- * This file is part of xine, a unix video player.
+ * This file is part of xine, a free video player.
*
* xine is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -397,17 +397,20 @@ static unsigned long long int rdtsc()
}
#endif
-static void update_fast_memcpy(void *this_gen, cfg_entry_t *entry)
-{
+static void update_fast_memcpy(void *this_gen, xine_cfg_entry_t *entry) {
static int config_flags = -1;
+ int method;
+
config_flags = xine_mm_accel();
- if( entry->num_value != 0 &&
- (config_flags & memcpy_method[entry->num_value].cpu_require) ==
- memcpy_method[entry->num_value].cpu_require ) {
- printf("xine: using %s\n", memcpy_method[entry->num_value].name );
- xine_fast_memcpy = memcpy_method[entry->num_value].function;
+ method = entry->num_value;
+
+ if (method != 0
+ && (config_flags & memcpy_method[method].cpu_require) ==
+ memcpy_method[method].cpu_require ) {
+ printf("xine: using %s\n", memcpy_method[method].name );
+ xine_fast_memcpy = memcpy_method[method].function;
return;
} else {
printf("xine: will probe memcpy on startup\n" );
@@ -437,7 +440,7 @@ void xine_probe_fast_memcpy(config_values_t *config)
best = config->register_enum (config, "misc.memcpy_method", 0,
memcpy_methods,
_("Memcopy method to use in xine for large data chunks."),
- NULL, update_fast_memcpy, NULL);
+ NULL, 20, update_fast_memcpy, NULL);
/* check if function is configured and valid for this machine */
if( best != 0 &&
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index cd44dca80..9875da713 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.21 2002/08/28 03:32:48 tmmm Exp $
+ * $Id: xineutils.h,v 1.22 2002/09/04 23:31:14 guenter Exp $
*
*/
#ifndef XINEUTILS_H
@@ -35,6 +35,7 @@ extern "C" {
#include "attributes.h"
#include "compat.h"
#include "xmlparser.h"
+
/*
* debugable mutexes
*/
@@ -784,6 +785,79 @@ extern int v_r_table[256];
extern int v_g_table[256];
extern int v_b_table[256];
+
+/******** double cained lists with builtin iterator *******/
+
+typedef struct xine_node_s {
+
+ struct xine_node_s *next, *prev;
+
+ void *content;
+
+} 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.
+ */
+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);
+
+
+
#ifdef __cplusplus
}
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 18:21:02 +0000