xmms-sid: src/xs_stil.c annotate

annotate src/xs_stil.c @ 402:f997b79a7251

More work on merging of improved STIL/SLDB handling code with completely dynamic memory allocation.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 01 Jun 2006 02:18:02 +0000
parents	b571000e1f8c
children	7f694e5a1493

rev	line source
1 183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
103 fe83646e6baa Changed plrFillBuffer()-functions to return actual number of samples computed. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	2 XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
1 183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3
103 fe83646e6baa Changed plrFillBuffer()-functions to return actual number of samples computed. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	4 STIL-database handling functions
1 183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5
324 dd201740a720 Changed copyright text. Matti Hamalainen <ccr@tnsp.org> parents: 252 diff changeset	6 Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
dd201740a720 Changed copyright text. Matti Hamalainen <ccr@tnsp.org> parents: 252 diff changeset	7 (C) Copyright 1999-2005 Tecnic Software productions (TNSP)
1 183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8
183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 This program is free software; you can redistribute it and/or modify
183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10 it under the terms of the GNU General Public License as published by
183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11 the Free Software Foundation; either version 2 of the License, or
183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	12 (at your option) any later version.
183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13
183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14 This program is distributed in the hope that it will be useful,
183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	15 but WITHOUT ANY WARRANTY; without even the implied warranty of
183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	17 GNU General Public License for more details.
183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	18
183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	19 You should have received a copy of the GNU General Public License
183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	20 along with this program; if not, write to the Free Software
183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	21 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22 */
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	23 #include "xs_stil.h"
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	24 #include "xs_support.h"
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	25 #include "xs_config.h"
1 183e7cbc1036 Initial revision Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	26 #include <stdio.h>
223 16e3b2446a73 On some systems stdlib.h has prerequisite of stdio.h, corrected order of Matti Hamalainen <ccr@tnsp.org> parents: 214 diff changeset	27 #include <stdlib.h>
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	28 #include <ctype.h>
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	29 #include <stdarg.h>
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	30
103 fe83646e6baa Changed plrFillBuffer()-functions to return actual number of samples computed. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	31
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	32 /* Database handling functions
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	33 */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	34 static gboolean xs_stildb_node_realloc(t_xs_stil_node *pNode, gint nsubTunes)
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	35 {
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	36 if (!pNode) return FALSE;
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	37
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	38 /* Re-allocate subTune structure if needed */
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	39 if (nsubTunes >= pNode->nsubTunes) {
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	40 pNode->subTunes =
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	41 (t_xs_stil_subnode **) g_realloc(pNode->subTunes,
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	42 (nsubTunes + 1) * sizeof(t_xs_stil_subnode **));
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	43
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 395 diff changeset	44 if (!pNode->subTunes) {
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 395 diff changeset	45 xs_error("SubTune pointer structure realloc failed.\n");
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	46 return FALSE;
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 395 diff changeset	47 }
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	48
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	49 /* Clear the newly allocated memory */
395 b571000e1f8c Use xs_memset() instead of memset() Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	50 xs_memset(&(pNode->subTunes[pNode->nsubTunes]), 0,
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	51 (nsubTunes + 1 - pNode->nsubTunes) *
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	52 sizeof(t_xs_stil_subnode **));
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 395 diff changeset	53
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 395 diff changeset	54 pNode->nsubTunes = nsubTunes + 1;
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	55 }
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 395 diff changeset	56
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	57 /* Allocate memory for subTune */
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	58 if (!pNode->subTunes[nsubTunes]) {
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	59 pNode->subTunes[nsubTunes] = (t_xs_stil_subnode *)
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	60 g_malloc0(sizeof(t_xs_stil_subnode));
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	61
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 395 diff changeset	62 if (!pNode->subTunes[nsubTunes]) {
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 395 diff changeset	63 xs_error("SubTune structure malloc failed!\n");
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	64 return FALSE;
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 395 diff changeset	65 }
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	66 }
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	67
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	68 return TRUE;
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	69 }
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	70
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	71
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	72 static void xs_stildb_node_free(t_xs_stil_node *pNode)
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	73 {
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	74 gint i;
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	75 t_xs_stil_subnode *pSub;
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	76
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	77 if (pNode) {
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	78 /* Free subtune information */
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	79 for (i = 0; i < pNode->nsubTunes; i++) {
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	80 pSub = pNode->subTunes[i];
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	81 if (pSub) {
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	82 g_free(pSub->pName);
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	83 g_free(pSub->pAuthor);
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	84 g_free(pSub->pInfo);
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	85
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	86 g_free(pSub);
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	87 }
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	88 }
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	89
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	90 g_free(pNode->subTunes);
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	91 g_free(pNode->pcFilename);
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	92 g_free(pNode);
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	93 }
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	94 }
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	95
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	96
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	97 static t_xs_stil_node xs_stildb_node_new(gchar pcFilename)
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	98 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	99 t_xs_stil_node *pResult;
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	100
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	101 /* Allocate memory for new node */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	102 pResult = (t_xs_stil_node *) g_malloc0(sizeof(t_xs_stil_node));
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	103 if (!pResult)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	104 return NULL;
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	105
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	106 /* Allocate filename and initial space for one subtune */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	107 pResult->pcFilename = g_strdup(pcFilename);
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	108 if (!pResult->pcFilename \|\| !xs_stildb_node_realloc(pResult, 1)) {
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	109 xs_stildb_node_free(pResult);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	110 return NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	111 }
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	112
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	113 return pResult;
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	114 }
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	115
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	116
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	117 /* Insert given node to db linked list
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	118 */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	119 static void xs_stildb_node_insert(t_xs_stildb db, t_xs_stil_node pNode)
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	120 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	121 assert(db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	122
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	123 if (db->pNodes) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	124 /* The first node's pPrev points to last node */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	125 LPREV = db->pNodes->pPrev; /* New node's prev = Previous last node */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	126 db->pNodes->pPrev->pNext = pNode; /* Previous last node's next = New node */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	127 db->pNodes->pPrev = pNode; /* New last node = New node */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	128 LNEXT = NULL; /* But next is NULL! */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	129 } else {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	130 db->pNodes = pNode; /* First node ... */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	131 LPREV = pNode; /* ... it's also last */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	132 LNEXT = NULL; /* But next is NULL! */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	133 }
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	134 }
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	135
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	136
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	137 /* Read database (additively) to given db-structure
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	138 */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	139 #define XS_STILDB_MULTI \
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	140 if (isMulti) { \
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	141 isMulti = FALSE; \
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	142 xs_pstrcat(&(tmpNode->subTunes[subEntry]->pInfo), "\n");\
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	143 }
240 f436e16fa6d9 Fixed cosmetic bug in handling of multi-line fields (COMMENT). Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	144
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	145 void XS_STILDB_ERR(gint lineNum, gchar inLine, const char fmt, ...)
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	146 {
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	147 va_list ap;
240 f436e16fa6d9 Fixed cosmetic bug in handling of multi-line fields (COMMENT). Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	148
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	149 va_start(ap, fmt);
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	150 xs_error(fmt, ap);
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	151 va_end(ap);
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	152
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	153 fprintf(stderr, "#%d: '%s'\n", lineNum, inLine);
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	154 }
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	155
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	156 gint xs_stildb_read(t_xs_stildb db, gchar dbFilename)
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	157 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	158 FILE *inFile;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	159 gchar inLine[XS_BUF_SIZE + 16]; /* Since we add some chars here and there */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	160 guint lineNum, linePos, eolPos;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	161 t_xs_stil_node *tmpNode;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	162 gboolean isError, isMulti;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	163 gint subEntry;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	164 assert(db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	165
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	166 /* Try to open the file */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	167 if ((inFile = fopen(dbFilename, "ra")) == NULL) {
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	168 xs_error("Could not open STILDB '%s'\n", dbFilename);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	169 return -1;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	170 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	171
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	172 /* Read and parse the data */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	173 lineNum = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	174 isError = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	175 isMulti = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	176 tmpNode = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	177 subEntry = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	178
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	179 while (!feof(inFile) && !isError) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	180 fgets(inLine, XS_BUF_SIZE, inFile);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	181 inLine[XS_BUF_SIZE - 1] = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	182 linePos = eolPos = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	183 xs_findeol(inLine, &eolPos);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	184 inLine[eolPos] = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	185 lineNum++;
103 fe83646e6baa Changed plrFillBuffer()-functions to return actual number of samples computed. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	186
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	187 switch (inLine[0]) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	188 case '/':
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	189 /* Check if we are already parsing entry */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	190 isMulti = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	191 if (tmpNode) {
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	192 XS_STILDB_ERR(lineNum, inLine,
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	193 "New entry found before end of current ('%s')!\n",
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	194 tmpNode->pcFilename);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	195 xs_stildb_node_free(tmpNode);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	196 }
109 578b71b62eeb Fileinfo now basically working, STIL COMMENT-fields are not yet parsed or shown. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	197
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	198 /* A new node */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	199 subEntry = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	200 tmpNode = xs_stildb_node_new(inLine);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	201 if (!tmpNode) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	202 /* Allocation failed */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	203 XS_STILDB_ERR(lineNum, inLine,
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	204 "Could not allocate new STILdb-node!\n");
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	205 isError = TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	206 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	207 break;
103 fe83646e6baa Changed plrFillBuffer()-functions to return actual number of samples computed. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	208
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	209 case '(':
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	210 /* A new sub-entry */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	211 isMulti = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	212 linePos++;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	213 if (inLine[linePos] == '#') {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	214 linePos++;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	215 if (inLine[linePos]) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	216 xs_findnum(inLine, &linePos);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	217 inLine[linePos] = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	218 subEntry = atol(&inLine[2]);
109 578b71b62eeb Fileinfo now basically working, STIL COMMENT-fields are not yet parsed or shown. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	219
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	220 /* Sanity check */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	221 if (subEntry < 1) {
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	222 XS_STILDB_ERR(lineNum, inLine,
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	223 "Number of subEntry (%i) for '%s' is invalid\n",
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	224 subEntry, tmpNode->pcFilename);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	225 subEntry = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	226 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	227 }
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	228 } else {
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	229 XS_STILDB_ERR(lineNum, inLine,
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	230 "Syntax error, expected subEntry number.\n");
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	231 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	232
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	233 break;
109 578b71b62eeb Fileinfo now basically working, STIL COMMENT-fields are not yet parsed or shown. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	234
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	235 case 0:
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	236 case '#':
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	237 case '\n':
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	238 case '\r':
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	239 /* End of entry/field */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	240 isMulti = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	241 if (tmpNode) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	242 /* Insert to database */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	243 xs_stildb_node_insert(db, tmpNode);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	244 tmpNode = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	245 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	246 break;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	247
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	248 default:
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	249 /* Check if we are parsing an entry */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	250 if (!tmpNode) {
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	251 XS_STILDB_ERR(lineNum, inLine,
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	252 "Entry data encountered outside of entry or syntax error!\n");
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	253 break;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	254 }
117 453ac1293f6a Fixed severe bug in xs_strmcat() Matti Hamalainen <ccr@tnsp.org> parents: 110 diff changeset	255
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 395 diff changeset	256 if (!xs_stildb_node_realloc(tmpNode, subEntry)) {
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	257 XS_STILDB_ERR(lineNum, inLine,
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	258 "Could not (re)allocate memory for subEntries!\n");
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	259 isError = TRUE;
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	260 break;
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	261 }
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	262
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	263 /* Some other type */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	264 if (strncmp(inLine, " NAME:", 8) == 0) {
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	265 XS_STILDB_MULTI;
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	266 g_free(tmpNode->subTunes[subEntry]->pName);
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	267 tmpNode->subTunes[subEntry]->pName = g_strdup(&inLine[9]);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	268 } else if (strncmp(inLine, " AUTHOR:", 8) == 0) {
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	269 XS_STILDB_MULTI;
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	270 g_free(tmpNode->subTunes[subEntry]->pAuthor);
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	271 tmpNode->subTunes[subEntry]->pAuthor = g_strdup(&inLine[9]);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	272 } else if (strncmp(inLine, " TITLE:", 8) == 0) {
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	273 XS_STILDB_MULTI;
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 395 diff changeset	274 isMulti = TRUE;
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	275 xs_pstrcat(&(tmpNode->subTunes[subEntry]->pInfo), &inLine[2]);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	276 } else if (strncmp(inLine, " ARTIST:", 8) == 0) {
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	277 XS_STILDB_MULTI;
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 395 diff changeset	278 isMulti = TRUE;
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	279 xs_pstrcat(&(tmpNode->subTunes[subEntry]->pInfo), &inLine[1]);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	280 } else if (strncmp(inLine, "COMMENT:", 8) == 0) {
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	281 XS_STILDB_MULTI;
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	282 isMulti = TRUE;
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	283 xs_pstrcat(&(tmpNode->subTunes[subEntry]->pInfo), inLine);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	284 } else if (strncmp(inLine, " ", 8) == 0) {
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	285 if (isMulti) {
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	286 xs_pstrcat(&(tmpNode->subTunes[subEntry]->pInfo), &inLine[8]);
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	287 } else {
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	288 XS_STILDB_ERR(lineNum, inLine,
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	289 "Entry continuation found when isMulti == FALSE.\n");
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	290 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	291 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	292 break;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	293 }
240 f436e16fa6d9 Fixed cosmetic bug in handling of multi-line fields (COMMENT). Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	294
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	295 } /* while */
240 f436e16fa6d9 Fixed cosmetic bug in handling of multi-line fields (COMMENT). Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	296
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	297 /* Check if there is one remaining node */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	298 if (tmpNode)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	299 xs_stildb_node_insert(db, tmpNode);
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	300
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	301 /* Close the file */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	302 fclose(inFile);
109 578b71b62eeb Fileinfo now basically working, STIL COMMENT-fields are not yet parsed or shown. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	303
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	304 return 0;
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	305 }
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	306
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	307
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	308 /* Compare two nodes
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	309 */
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	310 static gint xs_stildb_cmp(const void pNode1, const void pNode2)
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	311 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	312 /* We assume here that we never ever get NULL-pointers or similar */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	313 return strcmp(
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	314 ((t_xs_stil_node *) pNode1)->pcFilename,
b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	315 ((t_xs_stil_node *) pNode2)->pcFilename);
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	316 }
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	317
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	318
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	319 /* (Re)create index
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	320 */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	321 gint xs_stildb_index(t_xs_stildb *db)
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	322 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	323 t_xs_stil_node *pCurr;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	324 gint i;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	325
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	326 /* Free old index */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	327 if (db->ppIndex) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	328 g_free(db->ppIndex);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	329 db->ppIndex = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	330 }
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	331
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	332 /* Get size of db */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	333 pCurr = db->pNodes;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	334 db->n = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	335 while (pCurr) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	336 db->n++;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	337 pCurr = pCurr->pNext;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	338 }
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	339
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	340 /* Check number of nodes */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	341 if (db->n > 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	342 /* Allocate memory for index-table */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	343 db->ppIndex = (t_xs_stil_node *) g_malloc(sizeof(t_xs_stil_node ) * db->n);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	344 if (!db->ppIndex)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	345 return -1;
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	346
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	347 /* Get node-pointers to table */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	348 i = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	349 pCurr = db->pNodes;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	350 while (pCurr && (i < db->n)) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	351 db->ppIndex[i++] = pCurr;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	352 pCurr = pCurr->pNext;
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	353 }
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	354
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	355 /* Sort the indexes */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	356 qsort(db->ppIndex, db->n, sizeof(t_xs_stil_node *), xs_stildb_cmp);
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	357 }
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	358
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	359 return 0;
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	360 }
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	361
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	362
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	363 /* Free a given STIL database
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	364 */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	365 void xs_stildb_free(t_xs_stildb *db)
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	366 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	367 t_xs_stil_node pCurr, pNext;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	368
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	369 if (!db)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	370 return;
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	371
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	372 /* Free the memory allocated for nodes */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	373 pCurr = db->pNodes;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	374 while (pCurr) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	375 pNext = pCurr->pNext;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	376 xs_stildb_node_free(pCurr);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	377 pCurr = pNext;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	378 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	379
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	380 db->pNodes = NULL;
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	381
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	382 /* Free memory allocated for index */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	383 if (db->ppIndex) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	384 g_free(db->ppIndex);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	385 db->ppIndex = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	386 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	387
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	388 /* Free structure */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	389 db->n = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	390 g_free(db);
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	391 }
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	392
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	393
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	394 /* Get STIL information node from database
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	395 */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	396 static t_xs_stil_node xs_stildb_get_node(t_xs_stildb db, gchar *pcFilename)
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	397 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	398 gint iStartNode, iEndNode, iQNode, r, i;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	399 gboolean iFound;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	400 t_xs_stil_node *pResult;
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	401
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	402 /* Check the database pointers */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	403 if (!db \|\| !db->pNodes \|\| !db->ppIndex)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	404 return NULL;
109 578b71b62eeb Fileinfo now basically working, STIL COMMENT-fields are not yet parsed or shown. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	405
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	406 /* Look-up via index using binary search */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	407 pResult = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	408 iStartNode = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	409 iEndNode = (db->n - 1);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	410 iQNode = (iEndNode / 2);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	411 iFound = FALSE;
109 578b71b62eeb Fileinfo now basically working, STIL COMMENT-fields are not yet parsed or shown. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	412
369 4611f1194941 Make binary search bailout value a #define in xmms-sid.h Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	413 while ((!iFound) && ((iEndNode - iStartNode) > XS_BIN_BAILOUT)) {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	414 r = strcmp(pcFilename, db->ppIndex[iQNode]->pcFilename);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	415 if (r < 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	416 /* Hash was in the <- LEFT side */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	417 iEndNode = iQNode;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	418 iQNode = iStartNode + ((iEndNode - iStartNode) / 2);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	419 } else if (r > 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	420 /* Hash was in the RIGHT -> side */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	421 iStartNode = iQNode;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	422 iQNode = iStartNode + ((iEndNode - iStartNode) / 2);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	423 } else
109 578b71b62eeb Fileinfo now basically working, STIL COMMENT-fields are not yet parsed or shown. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	424 iFound = TRUE;
578b71b62eeb Fileinfo now basically working, STIL COMMENT-fields are not yet parsed or shown. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	425 }
578b71b62eeb Fileinfo now basically working, STIL COMMENT-fields are not yet parsed or shown. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	426
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	427 /* If not found already */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	428 if (!iFound) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	429 /* Search the are linearly */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	430 iFound = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	431 i = iStartNode;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	432 while ((i <= iEndNode) && (!iFound)) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	433 if (strcmp(pcFilename, db->ppIndex[i]->pcFilename) == 0)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	434 iFound = TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	435 else
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	436 i++;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	437 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	438
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	439 /* Check the result */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	440 if (iFound)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	441 pResult = db->ppIndex[i];
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	442
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	443 } else {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	444 /* Found via binary search */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	445 pResult = db->ppIndex[iQNode];
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	446 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	447
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	448 return pResult;
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	449 }
109 578b71b62eeb Fileinfo now basically working, STIL COMMENT-fields are not yet parsed or shown. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	450
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	451
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	452 /*
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	453 * These should be moved out of this module some day ...
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	454 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	455 static t_xs_stildb *xs_stildb_db = NULL;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	456 XS_MUTEX(xs_stildb_db);
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	457
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	458 gint xs_stil_init(void)
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	459 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	460 XS_MUTEX_LOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	461
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	462 if (!xs_cfg.stilDBPath) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	463 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	464 return -1;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	465 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	466
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	467 XS_MUTEX_LOCK(xs_stildb_db);
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	468
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	469 /* Check if already initialized */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	470 if (xs_stildb_db)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	471 xs_stildb_free(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	472
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	473 /* Allocate database */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	474 xs_stildb_db = (t_xs_stildb *) g_malloc0(sizeof(t_xs_stildb));
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	475 if (!xs_stildb_db) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	476 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	477 XS_MUTEX_UNLOCK(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	478 return -2;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	479 }
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	480
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	481 /* Read the database */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	482 if (xs_stildb_read(xs_stildb_db, xs_cfg.stilDBPath) != 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	483 xs_stildb_free(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	484 xs_stildb_db = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	485 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	486 XS_MUTEX_UNLOCK(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	487 return -3;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	488 }
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	489
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	490 /* Create index */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	491 if (xs_stildb_index(xs_stildb_db) != 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	492 xs_stildb_free(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	493 xs_stildb_db = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	494 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	495 XS_MUTEX_UNLOCK(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	496 return -4;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	497 }
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	498
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	499 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	500 XS_MUTEX_UNLOCK(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	501 return 0;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	502 }
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	503
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	504
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	505 void xs_stil_close(void)
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	506 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	507 XS_MUTEX_LOCK(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	508 xs_stildb_free(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	509 xs_stildb_db = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	510 XS_MUTEX_UNLOCK(xs_stildb_db);
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	511 }
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	512
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	513
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 369 diff changeset	514 t_xs_stil_node xs_stil_get(gchar pcFilename)
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	515 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	516 t_xs_stil_node *pResult;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	517 gchar *tmpFilename;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	518
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	519 XS_MUTEX_LOCK(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	520 XS_MUTEX_LOCK(xs_cfg);
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	521
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	522 if (xs_cfg.stilDBEnable && xs_stildb_db) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	523 if (xs_cfg.hvscPath) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	524 /* Remove postfixed directory separator from HVSC-path */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	525 tmpFilename = xs_strrchr(xs_cfg.hvscPath, '/');
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	526 if (tmpFilename && (tmpFilename[1] == 0))
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	527 tmpFilename[0] = 0;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	528
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	529 /* Remove HVSC location-prefix from filename */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	530 tmpFilename = strstr(pcFilename, xs_cfg.hvscPath);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	531 if (tmpFilename)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	532 tmpFilename += strlen(xs_cfg.hvscPath);
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	533 else
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	534 tmpFilename = pcFilename;
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	535 } else
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	536 tmpFilename = pcFilename;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	537
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	538 pResult = xs_stildb_get_node(xs_stildb_db, tmpFilename);
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	539 } else
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	540 pResult = NULL;
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	541
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	542 XS_MUTEX_UNLOCK(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	543 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	544
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	545 return pResult;
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	546 }

Mercurial > hg > xmms-sid

annotate src/xs_stil.c @ 402:f997b79a7251