sidinfo: sidlib.c annotate

annotate sidlib.c @ 232:03b6f8604a7f

Minor error handling improvements.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 04 Jan 2020 11:36:38 +0200
parents	bb8ce494267b
children	609bfc1bd628

rev	line source
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 * SIDInfoLib - Way too simplistic PSID/RSID file library
171 d86ade7d0dfd Change copyright blurbs slightly. Matti Hamalainen <ccr@tnsp.org> parents: 170 diff changeset	3 * Programmed and designed by Matti 'ccr' Hämäläinen <ccr@tnsp.org>
227 2b3d5d49086d Bump copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 226 diff changeset	4 * (C) Copyright 2014-2020 Tecnic Software productions (TNSP)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 */
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 #include "sidlib.h"
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 #include "th_endian.h"
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	8 #include "th_string.h"
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	11 BOOL sidlib_fread_str(th_ioctx ctx, char *str, const size_t len)
128 2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	12 {
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	13 char *tmp = th_malloc(len + 1);
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	14 if (tmp == NULL)
232 03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	15 {
03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	16 th_io_error(ctx, THERR_MALLOC,
03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	17 "Could not allocate %" PRIu_SIZE_T " bytes for a string.\n",
03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	18 len);
128 2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	19 goto err;
232 03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	20 }
128 2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	21
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	22 if (!thfread_str(ctx, tmp, len))
232 03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	23 {
03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	24 th_io_error(ctx, THERR_FREAD,
03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	25 "Could not read %" PRIu_SIZE_T " bytes from file.\n",
03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	26 len);
128 2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	27 goto err;
232 03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	28 }
128 2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	29
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	30 tmp[len] = 0;
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	31 *str = tmp;
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	32 return TRUE;
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	33
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	34 err:
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	35 th_free(tmp);
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	36 return FALSE;
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	37 }
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	38
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	39
226 c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	40 static BOOL sidlib_read_hash_data(th_ioctx ctx, SIDLibPSIDHeader psid,
166 e6c8a235ce2f Fix the load address handling in case of new SLDB format. Matti Hamalainen <ccr@tnsp.org> parents: 163 diff changeset	41 th_md5state_t *state, const BOOL newSLDB)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42 {
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	43 uint8_t *data = NULL;
166 e6c8a235ce2f Fix the load address handling in case of new SLDB format. Matti Hamalainen <ccr@tnsp.org> parents: 163 diff changeset	44 BOOL ret = FALSE, first = TRUE;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45 size_t read;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	46
230 1e860046a4cc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	47 if ((data = (uint8_t *) th_malloc(SIDLIB_BUFFER_SIZE)) == NULL)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	48 {
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	49 th_io_error(ctx, THERR_MALLOC,
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	50 "Error allocating temporary data buffer of %d bytes.\n",
230 1e860046a4cc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	51 SIDLIB_BUFFER_SIZE);
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	52 goto error;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	54
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	55 psid->dataSize = 0;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	56 do
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	57 {
230 1e860046a4cc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	58 read = thfread(data, sizeof(uint8_t), SIDLIB_BUFFER_SIZE, ctx);
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	59 psid->dataSize += read;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	60
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	61 // If load address is 0 in header and we have the first block, grab it
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	62 if (first && psid->loadAddress == 0)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	63 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	64 if (read < 4)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	65 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	66 th_io_error(ctx, THERR_FREAD,
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	67 "Error reading song data, unexpectedly small file.\n");
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	68 goto error;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	69 }
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	70
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	71 // Grab the load address
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	72 psid->loadAddress = TH_LE16_TO_NATIVE((uint16_t ) data);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	73
203 b4a349f1c2f4 Actually fix the load address handling in hash calculation. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	74 // .. do not include the load address to the hash if NEW SLDB format
166 e6c8a235ce2f Fix the load address handling in case of new SLDB format. Matti Hamalainen <ccr@tnsp.org> parents: 163 diff changeset	75 if (newSLDB)
203 b4a349f1c2f4 Actually fix the load address handling in hash calculation. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	76 th_md5_append(state, &data[2], read - 2);
b4a349f1c2f4 Actually fix the load address handling in hash calculation. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	77 else
166 e6c8a235ce2f Fix the load address handling in case of new SLDB format. Matti Hamalainen <ccr@tnsp.org> parents: 163 diff changeset	78 th_md5_append(state, data, read);
e6c8a235ce2f Fix the load address handling in case of new SLDB format. Matti Hamalainen <ccr@tnsp.org> parents: 163 diff changeset	79
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	80 first = FALSE;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	81 }
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	82 else
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	83 if (read > 0)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	84 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	85 // Append data "as is"
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	86 th_md5_append(state, data, read);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	87 }
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	88 } while (read > 0 && !thfeof(ctx));
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	89
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	90 ret = TRUE;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	91
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	92 error:
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	93 th_free(data);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	94 return ret;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	95 }
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	96
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	97
226 c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	98 BOOL sidlib_read_sid_file(th_ioctx ctx, SIDLibPSIDHeader psid, const BOOL newSLDB)
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	99 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	100 th_md5state_t state;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	101 BOOL ret = FALSE;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	102 off_t hdrStart, hdrEnd;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	103
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	104 hdrStart = thftell(ctx);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	105
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106 // Read PSID header in
223 a76276ff7ba8 Rename PSID_* constant defines to SIDLIB_PSID_. Matti Hamalainen <ccr@tnsp.org>* parents: 222 diff changeset	107 if (!thfread_str(ctx, (uint8_t *) psid->magic, SIDLIB_PSID_MAGIC_LEN) \|\|
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	108 !thfread_be16(ctx, &psid->version) \|\|
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	109 !thfread_be16(ctx, &psid->dataOffset) \|\|
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	110 !thfread_be16(ctx, &psid->loadAddress) \|\|
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	111 !thfread_be16(ctx, &psid->initAddress) \|\|
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	112 !thfread_be16(ctx, &psid->playAddress) \|\|
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	113 !thfread_be16(ctx, &psid->nSongs) \|\|
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	114 !thfread_be16(ctx, &psid->startSong) \|\|
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	115 !thfread_be32(ctx, &psid->speed))
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	116 {
104 09ca9d9a8710 Change to match changed th_ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	117 th_io_error(ctx, ctx->status,
185 2dfe46fda09e Improve error handling through ioctx. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	118 "Could not read PSID/RSID header from '%s': %s.\n",
2dfe46fda09e Improve error handling through ioctx. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	119 ctx->filename, th_error_str(ctx->status));
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	120 goto error;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	121 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	122
223 a76276ff7ba8 Rename PSID_* constant defines to SIDLIB_PSID_. Matti Hamalainen <ccr@tnsp.org>* parents: 222 diff changeset	123 psid->magic[SIDLIB_PSID_MAGIC_LEN] = 0;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	125 if ((psid->magic[0] != 'R' && psid->magic[0] != 'P') \|\|
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	126 psid->magic[1] != 'S' \|\| psid->magic[2] != 'I' \|\| psid->magic[3] != 'D' \|\|
133 9cfa0553e7f9 Add support for reading PSID/RSID v4 in sidlib. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	127 psid->version < 1 \|\| psid->version > 4)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128 {
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	129 th_io_error(ctx, THERR_NOT_SUPPORTED,
185 2dfe46fda09e Improve error handling through ioctx. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	130 "Not a supported PSID or RSID file: %s\n",
2dfe46fda09e Improve error handling through ioctx. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	131 ctx->filename);
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	132 goto error;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	133 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	134
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135 psid->isRSID = psid->magic[0] == 'R';
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	136
223 a76276ff7ba8 Rename PSID_* constant defines to SIDLIB_PSID_. Matti Hamalainen <ccr@tnsp.org>* parents: 222 diff changeset	137 if (!sidlib_fread_str(ctx, &psid->sidName, SIDLIB_PSID_STR_LEN) \|\|
a76276ff7ba8 Rename PSID_* constant defines to SIDLIB_PSID_. Matti Hamalainen <ccr@tnsp.org>* parents: 222 diff changeset	138 !sidlib_fread_str(ctx, &psid->sidAuthor, SIDLIB_PSID_STR_LEN) \|\|
a76276ff7ba8 Rename PSID_* constant defines to SIDLIB_PSID_. Matti Hamalainen <ccr@tnsp.org>* parents: 222 diff changeset	139 !sidlib_fread_str(ctx, &psid->sidCopyright, SIDLIB_PSID_STR_LEN))
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140 {
104 09ca9d9a8710 Change to match changed th_ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	141 th_io_error(ctx, ctx->status,
185 2dfe46fda09e Improve error handling through ioctx. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	142 "Error reading SID file header from '%s': %s.\n",
2dfe46fda09e Improve error handling through ioctx. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	143 ctx->filename, th_error_str(ctx->status));
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144 goto error;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	146
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	147 // Check if we need to load PSIDv2NG header ...
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	148 if (psid->version >= 2)
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	149 {
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	150 // Yes, we need to
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	151 if (!thfread_be16(ctx, &psid->flags) \|\|
98 d9f38d657433 Match with th-libs API change. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	152 !thfread_u8(ctx, &psid->startPage) \|\|
d9f38d657433 Match with th-libs API change. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	153 !thfread_u8(ctx, &psid->pageLength) \|\|
133 9cfa0553e7f9 Add support for reading PSID/RSID v4 in sidlib. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	154 !thfread_u8(ctx, &psid->sid2Addr) \|\|
9cfa0553e7f9 Add support for reading PSID/RSID v4 in sidlib. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	155 !thfread_u8(ctx, &psid->sid3Addr))
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156 {
104 09ca9d9a8710 Change to match changed th_ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	157 th_io_error(ctx, ctx->status,
185 2dfe46fda09e Improve error handling through ioctx. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	158 "Error reading PSID/RSID v2+ extra header data from '%s': %s.\n",
2dfe46fda09e Improve error handling through ioctx. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	159 ctx->filename, th_error_str(ctx->status));
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160 goto error;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	162 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	164 hdrEnd = thftell(ctx);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	165
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	166 // Initialize MD5-hash calculation
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	167 th_md5_init(&state);
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	168
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	169 if (newSLDB)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	170 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	171 // New Songlengths.md5 style hash calculation:
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	172 // We just hash the whole file, so seek back to beginning ..
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	173 thfseek(ctx, hdrStart, SEEK_SET);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	174
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	175 if (!sidlib_read_hash_data(ctx, psid, &state, FALSE))
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	176 goto error;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	177
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	178 psid->dataSize -= hdrEnd - hdrStart;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	179 }
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	180 else
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	181 {
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	182 // "Old" Songlengths.txt style MD5 hash calculation
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	183 // We need to separately hash data etc.
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	184 if (!sidlib_read_hash_data(ctx, psid, &state, TRUE))
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	185 goto error;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	186
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	187 // Append header data to hash
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	188 th_md5_append_le16(&state, psid->initAddress);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	189 th_md5_append_le16(&state, psid->playAddress);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	190 th_md5_append_le16(&state, psid->nSongs);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	191
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	192 // Append song speed data to hash
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	193 uint8_t tmp8 = psid->isRSID ? 60 : 0;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	194 for (int index = 0; index < psid->nSongs && index < 32; index++)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	195 {
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	196 if (psid->isRSID)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	197 tmp8 = 60;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	198 else
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	199 tmp8 = (psid->speed & (1 << index)) ? 60 : 0;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	200
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	201 th_md5_append(&state, &tmp8, sizeof(tmp8));
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	202 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	203
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	204 // Rest of songs (more than 32)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	205 for (int index = 32; index < psid->nSongs; index++)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	206 th_md5_append(&state, &tmp8, sizeof(tmp8));
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	207
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	208 // PSIDv2NG specific
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	209 if (psid->version >= 2)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	210 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	211 // REFER TO SIDPLAY HEADERS FOR MORE INFORMATION
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	212 tmp8 = (psid->flags >> 2) & 3;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	213 if (tmp8 == 2)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	214 th_md5_append(&state, &tmp8, sizeof(tmp8));
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	215 }
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	216 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	217
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	218 // Calculate the hash
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	219 th_md5_finish(&state, psid->hash);
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	220 ret = TRUE;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	221
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	222 error:
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	223 // Free buffer
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	224 return ret;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	225 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	226
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	227
226 c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	228 BOOL sidlib_read_sid_file_alloc(th_ioctx ctx, SIDLibPSIDHeader *ppsid, const BOOL newSLDB)
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	229 {
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	230 if ((*ppsid = th_malloc0(sizeof(SIDLibPSIDHeader))) == NULL)
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	231 {
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	232 th_io_error(ctx, THERR_MALLOC,
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	233 "Error allocating PSID context struct.\n");
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	234 return FALSE;
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	235 }
228 1962b236d596 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	236
226 c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	237 (*ppsid)->allocated = TRUE;
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	238
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	239 return sidlib_read_sid_file(ctx, *ppsid, newSLDB);
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	240 }
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	241
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	242
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	243 void sidlib_free_sid_file(SIDLibPSIDHeader *psid)
126 c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	244 {
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	245 if (psid != NULL)
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	246 {
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	247 th_free(psid->sidName);
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	248 th_free(psid->sidAuthor);
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	249 th_free(psid->sidCopyright);
228 1962b236d596 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	250
226 c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	251 if (psid->allocated)
c32015f4969e Rename PSIDHeader struct to SIDLibPSIDHeader to conform with the SIDLib Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	252 th_free(psid);
126 c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	253 }
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	254 }
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	255
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	256
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	257 const char *sidlib_get_sid_clock_str(const int flags)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	258 {
132 b3e034b8c4b9 Change how certain flags (for SID model and clock) are handled. Matti Hamalainen <ccr@tnsp.org> parents: 131 diff changeset	259 switch (flags)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	260 {
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	261 case PSF_CLOCK_UNKNOWN : return "Unknown";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	262 case PSF_CLOCK_PAL : return "PAL 50Hz";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	263 case PSF_CLOCK_NTSC : return "NTSC 60Hz";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	264 case PSF_CLOCK_ANY : return "PAL / NTSC";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	265 default : return "?";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	266 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	267 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	268
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	269
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	270 const char *sidlib_get_sid_model_str(const int flags)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	271 {
132 b3e034b8c4b9 Change how certain flags (for SID model and clock) are handled. Matti Hamalainen <ccr@tnsp.org> parents: 131 diff changeset	272 switch (flags)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	273 {
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	274 case PSF_MODEL_UNKNOWN : return "Unknown";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	275 case PSF_MODEL_MOS6581 : return "MOS6581";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	276 case PSF_MODEL_MOS8580 : return "MOS8580";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	277 case PSF_MODEL_ANY : return "MOS6581 / MOS8580";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	278 default : return "?";
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	279 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	280 }
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	281
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	282
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	283 // Free memory allocated for given SLDB node
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	284 //
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	285 static void sidlib_sldb_node_free(SIDLibSLDBNode *node)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	286 {
170 2ba504fc8797 NULL checks. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	287 if (node != NULL)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	288 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	289 th_free_r(&node->lengths);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	290 th_free_r(&node);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	291 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	292 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	293
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	294
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	295 // Parse a time-entry in SLDB format
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	296 //
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	297 static int sidlib_sldb_get_value(const char str, size_t pos)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	298 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	299 int result = 0;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	300
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	301 while (isdigit(str[*pos]))
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	302 result = (result * 10) + (str[(*pos)++] - '0');
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	303
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	304 return result;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	305 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	306
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	307
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	308 static int sidlib_sldb_gettime(const char str, size_t pos)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	309 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	310 int result;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	311
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	312 // Check if it starts with a digit
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	313 if (th_isdigit(str[*pos]))
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	314 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	315 // Get minutes-field
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	316 result = sidlib_sldb_get_value(str, pos) * 60;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	317
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	318 // Check the field separator char
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	319 if (str[*pos] == ':')
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	320 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	321 // Get seconds-field
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	322 (*pos)++;
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	323 result += sidlib_sldb_get_value(str, pos);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	324 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	325 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	326 result = -2;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	327 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	328 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	329 result = -1;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	330
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	331 // Ignore and skip the possible attributes
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	332 while (str[pos] && !th_isspace(str[pos]))
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	333 (*pos)++;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	334
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	335 return result;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	336 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	337
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	338
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	339 // Parse one SLDB definition line, return SLDB node
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	340 //
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	341 SIDLibSLDBNode sidlib_sldb_parse_entry(th_ioctx ctx, const char *line)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	342 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	343 SIDLibSLDBNode *node = NULL;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	344 size_t pos, tmpLen, savePos;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	345 BOOL isOK;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	346 int i;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	347
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	348 // Allocate new node
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	349 node = (SIDLibSLDBNode *) th_malloc0(sizeof(SIDLibSLDBNode));
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	350 if (node == NULL)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	351 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	352 th_io_error(ctx, THERR_MALLOC,
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	353 "Error allocating new node.\n");
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	354 return NULL;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	355 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	356
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	357 // Get hash value
160 27365eae837b Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	358 for (pos = 0, i = 0; i < TH_MD5HASH_LENGTH; i++, pos += 2)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	359 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	360 unsigned int tmpu;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	361 sscanf(&line[pos], "%2x", &tmpu);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	362 node->hash[i] = tmpu;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	363 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	364
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	365 // Get playtimes
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	366 th_findnext(line, &pos);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	367 if (line[pos] != '=')
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	368 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	369 th_io_error(ctx, THERR_INVALID_DATA,
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	370 "'=' expected on column #%d.\n", pos);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	371 goto error;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	372 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	373
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	374 // First playtime is after '='
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	375 savePos = ++pos;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	376 tmpLen = strlen(line);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	377
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	378 // Get number of sub-tune lengths
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	379 isOK = TRUE;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	380 while (pos < tmpLen && isOK)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	381 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	382 th_findnext(line, &pos);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	383
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	384 if (sidlib_sldb_gettime(line, &pos) >= 0)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	385 node->nlengths++;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	386 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	387 isOK = FALSE;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	388 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	389
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	390 // Allocate memory for lengths
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	391 if (node->nlengths == 0)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	392 goto error;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	393
99 29a080678091 Use th_calloc() here. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	394 node->lengths = (int *) th_calloc(node->nlengths, sizeof(int));
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	395 if (node->lengths == NULL)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	396 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	397 th_io_error(ctx, THERR_MALLOC,
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	398 "Could not allocate memory for node.\n");
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	399 goto error;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	400 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	401
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	402 // Read lengths in
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	403 for (i = 0, pos = savePos, isOK = TRUE;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	404 pos < tmpLen && i < node->nlengths && isOK; i++)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	405 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	406 int l;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	407 th_findnext(line, &pos);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	408
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	409 l = sidlib_sldb_gettime(line, &pos);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	410 if (l >= 0)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	411 node->lengths[i] = l;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	412 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	413 isOK = FALSE;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	414 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	415
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	416 return node;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	417
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	418 error:
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	419 sidlib_sldb_node_free(node);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	420 return NULL;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	421 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	422
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	423
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	424 SIDLibSLDB * sidlib_sldb_new(void)
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	425 {
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	426 return (SIDLibSLDB *) th_malloc0(sizeof(SIDLibSLDB));
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	427 }
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	428
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	429
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	430 // Read SLDB database to memory
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	431 //
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	432 int sidlib_sldb_read(th_ioctx ctx, SIDLibSLDB dbh)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	433 {
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	434 char *line = NULL;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	435
230 1e860046a4cc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	436 if ((line = th_malloc(SIDLIB_BUFFER_SIZE)) == NULL)
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	437 {
232 03b6f8604a7f Minor error handling improvements. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	438 return th_io_error(ctx, THERR_MALLOC,
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	439 "Error allocating temporary data buffer of %d bytes.\n",
230 1e860046a4cc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	440 SIDLIB_BUFFER_SIZE);
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	441 }
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	442
230 1e860046a4cc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	443 while (thfgets(line, SIDLIB_BUFFER_SIZE, ctx) != NULL)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	444 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	445 SIDLibSLDBNode *tmnode;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	446 size_t pos = 0;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	447 ctx->line++;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	448
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	449 th_findnext(line, &pos);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	450
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	451 // Check if it is datafield
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	452 if (th_isxdigit(line[pos]))
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	453 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	454 // Check the length of the hash
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	455 int hashLen;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	456 for (hashLen = 0; line[pos] && th_isxdigit(line[pos]); hashLen++, pos++);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	457
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	458 if (hashLen != TH_MD5HASH_LENGTH_CH)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	459 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	460 th_io_error(ctx, THERR_INVALID_DATA,
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	461 "Invalid MD5-hash in SongLengthDB file '%s' line #%d:\n%s\n",
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	462 ctx->filename, ctx->line, line);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	463 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	464 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	465 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	466 // Parse and add node to db
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	467 if ((tmnode = sidlib_sldb_parse_entry(ctx, line)) != NULL)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	468 {
224 4bec78f45188 Use th_datastruct::th_llist_t instead of yet another linked list Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	469 th_llist_append_node((th_llist_t *) &dbh->nodes, (th_llist_t ) tmnode);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	470 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	471 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	472 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	473 th_io_error(ctx, THERR_INVALID_DATA,
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	474 "Invalid entry in SongLengthDB file '%s' line #%d:\n%s\n",
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	475 ctx->filename, ctx->line, line);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	476 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	477 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	478 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	479 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	480 if (line[pos] != ';' && line[pos] != '[' && line[pos] != 0)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	481 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	482 th_io_error(ctx, THERR_INVALID_DATA,
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	483 "Invalid line in SongLengthDB file '%s' line #%d:\n%s\n",
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	484 ctx->filename, ctx->line, line);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	485 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	486 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	487
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	488 th_free(line);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	489 return THERR_OK;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	490 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	491
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	492
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	493 // Compare two given MD5-hashes.
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	494 // Return: 0 if equal
102 1362f00e4368 Rename function arguments. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	495 // negative if hash1 < hash2
1362f00e4368 Rename function arguments. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	496 // positive if hash1 > hash2
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	497 //
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	498 static int sidlib_sldb_compare_hash(th_md5hash_t hash1, th_md5hash_t hash2)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	499 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	500 int i, delta;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	501
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	502 for (i = delta = 0; i < TH_MD5HASH_LENGTH && !delta; i++)
102 1362f00e4368 Rename function arguments. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	503 delta = hash1[i] - hash2[i];
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	504
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	505 return delta;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	506 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	507
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	508
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	509 // Compare two nodes.
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	510 // We assume here that we never ever get NULL-pointers.
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	511 static int sidlib_sldb_compare_nodes(const void node1, const void node2)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	512 {
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	513 return sidlib_sldb_compare_hash(
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	514 ((SIDLibSLDBNode *) node1)->hash,
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	515 ((SIDLibSLDBNode *) node2)->hash);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	516 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	517
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	518
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	519 // (Re)create index
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	520 //
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	521 int sidlib_sldb_build_index(SIDLibSLDB * dbh)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	522 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	523 // Free old index
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	524 th_free_r(&dbh->pindex);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	525
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	526 // Get size of db
224 4bec78f45188 Use th_datastruct::th_llist_t instead of yet another linked list Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	527 dbh->nnodes = th_llist_length((th_llist_t *) dbh->nodes);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	528
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	529 // Check number of nodes
100 be62e4abe3a9 Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	530 if (dbh->nnodes > 0)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	531 {
224 4bec78f45188 Use th_datastruct::th_llist_t instead of yet another linked list Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	532 SIDLibSLDBNode *node;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	533 size_t i;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	534
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	535 // Allocate memory for index-table
100 be62e4abe3a9 Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	536 dbh->pindex = (SIDLibSLDBNode *) th_malloc(sizeof(SIDLibSLDBNode ) * dbh->nnodes);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	537 if (dbh->pindex == NULL)
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	538 return THERR_MALLOC;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	539
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	540 // Get node-pointers to table
224 4bec78f45188 Use th_datastruct::th_llist_t instead of yet another linked list Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	541 for (i = 0, node = dbh->nodes; node != NULL && i < dbh->nnodes;
4bec78f45188 Use th_datastruct::th_llist_t instead of yet another linked list Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	542 node = (SIDLibSLDBNode *) node->node.next)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	543 dbh->pindex[i++] = node;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	544
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	545 // Sort the indexes
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	546 qsort(dbh->pindex, dbh->nnodes, sizeof(SIDLibSLDBNode *), sidlib_sldb_compare_nodes);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	547 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	548
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	549 return THERR_OK;
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	550 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	551
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	552
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	553 // Free a given song-length database
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	554 //
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	555 void sidlib_sldb_free(SIDLibSLDB *dbh)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	556 {
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	557 if (dbh != NULL)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	558 {
224 4bec78f45188 Use th_datastruct::th_llist_t instead of yet another linked list Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	559 th_llist_free_func((th_llist_t *) dbh->nodes,
4bec78f45188 Use th_datastruct::th_llist_t instead of yet another linked list Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	560 (void ()(void )) sidlib_sldb_node_free);
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	561
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	562 dbh->nodes = NULL;
100 be62e4abe3a9 Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	563 dbh->nnodes = 0;
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	564
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	565 th_free_r(&dbh->pindex);
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	566 th_free(dbh);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	567 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	568 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	569
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	570
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	571 SIDLibSLDBNode sidlib_sldb_get_by_hash(SIDLibSLDB dbh, th_md5hash_t hash)
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	572 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	573 SIDLibSLDBNode keyItem, key, *item;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	574
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	575 memcpy(&keyItem.hash, hash, sizeof(th_md5hash_t));
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	576 key = &keyItem;
222 3a01518fffe0 Rename sidlib functions from si_* prefix to sidlib_. Matti Hamalainen <ccr@tnsp.org>* parents: 221 diff changeset	577 item = bsearch(&key, dbh->pindex, dbh->nnodes, sizeof(dbh->pindex[0]), sidlib_sldb_compare_nodes);
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	578
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	579 return (item != NULL) ? *item : NULL;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	580 }

Mercurial > hg > sidinfo

annotate sidlib.c @ 232:03b6f8604a7f