xmms-sid: src/xs_length.c annotate

annotate src/xs_length.c @ 469:d600f45c92d2

Silence a gcc warning; Use xs_*() file handling functions.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 25 Jan 2007 03:50:00 +0000
parents	57836945fa71
children	3f02945a0c48

rev	line source
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3
332 961212302eb9 Comment Matti Hamalainen <ccr@tnsp.org> parents: 324 diff changeset	4 Get song length from SLDB for PSID/RSID files
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5
324 dd201740a720 Changed copyright text. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	6 Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
422 d2e6682d3ef8 Copyright year update Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	7 (C) Copyright 1999-2007 Tecnic Software productions (TNSP)
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 This program is free software; you can redistribute it and/or modify
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10 it under the terms of the GNU General Public License as published by
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11 the Free Software Foundation; either version 2 of the License, or
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	12 (at your option) any later version.
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14 This program is distributed in the hope that it will be useful,
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	15 but WITHOUT ANY WARRANTY; without even the implied warranty of
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	17 GNU General Public License for more details.
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	18
412 7f694e5a1493 Updated GNU GPL (new FSF address) and some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	19 You should have received a copy of the GNU General Public License along
7f694e5a1493 Updated GNU GPL (new FSF address) and some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	20 with this program; if not, write to the Free Software Foundation, Inc.,
7f694e5a1493 Updated GNU GPL (new FSF address) and some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	21 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22 */
39 85a7753e2a9a Lots of new code Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	23 #include "xs_length.h"
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	24 #include "xs_support.h"
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	25 #include "xs_config.h"
223 16e3b2446a73 On some systems stdlib.h has prerequisite of stdio.h, corrected order of Matti Hamalainen <ccr@tnsp.org> parents: 178 diff changeset	26 #include <stdio.h>
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	27 #include <stdlib.h>
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	28 #include <ctype.h>
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	29 #include <string.h>
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	30
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	31
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	32 /* Free memory allocated for given SLDB node
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	33 */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	34 static void xs_sldb_node_free(t_xs_sldb_node *pNode)
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	35 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	36 if (pNode) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	37 /* Nothing much to do here ... */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	38 g_free(pNode->sLengths);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	39 g_free(pNode);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	40 }
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	41 }
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	42
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	43
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	44 /* Insert given node to db linked list
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	45 */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	46 static void xs_sldb_node_insert(t_xs_sldb db, t_xs_sldb_node pNode)
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	47 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	48 assert(db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	49
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	50 if (db->pNodes) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	51 /* The first node's pPrev points to last node */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	52 LPREV = db->pNodes->pPrev; /* New node's prev = Previous last node */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	53 db->pNodes->pPrev->pNext = pNode; /* Previous last node's next = New node */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	54 db->pNodes->pPrev = pNode; /* New last node = New node */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	55 LNEXT = NULL; /* But next is NULL! */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	56 } else {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	57 db->pNodes = pNode; /* First node ... */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	58 LPREV = pNode; /* ... it's also last */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	59 LNEXT = NULL; /* But next is NULL! */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	60 }
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	61 }
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	62
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	63
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	64 /* Parse a time-entry in SLDB format
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	65 */
449 230a9d79dd84 Type cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 424 diff changeset	66 static gint xs_sldb_gettime(gchar pcStr, size_t piPos)
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	67 {
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	68 gint iResult, iTemp;
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	69
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	70 /* Check if it starts with a digit */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	71 if (isdigit(pcStr[*piPos])) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	72 /* Get minutes-field */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	73 iResult = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	74 while (isdigit(pcStr[*piPos]))
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	75 iResult = (iResult * 10) + (pcStr[(*piPos)++] - '0');
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	76
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	77 iResult *= 60;
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	78
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	79 /* Check the field separator char */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	80 if (pcStr[*piPos] == ':') {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	81 /* Get seconds-field */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	82 (*piPos)++;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	83 iTemp = 0;
385 7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	84 while (isdigit(pcStr[*piPos])) {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	85 iTemp = (iTemp * 10) + (pcStr[(*piPos)++] - '0');
385 7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	86 }
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	88 iResult += iTemp;
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89 } else
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	90 iResult = -2;
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	91 } else
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	92 iResult = -1;
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	93
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	94 /* Ignore and skip the possible attributes */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	95 while (pcStr[piPos] && !isspace(pcStr[piPos]))
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	96 (*piPos)++;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	97
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	98 return iResult;
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99 }
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	100
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	102 /* Parse one SLDB definition line, return SLDB node
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	103 */
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	104 t_xs_sldb_node * xs_sldb_read_entry(gchar *inLine)
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	105 {
449 230a9d79dd84 Type cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 424 diff changeset	106 size_t linePos;
230a9d79dd84 Type cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 424 diff changeset	107 gint i;
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	108 gboolean iOK;
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	109 t_xs_sldb_node *tmpNode;
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	110
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	111 /* Allocate new node */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	112 tmpNode = (t_xs_sldb_node *) g_malloc0(sizeof(t_xs_sldb_node));
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	113 if (!tmpNode) {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	114 xs_error(_("Error allocating new node. Fatal error.\n"));
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	115 return NULL;
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	116 }
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	117
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	118 /* Get hash value */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	119 linePos = 0;
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	120 for (i = 0; i < XS_MD5HASH_LENGTH; i++, linePos += 2) {
419 bf4664ed897d sscanf() was used in unaligned access, causing problems on Sparc (and Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	121 gint tmpu;
bf4664ed897d sscanf() was used in unaligned access, causing problems on Sparc (and Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	122 sscanf(&inLine[linePos], "%2x", &tmpu);
bf4664ed897d sscanf() was used in unaligned access, causing problems on Sparc (and Matti Hamalainen <ccr@tnsp.org> parents: 418 diff changeset	123 tmpNode->md5Hash[i] = tmpu;
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	124 }
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	125
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	126 /* Get playtimes */
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	127 if (inLine[linePos] != 0) {
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	128 if (inLine[linePos] != '=') {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	129 xs_error(_("'=' expected on column #%d.\n"), linePos);
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	130 xs_sldb_node_free(tmpNode);
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	131 return NULL;
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	132 } else {
449 230a9d79dd84 Type cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 424 diff changeset	133 size_t tmpLen, savePos;
230a9d79dd84 Type cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 424 diff changeset	134
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	135 /* First playtime is after '=' */
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	136 savePos = ++linePos;
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	137 tmpLen = strlen(inLine);
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	138
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	139 /* Get number of sub-tune lengths */
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	140 iOK = TRUE;
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	141 while ((linePos < tmpLen) && iOK) {
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	142 xs_findnext(inLine, &linePos);
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	143
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	144 if (xs_sldb_gettime(inLine, &linePos) >= 0)
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	145 tmpNode->nLengths++;
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	146 else
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	147 iOK = FALSE;
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	148 }
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	149
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	150 /* Allocate memory for lengths */
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	151 tmpNode->sLengths = (gint ) g_malloc0(tmpNode->nLengths sizeof(gint));
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	152 if (!tmpNode->sLengths) {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	153 xs_error(_("Could not allocate memory for node.\n"));
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	154 xs_sldb_node_free(tmpNode);
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	155 return NULL;
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	156 }
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	157
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	158 /* Read lengths in */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	159 i = 0;
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	160 linePos = savePos;
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	161 iOK = TRUE;
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	162 while ((linePos < tmpLen) && (i < tmpNode->nLengths) && iOK) {
449 230a9d79dd84 Type cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 424 diff changeset	163 gint l;
230a9d79dd84 Type cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 424 diff changeset	164
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	165 xs_findnext(inLine, &linePos);
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	166
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	167 l = xs_sldb_gettime(inLine, &linePos);
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	168 if (l >= 0)
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	169 tmpNode->sLengths[i] = l;
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	170 else
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	171 iOK = FALSE;
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	172
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	173 i++;
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	174 }
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	175
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	176 if (!iOK) {
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	177 xs_sldb_node_free(tmpNode);
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	178 return NULL;
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	179 } else
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	180 return tmpNode;
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	181 }
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	182 }
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	183
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	184 return NULL;
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	185 }
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	186
3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	187
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	188 /* Read database to memory
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	189 */
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	190 gint xs_sldb_read(t_xs_sldb db, const gchar dbFilename)
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	191 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	192 FILE *inFile;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	193 gchar inLine[XS_BUF_SIZE];
458 57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	194 size_t lineNum;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	195 t_xs_sldb_node *tmpNode;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	196 assert(db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	197
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	198 /* Try to open the file */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	199 if ((inFile = fopen(dbFilename, "ra")) == NULL) {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	200 xs_error(_("Could not open SongLengthDB '%s'\n"), dbFilename);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	201 return -1;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	202 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	203
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	204 /* Read and parse the data */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	205 lineNum = 0;
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	206
458 57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	207 while (!feof(inFile) && fgets(inLine, XS_BUF_SIZE, inFile)) {
449 230a9d79dd84 Type cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 424 diff changeset	208 size_t linePos;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	209 inLine[XS_BUF_SIZE - 1] = 0;
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	210 linePos = 0;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	211 lineNum++;
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	212
faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	213 xs_findnext(inLine, &linePos);
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	214
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	215 /* Check if it is datafield */
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	216 if (isxdigit(inLine[linePos])) {
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	217 /* Check the length of the hash */
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	218 gint hashLen;
418 226627246616 Another fix for the fix, which was invalid. :P Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	219 for (hashLen = 0; inLine[linePos] && isxdigit(inLine[linePos]); hashLen++, linePos++);
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	220
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	221 if (hashLen != XS_MD5HASH_LENGTH_CH) {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	222 xs_error(_("Invalid MD5-hash in SongLengthDB file '%s' line #%d!\n"),
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	223 dbFilename, lineNum);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	224 } else {
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	225 /* Parse and add node to db */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	226 if ((tmpNode = xs_sldb_read_entry(inLine)) != NULL) {
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	227 xs_sldb_node_insert(db, tmpNode);
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	228 } else {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	229 xs_error(_("Invalid entry in SongLengthDB file '%s' line #%d!\n"),
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	230 dbFilename, lineNum);
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	231 }
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	232 }
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	233 } else if ((inLine[linePos] != ';') && (inLine[linePos] != '[') && (inLine[linePos] != 0)) {
faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	234 xs_error(_("Invalid line in SongLengthDB file '%s' line #%d\n"),
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	235 dbFilename, lineNum);
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	236 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	237
389 3c239e4160d5 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 385 diff changeset	238 }
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	239
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	240 /* Close the file */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	241 fclose(inFile);
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	242
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	243 return 0;
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	244 }
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	245
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	246
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	247 /* Compare two given MD5-hashes.
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	248 * Return: 0 if equal
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	249 * negative if testHash1 < testHash2
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	250 * positive if testHash1 > testHash2
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	251 */
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	252 static gint xs_sldb_cmphash(t_xs_md5hash testHash1, t_xs_md5hash testHash2)
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	253 {
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	254 gint i, d;
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	255
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	256 /* Compute difference of hashes */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	257 for (i = 0, d = 0; (i < XS_MD5HASH_LENGTH) && !d; i++)
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	258 d = (testHash1[i] - testHash2[i]);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	259
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 389 diff changeset	260 return d;
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	261 }
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	262
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	263
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	264 /* Get node from db index via binary search
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	265 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	266 static t_xs_sldb_node xs_sldb_get_node(t_xs_sldb db, t_xs_md5hash pHash)
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	267 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	268 gint iStartNode, iEndNode, iQNode, r, i;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	269 gboolean iFound;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	270 t_xs_sldb_node *pResult;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	271
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	272 /* Check the database pointers */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	273 if (!db \|\| !db->pNodes \|\| !db->ppIndex)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	274 return NULL;
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	275
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	276 /* Look-up via index using binary search */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	277 pResult = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	278 iStartNode = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	279 iEndNode = (db->n - 1);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	280 iQNode = (iEndNode / 2);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	281 iFound = FALSE;
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	282
369 4611f1194941 Make binary search bailout value a #define in xmms-sid.h Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	283 while ((!iFound) && ((iEndNode - iStartNode) > XS_BIN_BAILOUT)) {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	284 r = xs_sldb_cmphash(pHash, db->ppIndex[iQNode]->md5Hash);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	285 if (r < 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	286 /* Hash was in the <- LEFT side */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	287 iEndNode = iQNode;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	288 iQNode = iStartNode + ((iEndNode - iStartNode) / 2);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	289 } else if (r > 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	290 /* Hash was in the RIGHT -> side */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	291 iStartNode = iQNode;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	292 iQNode = iStartNode + ((iEndNode - iStartNode) / 2);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	293 } else
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	294 iFound = TRUE;
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	295 }
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	296
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	297 /* If not found already */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	298 if (!iFound) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	299 /* Search the are linearly */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	300 iFound = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	301 i = iStartNode;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	302 while ((i <= iEndNode) && (!iFound)) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	303 if (xs_sldb_cmphash(pHash, db->ppIndex[i]->md5Hash) == 0)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	304 iFound = TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	305 else
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	306 i++;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	307 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	308
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	309 /* Check the result */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	310 if (iFound)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	311 pResult = db->ppIndex[i];
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	312
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	313 } else {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	314 /* Found via binary search */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	315 pResult = db->ppIndex[iQNode];
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	316 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	317
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	318 return pResult;
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	319 }
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	320
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	321
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	322 /* Compare two nodes
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	323 */
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	324 static gint xs_sldb_cmp(const void pNode1, const void pNode2)
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	325 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	326 /* We assume here that we never ever get NULL-pointers or similar */
385 7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	327 return xs_sldb_cmphash(
7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	328 ((t_xs_sldb_node *) pNode1)->md5Hash,
7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	329 ((t_xs_sldb_node *) pNode2)->md5Hash);
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	330 }
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	331
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	332
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	333 /* (Re)create index
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	334 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	335 gint xs_sldb_index(t_xs_sldb * db)
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	336 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	337 t_xs_sldb_node *pCurr;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	338 gint i;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	339 assert(db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	340
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	341 /* Free old index */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	342 if (db->ppIndex) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	343 g_free(db->ppIndex);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	344 db->ppIndex = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	345 }
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	346
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	347 /* Get size of db */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	348 pCurr = db->pNodes;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	349 db->n = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	350 while (pCurr) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	351 db->n++;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	352 pCurr = pCurr->pNext;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	353 }
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	354
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	355 /* Check number of nodes */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	356 if (db->n > 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	357 /* Allocate memory for index-table */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	358 db->ppIndex = (t_xs_sldb_node *) g_malloc(sizeof(t_xs_sldb_node ) * db->n);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	359 if (!db->ppIndex)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	360 return -1;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	361
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	362 /* Get node-pointers to table */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	363 i = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	364 pCurr = db->pNodes;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	365 while (pCurr && (i < db->n)) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	366 db->ppIndex[i++] = pCurr;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	367 pCurr = pCurr->pNext;
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	368 }
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	369
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	370 /* Sort the indexes */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	371 qsort(db->ppIndex, db->n, sizeof(t_xs_sldb_node *), xs_sldb_cmp);
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	372 }
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	373
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	374 return 0;
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	375 }
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	376
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	377
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	378 /* Free a given song-length database
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	379 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	380 void xs_sldb_free(t_xs_sldb * db)
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	381 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	382 t_xs_sldb_node pCurr, pNext;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	383
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	384 if (!db)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	385 return;
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	386
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	387 /* Free the memory allocated for nodes */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	388 pCurr = db->pNodes;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	389 while (pCurr) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	390 pNext = pCurr->pNext;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	391 xs_sldb_node_free(pCurr);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	392 pCurr = pNext;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	393 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	394
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	395 db->pNodes = NULL;
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	396
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	397 /* Free memory allocated for index */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	398 if (db->ppIndex) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	399 g_free(db->ppIndex);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	400 db->ppIndex = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	401 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	402
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	403 /* Free structure */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	404 db->n = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	405 g_free(db);
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	406 }
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	407
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	408
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	409 /* Compute md5hash of given SID-file
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	410 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	411 typedef struct
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	412 {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	413 gchar magicID[4]; /* "PSID" / "RSID" magic identifier */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	414 guint16 version, /* Version number */
385 7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	415 dataOffset, /* Start of actual c64 data in file */
7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	416 loadAddress, /* Loading address */
7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	417 initAddress, /* Initialization address */
7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	418 playAddress, /* Play one frame */
7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	419 nSongs, /* Number of subsongs */
7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	420 startSong; /* Default starting song */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	421 guint32 speed; /* Speed */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	422 gchar sidName[32]; /* Descriptive text-fields, ASCIIZ */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	423 gchar sidAuthor[32];
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	424 gchar sidCopyright[32];
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	425 } t_xs_psidv1_header;
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	426
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	427
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	428 typedef struct
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	429 {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	430 guint16 flags; /* Flags */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	431 guint8 startPage, pageLength;
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	432 guint16 reserved;
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	433 } t_xs_psidv2_header;
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	434
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	435
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	436 static gint xs_get_sid_hash(const gchar *pcFilename, t_xs_md5hash hash)
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	437 {
458 57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	438 t_xs_file *inFile;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	439 t_xs_md5state inState;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	440 t_xs_psidv1_header psidH;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	441 t_xs_psidv2_header psidH2;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	442 guint8 *songData;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	443 guint8 ib8[2], i8;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	444 gint iIndex, iRes;
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	445
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	446 /* Try to open the file */
458 57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	447 if ((inFile = xs_fopen(pcFilename, "rb")) == NULL)
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	448 return -1;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	449
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	450 /* Read PSID header in */
469 d600f45c92d2 Silence a gcc warning; Use xs_() file handling functions. Matti Hamalainen <ccr@tnsp.org>* parents: 458 diff changeset	451 xs_fread(psidH.magicID, sizeof(psidH.magicID), 1, inFile);
d600f45c92d2 Silence a gcc warning; Use xs_() file handling functions. Matti Hamalainen <ccr@tnsp.org>* parents: 458 diff changeset	452 if (strncmp(psidH.magicID, "PSID", 4) && strncmp(psidH.magicID, "RSID", 4)) {
458 57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	453 xs_fclose(inFile);
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	454 xs_error(_("Not a PSID or RSID file '%s'\n"), pcFilename);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	455 return -2;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	456 }
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	457
458 57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	458 psidH.version = xs_fread_be16(inFile);
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	459 psidH.dataOffset = xs_fread_be16(inFile);
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	460 psidH.loadAddress = xs_fread_be16(inFile);
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	461 psidH.initAddress = xs_fread_be16(inFile);
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	462 psidH.playAddress = xs_fread_be16(inFile);
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	463 psidH.nSongs = xs_fread_be16(inFile);
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	464 psidH.startSong = xs_fread_be16(inFile);
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	465 psidH.speed = xs_fread_be32(inFile);
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	466
469 d600f45c92d2 Silence a gcc warning; Use xs_() file handling functions. Matti Hamalainen <ccr@tnsp.org>* parents: 458 diff changeset	467 xs_fread(psidH.sidName, sizeof(gchar), sizeof(psidH.sidName), inFile);
d600f45c92d2 Silence a gcc warning; Use xs_() file handling functions. Matti Hamalainen <ccr@tnsp.org>* parents: 458 diff changeset	468 xs_fread(psidH.sidAuthor, sizeof(gchar), sizeof(psidH.sidAuthor), inFile);
d600f45c92d2 Silence a gcc warning; Use xs_() file handling functions. Matti Hamalainen <ccr@tnsp.org>* parents: 458 diff changeset	469 xs_fread(psidH.sidCopyright, sizeof(gchar), sizeof(psidH.sidCopyright), inFile);
458 57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	470
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	471 if (xs_feof(inFile) \|\| xs_ferror(inFile)) {
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	472 xs_fclose(inFile);
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	473 xs_error(_("Error reading SID file header from '%s'\n"), pcFilename);
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	474 return -4;
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	475 }
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	476
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	477 /* Check if we need to load PSIDv2NG header ... */
469 d600f45c92d2 Silence a gcc warning; Use xs_() file handling functions. Matti Hamalainen <ccr@tnsp.org>* parents: 458 diff changeset	478 psidH2.flags = 0; /* Just silence a stupid gcc warning */
d600f45c92d2 Silence a gcc warning; Use xs_() file handling functions. Matti Hamalainen <ccr@tnsp.org>* parents: 458 diff changeset	479
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	480 if (psidH.version == 2) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	481 /* Yes, we need to */
458 57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	482 psidH2.flags = xs_fread_be16(inFile);
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	483 psidH2.startPage = xs_fgetc(inFile);
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	484 psidH2.pageLength = xs_fgetc(inFile);
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	485 psidH2.reserved = xs_fread_be16(inFile);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	486 }
385 7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	487
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	488 /* Allocate buffer */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	489 songData = (guint8 ) g_malloc(XS_SIDBUF_SIZE sizeof(guint8));
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	490 if (!songData) {
458 57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	491 xs_fclose(inFile);
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	492 xs_error(_("Error allocating temp data buffer for file '%s'\n"), pcFilename);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	493 return -3;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	494 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	495
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	496 /* Read data to buffer */
458 57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	497 iRes = xs_fread(songData, sizeof(guint8), XS_SIDBUF_SIZE, inFile);
57836945fa71 Use new xs_* file functions for SID-file handling. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	498 xs_fclose(inFile);
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	499
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	500 /* Initialize and start MD5-hash calculation */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	501 xs_md5_init(&inState);
385 7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	502
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	503 if (psidH.loadAddress == 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	504 /* Strip load address (2 first bytes) */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	505 xs_md5_append(&inState, &songData[2], iRes - 2);
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	506 } else {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	507 /* Append "as is" */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	508 xs_md5_append(&inState, songData, iRes);
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	509 }
92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	510
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	511 /* Free buffer */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	512 g_free(songData);
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	513
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	514 /* Append header data to hash */
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	515 #define XSADDHASH(QDATAB) { ib8[0] = (QDATAB & 0xff); ib8[1] = (QDATAB >> 8); xs_md5_append(&inState, (guint8 *) &ib8, sizeof(ib8)); }
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	516
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	517 XSADDHASH(psidH.initAddress)
385 7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	518 XSADDHASH(psidH.playAddress)
7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	519 XSADDHASH(psidH.nSongs)
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	520 #undef XSADDHASH
385 7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	521
7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	522 /* Append song speed data to hash */
7dc7e7dbbf90 Indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	523 i8 = 0;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	524 for (iIndex = 0; (iIndex < psidH.nSongs) && (iIndex < 32); iIndex++) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	525 i8 = (psidH.speed & (1 << iIndex)) ? 60 : 0;
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	526 xs_md5_append(&inState, &i8, sizeof(i8));
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	527 }
f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	528
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	529 /* Rest of songs (more than 32) */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	530 for (iIndex = 32; iIndex < psidH.nSongs; iIndex++) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	531 xs_md5_append(&inState, &i8, sizeof(i8));
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	532 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	533
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	534 /* PSIDv2NG specific */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	535 if (psidH.version == 2) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	536 /* SEE SIDPLAY HEADERS FOR INFO */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	537 i8 = (psidH2.flags >> 2) & 3;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	538 if (i8 == 2)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	539 xs_md5_append(&inState, &i8, sizeof(i8));
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	540 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	541
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	542 /* Calculate the hash */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	543 xs_md5_finish(&inState, hash);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	544
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	545 return 0;
14 f5d82424b0ed Made song-length database support FINALLY work! Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	546 }
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	547
4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	548
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	549 /* Get song lengths
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	550 */
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	551 t_xs_sldb_node xs_sldb_get(t_xs_sldb db, const gchar *pcFilename)
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	552 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	553 t_xs_sldb_node *pResult;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	554 t_xs_md5hash dbHash;
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	555
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	556 /* Get the hash and then look up from db */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	557 if (xs_get_sid_hash(pcFilename, dbHash) == 0)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	558 pResult = xs_sldb_get_node(db, dbHash);
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	559 else
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	560 pResult = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	561
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	562 return pResult;
4 4bb09e405eab Added new files for 0.8 Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563 }
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	564
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	565
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	566 /*
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	567 * These should be moved out of this module some day ...
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	568 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	569 static t_xs_sldb *xs_sldb_db = NULL;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	570 XS_MUTEX(xs_sldb_db);
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	571
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	572 gint xs_songlen_init(void)
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	573 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	574 XS_MUTEX_LOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	575
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	576 if (!xs_cfg.songlenDBPath) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	577 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	578 return -1;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	579 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	580
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	581 XS_MUTEX_LOCK(xs_sldb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	582
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	583 /* Check if already initialized */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	584 if (xs_sldb_db)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	585 xs_sldb_free(xs_sldb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	586
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	587 /* Allocate database */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	588 xs_sldb_db = (t_xs_sldb *) g_malloc0(sizeof(t_xs_sldb));
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	589 if (!xs_sldb_db) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	590 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	591 XS_MUTEX_UNLOCK(xs_sldb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	592 return -2;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	593 }
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	594
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	595 /* Read the database */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	596 if (xs_sldb_read(xs_sldb_db, xs_cfg.songlenDBPath) != 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	597 xs_sldb_free(xs_sldb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	598 xs_sldb_db = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	599 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	600 XS_MUTEX_UNLOCK(xs_sldb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	601 return -3;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	602 }
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	603
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	604 /* Create index */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	605 if (xs_sldb_index(xs_sldb_db) != 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	606 xs_sldb_free(xs_sldb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	607 xs_sldb_db = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	608 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	609 XS_MUTEX_UNLOCK(xs_sldb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	610 return -4;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	611 }
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	612
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	613 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	614 XS_MUTEX_UNLOCK(xs_sldb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	615 return 0;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	616 }
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	617
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	618
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	619 void xs_songlen_close(void)
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	620 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	621 XS_MUTEX_LOCK(xs_sldb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	622 xs_sldb_free(xs_sldb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	623 xs_sldb_db = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	624 XS_MUTEX_UNLOCK(xs_sldb_db);
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	625 }
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	626
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	627
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	628 t_xs_sldb_node xs_songlen_get(const gchar pcFilename)
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	629 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	630 t_xs_sldb_node *pResult;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	631
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	632 XS_MUTEX_LOCK(xs_sldb_db);
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	633
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	634 if (xs_cfg.songlenDBEnable && xs_sldb_db)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	635 pResult = xs_sldb_get(xs_sldb_db, pcFilename);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	636 else
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	637 pResult = NULL;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	638
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	639 XS_MUTEX_UNLOCK(xs_sldb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	640
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 332 diff changeset	641 return pResult;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	642 }

Mercurial > hg > xmms-sid

annotate src/xs_length.c @ 469:d600f45c92d2