sidinfo: sidlib.c annotate

annotate sidlib.c @ 203:b4a349f1c2f4

Actually fix the load address handling in hash calculation.

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 11 Dec 2018 02:38:53 +0200
parents	2dfe46fda09e
children	98563979859b

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>
169 da2fbfe18c60 Bump copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 166 diff changeset	4 * (C) Copyright 2014-2018 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
103 ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	11 #define SIDLIB_DB_MAGIC "SIDLibDB"
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	12 #define SIDLIB_DB_VERSION 0x0100
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	13
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	14
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	15 typedef struct
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	16 {
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	17 char magic[8]; // File magic ID
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	18 uint16_t version; // Version
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	19 uint32_t nnodes; // Number of song nodes
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	20 // struct {
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	21 // th_md5hash_t hash; // Hash for this SID file
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	22 // uint16_t nlengths; // Number of song (lengths)
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	23 // uint16_t length[nlengths]; // Length in seconds
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	24 // } * nnodes;
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	25 th_md5hash_t hash;
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	26 } PSIDLibHdr;
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	27
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	28
128 2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	29 BOOL si_fread_str(th_ioctx ctx, char *str, const size_t len)
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	30 {
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	31 char *tmp = th_malloc(len + 1);
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	32 if (tmp == NULL)
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	33 goto err;
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	34
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	35 if (!thfread_str(ctx, tmp, len))
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	36 goto err;
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 tmp[len] = 0;
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	39
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	40 *str = tmp;
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	41
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	42 return TRUE;
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	43
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	44 err:
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	45 th_free(tmp);
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	46 return FALSE;
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	47 }
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	48
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	49
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	50 static BOOL si_read_hash_data(th_ioctx ctx, PSIDHeader psid,
166 e6c8a235ce2f Fix the load address handling in case of new SLDB format. Matti Hamalainen <ccr@tnsp.org> parents: 163 diff changeset	51 th_md5state_t *state, const BOOL newSLDB)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	52 {
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	53 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	54 BOOL ret = FALSE, first = TRUE;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	55 size_t read;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	56
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	57 if ((data = (uint8_t *) th_malloc(PSID_BUFFER_SIZE)) == NULL)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	58 {
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	59 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	60 "Error allocating temporary data buffer of %d bytes.\n",
77 d14c82880141 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	61 PSID_BUFFER_SIZE);
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	62 goto error;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	63 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	64
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	65 psid->dataSize = 0;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	66 do
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	67 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	68 read = thfread(data, sizeof(uint8_t), PSID_BUFFER_SIZE, ctx);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	69 psid->dataSize += read;
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 // 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	72 if (first && psid->loadAddress == 0)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	73 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	74 if (read < 4)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	75 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	76 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	77 "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	78 goto error;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	79 }
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	80
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	81 // Grab the load address
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	82 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	83
203 b4a349f1c2f4 Actually fix the load address handling in hash calculation. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	84 // .. 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	85 if (newSLDB)
203 b4a349f1c2f4 Actually fix the load address handling in hash calculation. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	86 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	87 else
166 e6c8a235ce2f Fix the load address handling in case of new SLDB format. Matti Hamalainen <ccr@tnsp.org> parents: 163 diff changeset	88 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	89
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	90 first = FALSE;
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 else
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	93 if (read > 0)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	94 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	95 // Append data "as is"
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	96 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	97 }
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	98 } while (read > 0 && !thfeof(ctx));
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 ret = TRUE;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	101
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	102 error:
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	103 th_free(data);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	104 return ret;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	105 }
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	106
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	107
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	108 BOOL si_read_sid_file(th_ioctx ctx, PSIDHeader *ppsid, const BOOL newSLDB)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	109 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	110 PSIDHeader *psid = NULL;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	111 th_md5state_t state;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	112 BOOL ret = FALSE;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	113 off_t hdrStart, hdrEnd;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	114
126 c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	115 if ((psid = *ppsid = th_malloc0(sizeof(PSIDHeader))) == NULL)
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	116 {
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	117 th_io_error(ctx, THERR_MALLOC,
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	118 "Error PSID context struct.\n");
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	119 goto error;
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	120 }
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	121
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	122 hdrStart = thftell(ctx);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	123
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124 // Read PSID header in
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	125 if (!thfread_str(ctx, (uint8_t *) psid->magic, PSID_MAGIC_LEN) \|\|
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	126 !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	127 !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	128 !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	129 !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	130 !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	131 !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	132 !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	133 !thfread_be32(ctx, &psid->speed))
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	134 {
104 09ca9d9a8710 Change to match changed th_ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	135 th_io_error(ctx, ctx->status,
185 2dfe46fda09e Improve error handling through ioctx. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	136 "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	137 ctx->filename, th_error_str(ctx->status));
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138 goto error;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141 psid->magic[PSID_MAGIC_LEN] = 0;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143 if ((psid->magic[0] != 'R' && psid->magic[0] != 'P') \|\|
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144 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	145 psid->version < 1 \|\| psid->version > 4)
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	146 {
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	147 th_io_error(ctx, THERR_NOT_SUPPORTED,
185 2dfe46fda09e Improve error handling through ioctx. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	148 "Not a supported PSID or RSID file: %s\n",
2dfe46fda09e Improve error handling through ioctx. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	149 ctx->filename);
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	150 goto error;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	151 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	152
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	153 psid->isRSID = psid->magic[0] == 'R';
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	154
128 2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	155 if (!si_fread_str(ctx, &psid->sidName, PSID_STR_LEN) \|\|
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	156 !si_fread_str(ctx, &psid->sidAuthor, PSID_STR_LEN) \|\|
2636185649c6 Add si_fread_str() helper function. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	157 !si_fread_str(ctx, &psid->sidCopyright, PSID_STR_LEN))
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158 {
104 09ca9d9a8710 Change to match changed th_ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	159 th_io_error(ctx, ctx->status,
185 2dfe46fda09e Improve error handling through ioctx. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	160 "Error reading SID file header from '%s': %s.\n",
2dfe46fda09e Improve error handling through ioctx. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	161 ctx->filename, th_error_str(ctx->status));
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	162 goto error;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	164
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	165 // Check if we need to load PSIDv2NG header ...
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	166 if (psid->version >= 2)
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	167 {
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	168 // 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	169 if (!thfread_be16(ctx, &psid->flags) \|\|
98 d9f38d657433 Match with th-libs API change. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	170 !thfread_u8(ctx, &psid->startPage) \|\|
d9f38d657433 Match with th-libs API change. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	171 !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	172 !thfread_u8(ctx, &psid->sid2Addr) \|\|
9cfa0553e7f9 Add support for reading PSID/RSID v4 in sidlib. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	173 !thfread_u8(ctx, &psid->sid3Addr))
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	174 {
104 09ca9d9a8710 Change to match changed th_ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	175 th_io_error(ctx, ctx->status,
185 2dfe46fda09e Improve error handling through ioctx. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	176 "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	177 ctx->filename, th_error_str(ctx->status));
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	178 goto error;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	179 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	180 }
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 hdrEnd = thftell(ctx);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	183
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	184 // Initialize MD5-hash calculation
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	185 th_md5_init(&state);
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 if (newSLDB)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	188 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	189 // 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	190 // 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	191 thfseek(ctx, hdrStart, SEEK_SET);
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	192
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	193 if (!si_read_hash_data(ctx, psid, &state, FALSE))
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	194 goto error;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	195
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	196 psid->dataSize -= hdrEnd - hdrStart;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	197 }
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	198 else
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	199 {
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	200 // "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	201 // We need to separately hash data etc.
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	202 if (!si_read_hash_data(ctx, psid, &state, TRUE))
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	203 goto error;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	204
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	205 // Append header data to hash
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	206 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	207 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	208 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	209
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	210 // 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	211 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	212 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	213 {
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	214 if (psid->isRSID)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	215 tmp8 = 60;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	216 else
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	217 tmp8 = (psid->speed & (1 << index)) ? 60 : 0;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	218
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	219 th_md5_append(&state, &tmp8, sizeof(tmp8));
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	220 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	221
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	222 // 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	223 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	224 th_md5_append(&state, &tmp8, sizeof(tmp8));
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	225
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	226 // PSIDv2NG specific
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	227 if (psid->version >= 2)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	228 {
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	229 // 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	230 tmp8 = (psid->flags >> 2) & 3;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	231 if (tmp8 == 2)
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	232 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	233 }
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	234 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	235
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	236 // Calculate the hash
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	237 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	238 ret = TRUE;
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	239
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	240 error:
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	241 // Free buffer
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	242 return ret;
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	243 }
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	244
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	245
126 c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	246 void si_free_sid_file(PSIDHeader *psid)
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	247 {
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	248 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	249 {
c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	250 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	251 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	252 th_free(psid->sidCopyright);
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
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	257 const char *si_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
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 77 diff changeset	270 const char *si_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 //
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	285 static void si_sldb_node_free(SIDLibSLDBNode *node)
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 // Insert given node to db linked list
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	296 //
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	297 static void si_sldb_node_insert(SIDLibSLDB dbh, SIDLibSLDBNode node)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	298 {
170 2ba504fc8797 NULL checks. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	299 if (dbh->nodes != 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	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 node->prev = dbh->nodes->prev;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	302 dbh->nodes->prev->next = node;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	303 dbh->nodes->prev = node;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	304 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	305 else
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 dbh->nodes = node;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	308 node->prev = node;
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 node->next = NULL;
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
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	313
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	314 // 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	315 //
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	316 static int si_sldb_get_value(const char str, size_t pos)
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 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	319
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	320 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	321 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	322
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	323 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	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
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	326
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	327 static int si_sldb_gettime(const char str, size_t pos)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	328 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	329 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	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 // Check if it starts with a digit
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	332 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	333 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	334 // Get minutes-field
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	335 result = si_sldb_get_value(str, pos) * 60;
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 // 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	338 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	339 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	340 // 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	341 (*pos)++;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	342 result += si_sldb_get_value(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	343 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	344 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	345 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	346 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	347 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	348 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	349
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	350 // Ignore and skip the possible attributes
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	351 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	352 (*pos)++;
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	353
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 result;
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
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	358 // 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	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 SIDLibSLDBNode si_sldb_parse_entry(th_ioctx ctx, const char *line)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	361 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	362 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	363 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	364 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	365 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	366
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	367 // 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	368 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	369 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	370 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	371 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	372 "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	373 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	374 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	375
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	376 // Get hash value
160 27365eae837b Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	377 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	378 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	379 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	380 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	381 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	382 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	383
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	384 // 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	385 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	386 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	387 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	388 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	389 "'=' 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	390 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	391 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	392
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	393 // 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	394 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	395 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	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 // 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	398 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	399 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	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 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	402
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	403 if (si_sldb_gettime(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	404 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	405 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	406 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	407 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	408
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	409 // 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	410 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	411 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	412
99 29a080678091 Use th_calloc() here. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	413 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	414 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	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 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	417 "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	418 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	419 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	420
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	421 // 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	422 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	423 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	424 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	425 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	426 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	427
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	428 l = si_sldb_gettime(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	429 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	430 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	431 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	432 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	433 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	434
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	435 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	436
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	437 error:
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	438 si_sldb_node_free(node);
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	439 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	440 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	441
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	442
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	443 SIDLibSLDB * si_sldb_new(void)
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	444 {
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	445 return (SIDLibSLDB *) th_malloc0(sizeof(SIDLibSLDB));
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	446 }
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	447
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	448
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	449 // 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	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 int si_sldb_read(th_ioctx ctx, SIDLibSLDB dbh)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	452 {
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	453 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	454
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	455 if ((line = th_malloc(PSID_BUFFER_SIZE)) == NULL)
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	456 {
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	457 th_io_error(ctx, THERR_MALLOC,
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	458 "Error allocating temporary data buffer of %d bytes.\n",
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	459 PSID_BUFFER_SIZE);
104 09ca9d9a8710 Change to match changed th_ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	460 return ctx->status;
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	461 }
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	462
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	463 while (thfgets(line, PSID_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	464 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	465 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	466 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	467 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	468
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	469 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	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 // 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	472 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	473 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	474 // 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	475 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	476 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	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 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	479 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	480 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	481 "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	482 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	483 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	484 else
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 // Parse and add node to db
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	487 if ((tmnode = si_sldb_parse_entry(ctx, line)) != NULL)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	488 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	489 si_sldb_node_insert(dbh, tmnode);
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 else
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 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	494 "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	495 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	496 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	497 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	498 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	499 else
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	500 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	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 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	503 "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	504 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	505 }
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
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	508 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	509 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	510 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	511
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	512
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	513 // 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	514 // Return: 0 if equal
102 1362f00e4368 Rename function arguments. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	515 // negative if hash1 < hash2
1362f00e4368 Rename function arguments. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	516 // 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	517 //
102 1362f00e4368 Rename function arguments. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	518 static int si_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	519 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	520 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	521
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	522 for (i = delta = 0; i < TH_MD5HASH_LENGTH && !delta; i++)
102 1362f00e4368 Rename function arguments. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	523 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	524
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	525 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	526 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	527
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 // 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	530 // We assume here that we never ever get NULL-pointers.
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	531 static int si_sldb_compare_nodes(const void node1, const void node2)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	532 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	533 return si_sldb_compare_hash(
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	534 ((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	535 ((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	536 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	537
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	538
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	539 // (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	540 //
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	541 int si_sldb_build_index(SIDLibSLDB * dbh)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	542 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	543 SIDLibSLDBNode *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 // 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	546 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	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 // Get size of db
100 be62e4abe3a9 Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	549 for (node = dbh->nodes, dbh->nnodes = 0; node != NULL; node = node->next)
be62e4abe3a9 Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	550 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	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 // Check number of nodes
100 be62e4abe3a9 Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	553 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	554 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	555 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	556
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	557 // Allocate memory for index-table
100 be62e4abe3a9 Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	558 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	559 if (dbh->pindex == NULL)
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	560 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	561
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	562 // Get node-pointers to table
100 be62e4abe3a9 Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	563 for (i = 0, node = dbh->nodes; node && i < dbh->nnodes; 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	564 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	565
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	566 // Sort the indexes
100 be62e4abe3a9 Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	567 qsort(dbh->pindex, dbh->nnodes, sizeof(SIDLibSLDBNode *), si_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	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
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	570 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	571 }
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
103 ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	574 //
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	575 // Read binary format SLDB
ff6d1a9a2fde Move definitions to start of the file. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	576 //
101 9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	577 int si_sldb_read_bin(th_ioctx ctx, SIDLibSLDB dbh)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	578 {
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	579 PSIDLibHdr hdr;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	580 th_md5state_t state;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	581 th_md5hash_t hash;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	582 size_t n;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	583
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	584 // Check pointers
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	585 if (ctx == NULL \|\| dbh == NULL)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	586 return THERR_NULLPTR;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	587
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	588 if (!thfread_str(ctx, &hdr.magic, sizeof(hdr.magic)) \|\|
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	589 !thfread_le16(ctx, &hdr.version) \|\|
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	590 !thfread_le32(ctx, &hdr.nnodes))
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	591 return THERR_FREAD;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	592
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	593 // Check magic and version
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	594 if (memcmp(hdr.magic, SIDLIB_DB_MAGIC, sizeof(hdr.magic)) != 0)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	595 return THERR_NOT_SUPPORTED;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	596
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	597 if (hdr.version != SIDLIB_DB_VERSION)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	598 return THERR_NOT_SUPPORTED;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	599
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	600 // Make some reasonable assumptions about validity
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	601 if (hdr.nnodes == 0 \|\| hdr.nnodes > 256*1024)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	602 return THERR_INVALID_DATA;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	603
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	604 th_md5_init(&state);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	605 th_md5_append_ne16(&state, hdr.version);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	606 th_md5_append_ne32(&state, hdr.nnodes);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	607
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	608 // Allocate index
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	609 dbh->nnodes = hdr.nnodes;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	610 dbh->pindex = (SIDLibSLDBNode *) th_malloc(sizeof(SIDLibSLDBNode ) * dbh->nnodes);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	611 if (dbh->pindex == NULL)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	612 return THERR_MALLOC;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	613
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	614 // Read nodes
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	615 for (n = 0; n < dbh->nnodes; n++)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	616 {
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	617 SIDLibSLDBNode *node;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	618 th_md5hash_t mhash;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	619 uint16_t tmpn;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	620 int index;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	621
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	622 // Read node hash and nlengths
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	623 if (!thfread_str(ctx, mhash, TH_MD5HASH_LENGTH) \|\|
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	624 !thfread_le16(ctx, &tmpn))
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	625 return THERR_FREAD;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	626
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	627 // Sanity check
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	628 if (tmpn == 0 \|\| tmpn > 2048)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	629 return THERR_INVALID_DATA;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	630
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	631 // Append to hash
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	632 th_md5_append(&state, mhash, TH_MD5HASH_LENGTH);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	633 th_md5_append_ne16(&state, tmpn);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	634
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	635 // Allocate node
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	636 node = (SIDLibSLDBNode *) th_malloc0(sizeof(SIDLibSLDBNode));
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	637 if (node == NULL)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	638 return THERR_MALLOC;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	639
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	640 node->nlengths = tmpn;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	641 memcpy(node->hash, mhash, sizeof(mhash));
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	642
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	643 node->lengths = (int *) th_calloc(node->nlengths, sizeof(int));
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	644 if (node->lengths == NULL)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	645 {
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	646 th_free(node);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	647 th_io_error(ctx, THERR_MALLOC,
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	648 "Could not allocate memory for node.\n");
104 09ca9d9a8710 Change to match changed th_ioctx API. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	649 return ctx->status;
101 9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	650 }
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	651
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	652 // Read node lenghts
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	653 for (index = 0; index < node->nlengths; index++)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	654 {
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	655 uint16_t tmpl;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	656 if (!thfread_le16(ctx, &tmpl))
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	657 return THERR_FREAD;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	658
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	659 th_md5_append_ne16(&state, tmpl);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	660 node->lengths[index] = tmpl;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	661 }
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	662
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	663 si_sldb_node_insert(dbh, node);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	664 dbh->pindex[n] = node;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	665 }
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	666
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	667 // Read stored checksum hash
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	668 if (!thfread_str(ctx, hdr.hash, sizeof(hdr.hash)))
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	669 return THERR_FREAD;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	670
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	671 // Compare to what we get
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	672 th_md5_finish(&state, hash);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	673 if (memcmp(hash, hdr.hash, sizeof(hdr.hash)) != 0)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	674 return THERR_INVALID_DATA;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	675
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	676 return THERR_OK;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	677 }
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	678
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	679
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	680 int si_sldb_write_bin(th_ioctx ctx, SIDLibSLDB dbh)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	681 {
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	682 th_md5state_t state;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	683 th_md5hash_t hash;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	684 size_t n;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	685
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	686 // Check pointers
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	687 if (ctx == NULL \|\| dbh == NULL)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	688 return THERR_NULLPTR;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	689
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	690 // Write header
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	691 if (!thfwrite_str(ctx, SIDLIB_DB_MAGIC, 8) \|\|
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	692 !thfwrite_le16(ctx, SIDLIB_DB_VERSION) \|\|
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	693 !thfwrite_le32(ctx, dbh->nnodes))
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	694 return THERR_FWRITE;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	695
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	696 th_md5_init(&state);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	697 th_md5_append_ne16(&state, SIDLIB_DB_VERSION);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	698 th_md5_append_ne32(&state, dbh->nnodes);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	699
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	700 // Write nodes
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	701 for (n = 0; n < dbh->nnodes; n++)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	702 {
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	703 SIDLibSLDBNode *node = dbh->pindex[n];
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	704 uint16_t tmpn;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	705 int index;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	706
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	707 // Sanity check
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	708 if (node->nlengths <= 0 \|\| node->nlengths > 2048)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	709 return THERR_INVALID_DATA;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	710
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	711 tmpn = node->nlengths;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	712 th_md5_append(&state, node->hash, TH_MD5HASH_LENGTH);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	713 th_md5_append_ne16(&state, tmpn);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	714
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	715 // Write node data
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	716 if (!thfwrite_str(ctx, node->hash, TH_MD5HASH_LENGTH) \|\|
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	717 !thfwrite_le16(ctx, tmpn))
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	718 return THERR_FWRITE;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	719
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	720 for (index = 0; index < node->nlengths; index++)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	721 {
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	722 if (node->lengths[index] > 16378)
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	723 return THERR_INVALID_DATA;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	724
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	725 if (!thfwrite_le16(ctx, node->lengths[index]))
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	726 return THERR_FWRITE;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	727
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	728 th_md5_append_ne16(&state, node->lengths[index]);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	729 }
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	730 }
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	731
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	732 th_md5_finish(&state, hash);
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	733 if (!thfwrite_str(ctx, hash, sizeof(hash)))
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	734 return THERR_FWRITE;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	735
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	736 return THERR_OK;
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	737 }
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	738
9d4d1783800b Add si_sldb_{read,write}_bin() functions to write and read a binary format Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	739
86 e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	740 // 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	741 //
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	742 void si_sldb_free(SIDLibSLDB *dbh)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	743 {
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	744 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	745 {
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	746 SIDLibSLDBNode *node = dbh->nodes;
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	747 while (node != NULL)
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	748 {
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	749 SIDLibSLDBNode *next = node->next;
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	750 si_sldb_node_free(node);
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	751 node = next;
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	752 }
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	753
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	754 dbh->nodes = NULL;
100 be62e4abe3a9 Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	755 dbh->nnodes = 0;
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	756
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	757 th_free_r(&dbh->pindex);
c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	758 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	759 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	760 }
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	761
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	762
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	763 SIDLibSLDBNode si_sldb_get_by_hash(SIDLibSLDB dbh, th_md5hash_t hash)
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	764 {
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	765 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	766
88 c5ff71d64e53 More work on sidlib SLDB code. Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	767 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	768 key = &keyItem;
100 be62e4abe3a9 Rename a structure member. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	769 item = bsearch(&key, dbh->pindex, dbh->nnodes, sizeof(dbh->pindex[0]), si_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	770
e1ff9cd27a84 Initial port of songlength database (SLDB) handling code from XMMS-SID to here. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	771 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	772 }

Mercurial > hg > sidinfo

annotate sidlib.c @ 203:b4a349f1c2f4