xmms-sid: src/xs_stil.c annotate

annotate src/xs_stil.c @ 359:b1a858b8cb1a

Re-indentation all (non-generated) code.

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 07 Nov 2005 09:50:04 +0000
parents	e0abd282d6b7
children	4611f1194941

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>
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	29
103 fe83646e6baa Changed plrFillBuffer()-functions to return actual number of samples computed. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	30
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	31 /* Database handling functions
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	32 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	33 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	34 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	35 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	36
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	37 /* Allocate memory for new node */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	38 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	39 if (!pResult)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	40 return NULL;
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	41
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	42 pResult->pcFilename = g_strdup(pcFilename);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	43 if (!pResult->pcFilename) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	44 g_free(pResult);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	45 return NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	46 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	47
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	48 return pResult;
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	49 }
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	50
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	51
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	52 static void xs_stildb_node_free(t_xs_stil_node * pNode)
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	53 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	54 gint i;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	55
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	56 if (pNode) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	57 /* Free subtune information */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	58 for (i = 0; i <= XS_STIL_MAXENTRY; i++) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	59 g_free(pNode->subTunes[i].pName);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	60 g_free(pNode->subTunes[i].pAuthor);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	61 g_free(pNode->subTunes[i].pInfo);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	62 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	63
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	64 g_free(pNode->pcFilename);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	65 g_free(pNode);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	66 }
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	67 }
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	68
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	69
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	70 /* 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	71 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	72 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	73 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	74 assert(db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	75
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	76 if (db->pNodes) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	77 /* 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	78 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	79 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	80 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	81 LNEXT = NULL; /* But next is NULL! */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	82 } else {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	83 db->pNodes = pNode; /* First node ... */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	84 LPREV = pNode; /* ... it's also last */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	85 LNEXT = NULL; /* But next is NULL! */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	86 }
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	87 }
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	88
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	89
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	90 /* 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	91 */
330 e0abd282d6b7 Changed struct member name subTune -> subTunes Matti Hamalainen <ccr@tnsp.org> parents: 324 diff changeset	92 #define XS_STILDB_MULTI if (isMulti) { isMulti = FALSE; xs_pstrcat(&(tmpNode->subTunes[subEntry].pInfo), "\n"); }
240 f436e16fa6d9 Fixed cosmetic bug in handling of multi-line fields (COMMENT). Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	93
f436e16fa6d9 Fixed cosmetic bug in handling of multi-line fields (COMMENT). Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	94
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	95 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	96 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	97 FILE *inFile;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	98 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	99 guint lineNum, linePos, eolPos;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	100 t_xs_stil_node *tmpNode;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	101 gboolean isError, isMulti;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	102 gint subEntry;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	103 assert(db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	104
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	105 /* Try to open the file */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	106 if ((inFile = fopen(dbFilename, "ra")) == NULL) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	107 XSERR("Could not open STILDB '%s'\n", dbFilename);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	108 return -1;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	109 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	110
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	111 /* Read and parse the data */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	112 lineNum = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	113 isError = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	114 isMulti = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	115 tmpNode = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	116 subEntry = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	117
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	118 while (!feof(inFile) && !isError) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	119 fgets(inLine, XS_BUF_SIZE, inFile);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	120 inLine[XS_BUF_SIZE - 1] = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	121 linePos = eolPos = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	122 xs_findeol(inLine, &eolPos);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	123 inLine[eolPos] = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	124 lineNum++;
103 fe83646e6baa Changed plrFillBuffer()-functions to return actual number of samples computed. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	125
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	126 switch (inLine[0]) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	127 case '/':
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	128 /* Check if we are already parsing entry */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	129 isMulti = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	130 if (tmpNode) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	131 XSERR("New entry ('%s') before end of current ('%s')! Possibly malformed STIL-file!\n",
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	132 inLine, tmpNode->pcFilename);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	133
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	134 xs_stildb_node_free(tmpNode);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	135 }
109 578b71b62eeb Fileinfo now basically working, STIL COMMENT-fields are not yet parsed or shown. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	136
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	137 /* A new node */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	138 subEntry = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	139 tmpNode = xs_stildb_node_new(inLine);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	140 if (!tmpNode) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	141 /* Allocation failed */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	142 XSERR("Could not allocate new STILdb-node for '%s'!\n", inLine);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	143 isError = TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	144 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	145 break;
103 fe83646e6baa Changed plrFillBuffer()-functions to return actual number of samples computed. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	146
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	147 case '(':
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	148 /* A new sub-entry */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	149 isMulti = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	150 linePos++;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	151 if (inLine[linePos] == '#') {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	152 linePos++;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	153 if (inLine[linePos]) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	154 xs_findnum(inLine, &linePos);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	155 inLine[linePos] = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	156 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	157
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	158 /* Sanity check */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	159 if ((subEntry < 1) \|\| (subEntry > XS_STIL_MAXENTRY)) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	160 XSERR("Number of subEntry (%i) for '%s' is invalid\n", subEntry,
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	161 tmpNode->pcFilename);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	162 subEntry = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	163 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	164 }
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
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	167 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	168
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	169 case 0:
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	170 case '#':
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	171 case '\n':
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	172 case '\r':
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	173 /* End of entry/field */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	174 isMulti = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	175 if (tmpNode) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	176 /* Insert to database */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	177 xs_stildb_node_insert(db, tmpNode);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	178 tmpNode = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	179 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	180 break;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	181
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	182 default:
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	183 /* Check if we are parsing an entry */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	184 if (!tmpNode) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	185 XSERR("Entry data encountered outside of entry!\n");
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	186 break;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	187 }
117 453ac1293f6a Fixed severe bug in xs_strmcat() Matti Hamalainen <ccr@tnsp.org> parents: 110 diff changeset	188
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	189 /* Some other type */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	190 if (strncmp(inLine, " NAME:", 8) == 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	191 XS_STILDB_MULTI g_free(tmpNode->subTunes[subEntry].pName);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	192 tmpNode->subTunes[subEntry].pName = g_strdup(&inLine[9]);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	193 } else if (strncmp(inLine, " AUTHOR:", 8) == 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	194 XS_STILDB_MULTI g_free(tmpNode->subTunes[subEntry].pAuthor);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	195 tmpNode->subTunes[subEntry].pAuthor = g_strdup(&inLine[9]);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	196 } else if (strncmp(inLine, " TITLE:", 8) == 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	197 XS_STILDB_MULTI inLine[eolPos++] = '\n';
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	198 inLine[eolPos++] = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	199 xs_pstrcat(&(tmpNode->subTunes[subEntry].pInfo), &inLine[2]);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	200 } else if (strncmp(inLine, " ARTIST:", 8) == 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	201 XS_STILDB_MULTI inLine[eolPos++] = '\n';
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	202 inLine[eolPos++] = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	203 xs_pstrcat(&(tmpNode->subTunes[subEntry].pInfo), &inLine[1]);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	204 } else if (strncmp(inLine, "COMMENT:", 8) == 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	205 XS_STILDB_MULTI isMulti = TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	206 xs_pstrcat(&(tmpNode->subTunes[subEntry].pInfo), inLine);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	207 } else if (strncmp(inLine, " ", 8) == 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	208 xs_pstrcat(&(tmpNode->subTunes[subEntry].pInfo), &inLine[8]);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	209 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	210 break;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	211 }
240 f436e16fa6d9 Fixed cosmetic bug in handling of multi-line fields (COMMENT). Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	212
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	213 } /* while */
240 f436e16fa6d9 Fixed cosmetic bug in handling of multi-line fields (COMMENT). Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	214
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	215 /* Check if there is one remaining node */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	216 if (tmpNode)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	217 xs_stildb_node_insert(db, tmpNode);
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	218
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	219 /* Close the file */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	220 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	221
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	222 return 0;
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	223 }
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	224
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	225
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	226 /* Compare two nodes
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	227 */
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	228 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	229 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	230 /* We assume here that we never ever get NULL-pointers or similar */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	231 return strcmp(((t_xs_stil_node ) pNode1)->pcFilename, ((t_xs_stil_node **) pNode2)->pcFilename);
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	232 }
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	233
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	234
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	235 /* (Re)create index
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	236 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	237 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	238 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	239 t_xs_stil_node *pCurr;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	240 gint i;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	241
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	242 /* Free old index */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	243 if (db->ppIndex) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	244 g_free(db->ppIndex);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	245 db->ppIndex = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	246 }
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	247
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	248 /* Get size of db */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	249 pCurr = db->pNodes;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	250 db->n = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	251 while (pCurr) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	252 db->n++;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	253 pCurr = pCurr->pNext;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	254 }
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	255
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	256 /* Check number of nodes */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	257 if (db->n > 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	258 /* Allocate memory for index-table */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	259 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	260 if (!db->ppIndex)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	261 return -1;
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	262
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	263 /* Get node-pointers to table */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	264 i = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	265 pCurr = db->pNodes;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	266 while (pCurr && (i < db->n)) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	267 db->ppIndex[i++] = pCurr;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	268 pCurr = pCurr->pNext;
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	269 }
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	270
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	271 /* Sort the indexes */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	272 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	273 }
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	274
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	275 return 0;
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	276 }
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	277
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	278 /* Free a given STIL database
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	279 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	280 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	281 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	282 t_xs_stil_node pCurr, pNext;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	283
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	284 if (!db)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	285 return;
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	286
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	287 /* Free the memory allocated for nodes */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	288 pCurr = db->pNodes;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	289 while (pCurr) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	290 pNext = pCurr->pNext;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	291 xs_stildb_node_free(pCurr);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	292 pCurr = pNext;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	293 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	294
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	295 db->pNodes = NULL;
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	296
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	297 /* Free memory allocated for index */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	298 if (db->ppIndex) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	299 g_free(db->ppIndex);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	300 db->ppIndex = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	301 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	302
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	303 /* Free structure */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	304 db->n = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	305 g_free(db);
94 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
086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	308
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	309 /* Get STIL information node from database
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	310 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	311 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	312 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	313 gint iStartNode, iEndNode, iQNode, r, i;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	314 gboolean iFound;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	315 t_xs_stil_node *pResult;
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	316
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	317 /* Check the database pointers */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	318 if (!db \|\| !db->pNodes \|\| !db->ppIndex)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	319 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	320
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	321 /* Look-up via index using binary search */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	322 pResult = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	323 iStartNode = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	324 iEndNode = (db->n - 1);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	325 iQNode = (iEndNode / 2);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	326 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	327
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	328 while ((!iFound) && ((iEndNode - iStartNode) > 128)) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	329 r = strcmp(pcFilename, db->ppIndex[iQNode]->pcFilename);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	330 if (r < 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	331 /* Hash was in the <- LEFT side */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	332 iEndNode = iQNode;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	333 iQNode = iStartNode + ((iEndNode - iStartNode) / 2);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	334 } else if (r > 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	335 /* Hash was in the RIGHT -> side */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	336 iStartNode = iQNode;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	337 iQNode = iStartNode + ((iEndNode - iStartNode) / 2);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	338 } 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	339 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	340 }
578b71b62eeb Fileinfo now basically working, STIL COMMENT-fields are not yet parsed or shown. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	341
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	342 /* If not found already */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	343 if (!iFound) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	344 /* Search the are linearly */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	345 iFound = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	346 i = iStartNode;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	347 while ((i <= iEndNode) && (!iFound)) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	348 if (strcmp(pcFilename, db->ppIndex[i]->pcFilename) == 0)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	349 iFound = TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	350 else
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	351 i++;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	352 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	353
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	354 /* Check the result */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	355 if (iFound)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	356 pResult = db->ppIndex[i];
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	357
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	358 } else {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	359 /* Found via binary search */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	360 pResult = db->ppIndex[iQNode];
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	361 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	362
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	363 return pResult;
94 086681f70910 Start of re-write of STIL-support Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	364 }
109 578b71b62eeb Fileinfo now basically working, STIL COMMENT-fields are not yet parsed or shown. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	365
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	366
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	367 /*
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	368 * 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	369 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	370 static t_xs_stildb *xs_stildb_db = NULL;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	371 XS_MUTEX(xs_stildb_db);
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	372
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	373 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	374 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	375 XS_MUTEX_LOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	376
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	377 if (!xs_cfg.stilDBPath) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	378 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	379 return -1;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	380 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	381
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	382 XS_MUTEX_LOCK(xs_stildb_db);
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	383
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	384 /* Check if already initialized */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	385 if (xs_stildb_db)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	386 xs_stildb_free(xs_stildb_db);
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 /* Allocate database */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	389 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	390 if (!xs_stildb_db) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	391 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	392 XS_MUTEX_UNLOCK(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	393 return -2;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	394 }
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	395
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	396 /* Read the database */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	397 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	398 xs_stildb_free(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	399 xs_stildb_db = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	400 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	401 XS_MUTEX_UNLOCK(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	402 return -3;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	403 }
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	404
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	405 /* Create index */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	406 if (xs_stildb_index(xs_stildb_db) != 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	407 xs_stildb_free(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	408 xs_stildb_db = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	409 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	410 XS_MUTEX_UNLOCK(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	411 return -4;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	412 }
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	413
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	414 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	415 XS_MUTEX_UNLOCK(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	416 return 0;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	417 }
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	418
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	419
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	420 void xs_stil_close(void)
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	421 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	422 XS_MUTEX_LOCK(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	423 xs_stildb_free(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	424 xs_stildb_db = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	425 XS_MUTEX_UNLOCK(xs_stildb_db);
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	426 }
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	427
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	428
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	429 t_xs_stil_node xs_stil_get(gchar pcFilename)
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	430 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	431 t_xs_stil_node *pResult;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	432 gchar *tmpFilename;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	433
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	434 XS_MUTEX_LOCK(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	435 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	436
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	437 if (xs_cfg.stilDBEnable && xs_stildb_db) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	438 if (xs_cfg.hvscPath) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	439 /* Remove postfixed directory separator from HVSC-path */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	440 tmpFilename = xs_strrchr(xs_cfg.hvscPath, '/');
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	441 if (tmpFilename && (tmpFilename[1] == 0))
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	442 tmpFilename[0] = 0;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	443
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	444 /* Remove HVSC location-prefix from filename */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	445 tmpFilename = strstr(pcFilename, xs_cfg.hvscPath);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	446 if (tmpFilename)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	447 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	448 else
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	449 tmpFilename = pcFilename;
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	450 } else
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	451 tmpFilename = pcFilename;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	452
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	453 pResult = xs_stildb_get_node(xs_stildb_db, tmpFilename);
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 227 diff changeset	454 } else
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	455 pResult = NULL;
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	456
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	457 XS_MUTEX_UNLOCK(xs_stildb_db);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	458 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	459
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	460 return pResult;
227 92bad4c7b998 Improved modularization of STIL and song-length database subsystems. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	461 }

Mercurial > hg > xmms-sid

annotate src/xs_stil.c @ 359:b1a858b8cb1a