X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=score.c;h=37f4c55072d920bcef85ec622f6568c91b0ed11e;hp=3557b042a31e5d84df636062cb54c15cd04ebe3c;hb=820ae21f7a453408dca3faa9ff1d28ca94d60009;hpb=f31f8ceeaff0db558b63a46559e7d7464859d0c4

diff --git a/score.c b/score.c
index 3557b042..37f4c550 100644
--- a/score.c
+++ b/score.c
@@ -1,11 +1,13 @@
 /*
- * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file score.c Scoring functions to determine the audio file streaming order. */
+#include <regex.h>
 #include <osl.h>
+
 #include "para.h"
 #include "error.h"
 #include "string.h"
@@ -36,8 +38,8 @@ static int ptr_compare(const struct osl_object *obj1, const struct osl_object *o
  */
 static int score_compare(const struct osl_object *obj1, const struct osl_object *obj2)
 {
-	int d1 = *(int*)obj1->data;
-	int d2 = *(int*)obj2->data;
+	long d1 = *(long *)obj1->data;
+	long d2 = *(long *)obj2->data;
 	int ret = NUM_COMPARE(d2, d1);
 
 	if (ret)
@@ -139,7 +141,7 @@ int score_add(const struct osl_row *aft_row, long score)
 	size = score_table_desc.column_descriptions[SCORECOL_SCORE].data_size;
 	score_objs[SCORECOL_SCORE].data = para_malloc(size);
 	score_objs[SCORECOL_SCORE].size = size;
-	*(int *)(score_objs[SCORECOL_SCORE].data) = score;
+	*(long *)(score_objs[SCORECOL_SCORE].data) = score;
 
 //	PARA_DEBUG_LOG("adding %p\n", *(void **) (score_objs[SCORECOL_AFT_ROW].data));
 	ret = osl(osl_add_row(score_table, score_objs));
@@ -166,13 +168,11 @@ static int get_nth_score(unsigned n, long *score)
  * \param aft_row Determines the audio file to change.
  * \param percent The position to re-insert the audio file.
  *
- * The percent parameter must be between \p 0 and 100 and. A value of zero
- * means to re-insert the audio file into the score table with a score lower
- * than any other admissible file.
+ * The percent parameter must be between 0 and 100. A value of zero means to
+ * re-insert the audio file into the score table with a score lower than any
+ * other admissible file.
  *
- * \return Positive on success, negative on errors. Possible errors: Errors
- * returned by osl_get_row(), get_num_admissible_files(), osl_get_nth_row(),
- * osl_get_object(), osl_update_object().
+ * \return Positive on success, negative on errors.
  */
 int score_update(const struct osl_row *aft_row, long percent)
 {