xmms-sid: src/xmms-sid.c annotate

annotate src/xmms-sid.c @ 543:358b2770d32d

Unnecessary #include

author	Matti Hamalainen <ccr@tnsp.org>
date	Wed, 21 Feb 2007 15:23:01 +0000
parents	8cdd288ebb53
children	59046d70c0ef

rev	line source
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	4 Main source file
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5
324 dd201740a720 Changed copyright text. Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	6 Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
422 d2e6682d3ef8 Copyright year update Matti Hamalainen <ccr@tnsp.org> parents: 412 diff changeset	7 (C) Copyright 1999-2007 Tecnic Software productions (TNSP)
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 This program is free software; you can redistribute it and/or modify
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10 it under the terms of the GNU General Public License as published by
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11 the Free Software Foundation; either version 2 of the License, or
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	12 (at your option) any later version.
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14 This program is distributed in the hope that it will be useful,
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	15 but WITHOUT ANY WARRANTY; without even the implied warranty of
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	17 GNU General Public License for more details.
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	18
412 7f694e5a1493 Updated GNU GPL (new FSF address) and some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	19 You should have received a copy of the GNU General Public License along along
7f694e5a1493 Updated GNU GPL (new FSF address) and some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	20 with this program; if not, write to the Free Software Foundation, Inc.,
7f694e5a1493 Updated GNU GPL (new FSF address) and some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 403 diff changeset	21 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22 */
235 d04191d1ea64 Add xs_fileinfo.h, move appropriate function prototypes there. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	23 #include "xmms-sid.h"
223 16e3b2446a73 On some systems stdlib.h has prerequisite of stdio.h, corrected order of Matti Hamalainen <ccr@tnsp.org> parents: 213 diff changeset	24
16e3b2446a73 On some systems stdlib.h has prerequisite of stdio.h, corrected order of Matti Hamalainen <ccr@tnsp.org> parents: 213 diff changeset	25 #ifdef HAVE_STDLIB_H
16e3b2446a73 On some systems stdlib.h has prerequisite of stdio.h, corrected order of Matti Hamalainen <ccr@tnsp.org> parents: 213 diff changeset	26 #include <stdlib.h>
16e3b2446a73 On some systems stdlib.h has prerequisite of stdio.h, corrected order of Matti Hamalainen <ccr@tnsp.org> parents: 213 diff changeset	27 #endif
16e3b2446a73 On some systems stdlib.h has prerequisite of stdio.h, corrected order of Matti Hamalainen <ccr@tnsp.org> parents: 213 diff changeset	28
297 ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	29 #include <stdarg.h>
184 4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes. Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	30 #include <gdk/gdkkeysyms.h>
4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes. Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	31 #include <gtk/gtk.h>
235 d04191d1ea64 Add xs_fileinfo.h, move appropriate function prototypes there. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	32
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	33 #include "xs_config.h"
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	34 #include "xs_length.h"
103 fe83646e6baa Changed plrFillBuffer()-functions to return actual number of samples computed. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	35 #include "xs_stil.h"
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	36 #include "xs_title.h"
313 b2707c970c9c #include "xs_filter.h" Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	37 #include "xs_filter.h"
235 d04191d1ea64 Add xs_fileinfo.h, move appropriate function prototypes there. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	38 #include "xs_fileinfo.h"
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39 #include "xs_interface.h"
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	40 #include "xs_glade.h"
526 fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	41 #include "xs_player.h"
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	43 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44 * Include player engines
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45 */
72 e3b205a6bc7e Lots re-arranging and new code for upcoming modularization. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	46 #ifdef HAVE_SIDPLAY1
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	47 #include "xs_sidplay1.h"
72 e3b205a6bc7e Lots re-arranging and new code for upcoming modularization. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	48 #endif
e3b205a6bc7e Lots re-arranging and new code for upcoming modularization. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	49 #ifdef HAVE_SIDPLAY2
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	50 #include "xs_sidplay2.h"
72 e3b205a6bc7e Lots re-arranging and new code for upcoming modularization. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	51 #endif
e3b205a6bc7e Lots re-arranging and new code for upcoming modularization. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	52
e3b205a6bc7e Lots re-arranging and new code for upcoming modularization. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	53
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	54 /*
94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	55 * List of players and links to their functions
94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	56 */
72 e3b205a6bc7e Lots re-arranging and new code for upcoming modularization. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	57 t_xs_player xs_playerlist[] = {
e3b205a6bc7e Lots re-arranging and new code for upcoming modularization. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	58 #ifdef HAVE_SIDPLAY1
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	59 {XS_ENG_SIDPLAY1,
526 fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	60 xs_sidplay1_probe,
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	61 xs_sidplay1_init, xs_sidplay1_close,
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	62 xs_sidplay1_initsong, xs_sidplay1_fillbuffer,
464 08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	63 xs_sidplay1_load, xs_sidplay1_delete,
526 fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	64 xs_sidplay1_getinfo, xs_sidplay1_updateinfo,
fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	65 NULL
365 5a92a2aee74c Better comments and .. you guessed it: more indentation fixes. :) Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	66 },
72 e3b205a6bc7e Lots re-arranging and new code for upcoming modularization. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	67 #endif
e3b205a6bc7e Lots re-arranging and new code for upcoming modularization. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	68 #ifdef HAVE_SIDPLAY2
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	69 {XS_ENG_SIDPLAY2,
526 fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	70 xs_sidplay2_probe,
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	71 xs_sidplay2_init, xs_sidplay2_close,
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	72 xs_sidplay2_initsong, xs_sidplay2_fillbuffer,
464 08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	73 xs_sidplay2_load, xs_sidplay2_delete,
526 fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	74 xs_sidplay2_getinfo, xs_sidplay2_updateinfo,
fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	75 xs_sidplay2_flush
365 5a92a2aee74c Better comments and .. you guessed it: more indentation fixes. :) Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	76 },
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	77 #endif
72 e3b205a6bc7e Lots re-arranging and new code for upcoming modularization. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	78 };
e3b205a6bc7e Lots re-arranging and new code for upcoming modularization. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	79
e3b205a6bc7e Lots re-arranging and new code for upcoming modularization. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	80 const gint xs_nplayerlist = (sizeof(xs_playerlist) / sizeof(t_xs_player));
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	81
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	83 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	84 * Global variables
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	85 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	86 t_xs_status xs_status;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	87 XS_MUTEX(xs_status);
532 bc548249464a Audacious glue. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	88 static XS_THREAD_T xs_decode_thread;
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	90 static GtkWidget *xs_subctrl = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	91 static GtkObject *xs_subctrl_adj = NULL;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	92 XS_MUTEX(xs_subctrl);
184 4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes. Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	93
477 53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	94 void xs_subctrl_close(void);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	95 void xs_subctrl_update(void);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	96
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	97 static t_xs_sldb *xs_sldb_db = NULL;
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	98 XS_MUTEX(xs_sldb_db);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	99
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	100 gint xs_songlen_init(void);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	101 void xs_songlen_close(void);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	102 t_xs_sldb_node xs_songlen_get(const gchar );
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	103
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	104
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105 /*
297 ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	106 * Error messages
ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	107 */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 383 diff changeset	108 void xs_error(const char *fmt, ...)
297 ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	109 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	110 va_list ap;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	111 fprintf(stderr, "XMMS-SID: ");
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	112 va_start(ap, fmt);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	113 vfprintf(stderr, fmt, ap);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	114 va_end(ap);
297 ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	115 }
ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	116
299 9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	117 #ifndef DEBUG_NP
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	118 void XSDEBUG(const char *fmt, ...)
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	119 {
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	120 #ifdef DEBUG
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	121 va_list ap;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	122 fprintf(stderr, "XSDEBUG: ");
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	123 va_start(ap, fmt);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	124 vfprintf(stderr, fmt, ap);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	125 va_end(ap);
299 9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	126 #endif
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	127 }
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	128 #endif
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	129
461 a1224c1f8670 STILdb handling glue moved to xmms-sid.c Matti Hamalainen <ccr@tnsp.org> parents: 455 diff changeset	130
297 ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	131 /*
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	132 * Initialization functions
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	133 */
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	134 void xs_reinit(void)
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	136 gint iPlayer;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	137 gboolean isInitialized;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	138
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	139 /* Stop playing, if we are */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	140 XS_MUTEX_LOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	141 if (xs_status.isPlaying) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	142 XS_MUTEX_UNLOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	143 xs_stop();
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	144 } else {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	145 XS_MUTEX_UNLOCK(xs_status);
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	146 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	147
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	148 /* Initialize status and sanitize configuration */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	149 xs_memset(&xs_status, 0, sizeof(xs_status));
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	150
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	151 if (xs_cfg.audioFrequency < 8000)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	152 xs_cfg.audioFrequency = 8000;
273 f6daddca03c7 Merging in oversampling support, audio settings sanitation. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	153
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	154 if (xs_cfg.oversampleFactor < XS_MIN_OVERSAMPLE)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	155 xs_cfg.oversampleFactor = XS_MIN_OVERSAMPLE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	156 else if (xs_cfg.oversampleFactor > XS_MAX_OVERSAMPLE)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	157 xs_cfg.oversampleFactor = XS_MAX_OVERSAMPLE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	158
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	159 if (xs_cfg.audioChannels != XS_CHN_MONO)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	160 xs_cfg.oversampleEnable = FALSE;
273 f6daddca03c7 Merging in oversampling support, audio settings sanitation. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	161
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	162 xs_status.audioFrequency = xs_cfg.audioFrequency;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	163 xs_status.audioBitsPerSample = xs_cfg.audioBitsPerSample;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	164 xs_status.audioChannels = xs_cfg.audioChannels;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	165 xs_status.audioFormat = -1;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	166 xs_status.oversampleEnable = xs_cfg.oversampleEnable;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	167 xs_status.oversampleFactor = xs_cfg.oversampleFactor;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	168
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	169 /* Try to initialize emulator engine */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	170 XSDEBUG("initializing emulator engine #%i...\n", xs_cfg.playerEngine);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	172 iPlayer = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	173 isInitialized = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	174 while ((iPlayer < xs_nplayerlist) && !isInitialized) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	175 if (xs_playerlist[iPlayer].plrIdent == xs_cfg.playerEngine) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	176 if (xs_playerlist[iPlayer].plrInit(&xs_status)) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	177 isInitialized = TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	178 xs_status.sidPlayer = (t_xs_player *) & xs_playerlist[iPlayer];
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	179 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	180 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	181 iPlayer++;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	182 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	183
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	184 XSDEBUG("init#1: %s, %i\n", (isInitialized) ? "OK" : "FAILED", iPlayer);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	185
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	186 iPlayer = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	187 while ((iPlayer < xs_nplayerlist) && !isInitialized) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	188 if (xs_playerlist[iPlayer].plrInit(&xs_status)) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	189 isInitialized = TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	190 xs_status.sidPlayer = (t_xs_player *) & xs_playerlist[iPlayer];
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	191 xs_cfg.playerEngine = xs_playerlist[iPlayer].plrIdent;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	192 } else
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	193 iPlayer++;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	194 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	195
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	196 XSDEBUG("init#2: %s, %i\n", (isInitialized) ? "OK" : "FAILED", iPlayer);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	197
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	198 /* Get settings back, in case the chosen emulator backend changed them */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	199 xs_cfg.audioFrequency = xs_status.audioFrequency;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	200 xs_cfg.audioBitsPerSample = xs_status.audioBitsPerSample;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	201 xs_cfg.audioChannels = xs_status.audioChannels;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	202 xs_cfg.oversampleEnable = xs_status.oversampleEnable;
273 f6daddca03c7 Merging in oversampling support, audio settings sanitation. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	203
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	204 /* Initialize song-length database */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	205 xs_songlen_close();
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	206 if (xs_cfg.songlenDBEnable && (xs_songlen_init() != 0)) {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	207 xs_error(_("Error initializing song-length database!\n"));
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	208 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	209
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	210 /* Initialize STIL database */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	211 xs_stil_close();
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	212 if (xs_cfg.stilDBEnable && (xs_stil_init() != 0)) {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	213 xs_error(_("Error initializing STIL database!\n"));
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	214 }
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	215 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	216
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	217
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	218 /*
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	219 * Initialize XMMS-SID
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	220 */
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	221 void xs_init(void)
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	222 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	223 XSDEBUG("xs_init()\n");
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	224
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	225 /* Initialize and get configuration */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	226 xs_memset(&xs_cfg, 0, sizeof(xs_cfg));
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	227 xs_init_configuration();
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	228 xs_read_configuration();
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	229
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	230 /* Initialize subsystems */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	231 xs_reinit();
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	232
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	233 XSDEBUG("OK\n");
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	234 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	235
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	236
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	237 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	238 * Shut down XMMS-SID
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	239 */
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	240 void xs_close(void)
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	241 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	242 XSDEBUG("xs_close(): shutting down...\n");
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	243
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	244 /* Stop playing, free structures */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	245 xs_stop();
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	246
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	247 xs_tuneinfo_free(xs_status.tuneInfo);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	248 xs_status.tuneInfo = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	249 xs_status.sidPlayer->plrDeleteSID(&xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	250 xs_status.sidPlayer->plrClose(&xs_status);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	251
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	252 xs_songlen_close();
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	253 xs_stil_close();
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	254
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	255 XSDEBUG("shutdown finished.\n");
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	256 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	257
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	258
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	259 /*
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	260 * Check whether the given file is handled by this plugin
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	261 */
464 08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	262 gint xs_is_our_file(gchar *pcFilename)
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	263 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	264 gchar *pcExt;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	265 assert(xs_status.sidPlayer);
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	266
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	267 /* Check the filename */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	268 if (pcFilename == NULL)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	269 return FALSE;
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	270
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	271 /* Try to detect via detection routine, if required */
464 08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	272 if (xs_cfg.detectMagic) {
08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	273 t_xs_file *f;
08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	274 if ((f = xs_fopen(pcFilename, "rb")) != NULL) {
526 fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	275 if (xs_status.sidPlayer->plrProbe(f))
464 08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	276 return TRUE;
08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	277 xs_fclose(f);
08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	278 }
08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	279 }
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	280
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	281 /* Detect just by checking filename extension */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	282 pcExt = xs_strrchr(pcFilename, '.');
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	283 if (pcExt) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	284 pcExt++;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	285 switch (xs_cfg.playerEngine) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	286 case XS_ENG_SIDPLAY1:
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	287 case XS_ENG_SIDPLAY2:
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	288 if (!g_strcasecmp(pcExt, "psid"))
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	289 return TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	290 if (!g_strcasecmp(pcExt, "sid"))
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	291 return TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	292 if (!g_strcasecmp(pcExt, "dat"))
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	293 return TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	294 if (!g_strcasecmp(pcExt, "inf"))
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	295 return TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	296 if (!g_strcasecmp(pcExt, "info"))
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	297 return TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	298 break;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	299 }
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	300 }
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	301
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	302 return FALSE;
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	303 }
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	304
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	305
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	306 /*
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	307 * Main playing thread loop
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	308 */
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	309 void xs_playthread(void argPointer)
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	310 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	311 t_xs_status myStatus;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	312 t_xs_tuneinfo *myTune;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	313 gboolean audioOpen = FALSE, doPlay = FALSE, isFound = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	314 gint audioGot, songLength, i;
464 08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	315 gchar audioBuffer = NULL, oversampleBuffer = NULL, *tmpTitle;
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	316
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	317 (void) argPointer;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	318
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	319 /* Initialize */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	320 XSDEBUG("entering player thread\n");
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	321 XS_MUTEX_LOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	322 memcpy(&myStatus, &xs_status, sizeof(t_xs_status));
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	323 myTune = xs_status.tuneInfo;
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	324 for (i = 0; i <= myTune->nsubTunes; i++)
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	325 myTune->subTunes[i].tunePlayed = FALSE;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	326 XS_MUTEX_UNLOCK(xs_status);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	327
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	328 /* Allocate audio buffer */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	329 audioBuffer = (gchar *) g_malloc(XS_AUDIOBUF_SIZE);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	330 if (audioBuffer == NULL) {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	331 xs_error(_("Couldn't allocate memory for audio data buffer!\n"));
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	332 goto xs_err_exit;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	333 }
273 f6daddca03c7 Merging in oversampling support, audio settings sanitation. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	334
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	335 if (myStatus.oversampleEnable) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	336 oversampleBuffer = (gchar ) g_malloc(XS_AUDIOBUF_SIZE myStatus.oversampleFactor);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	337 if (oversampleBuffer == NULL) {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	338 xs_error(_("Couldn't allocate memory for audio oversampling buffer!\n"));
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	339 goto xs_err_exit;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	340 }
273 f6daddca03c7 Merging in oversampling support, audio settings sanitation. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	341 }
241 291715a519e2 Compile-time setting to enable/disable use of dynamically allocated buffers. Matti Hamalainen <ccr@tnsp.org> parents: 235 diff changeset	342
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	343 /*
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	344 * Main player loop: while not stopped, loop here - play subtunes
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	345 */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	346 audioOpen = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	347 doPlay = TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	348 while (xs_status.isPlaying && doPlay) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	349 /* Automatic sub-tune change logic */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	350 XS_MUTEX_LOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	351 XS_MUTEX_LOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	352 myStatus.isPlaying = TRUE;
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	353
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	354 if (xs_status.currSong < 1 \|\| myStatus.currSong < 1) {
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	355 XS_MUTEX_UNLOCK(xs_status);
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	356 XS_MUTEX_UNLOCK(xs_cfg);
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	357 goto xs_err_exit;
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	358 }
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	359
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	360 if (xs_cfg.subAutoEnable && (myStatus.currSong == xs_status.currSong)) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	361 /* Check if currently selected sub-tune has been played already */
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	362 if (myTune->subTunes[myStatus.currSong-1].tunePlayed) {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	363 /* Find a tune that has not been played */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	364 XSDEBUG("tune #%i already played, finding next match ...\n", myStatus.currSong);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	365 isFound = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	366 i = 0;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	367 while (!isFound && (++i <= myTune->nsubTunes)) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	368 if (xs_cfg.subAutoMinOnly) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	369 /* A tune with minimum length must be found */
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	370 if (!myTune->subTunes[i-1].tunePlayed &&
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	371 myTune->subTunes[i-1].tuneLength >= xs_cfg.subAutoMinTime)
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	372 isFound = TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	373 } else {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	374 /* Any unplayed tune is okay */
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	375 if (!myTune->subTunes[i-1].tunePlayed)
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	376 isFound = TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	377 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	378 }
281 d913f0f69487 Automatic sub-tune changing. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	379
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	380 if (isFound) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	381 /* Set the new sub-tune */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	382 XSDEBUG("found #%i\n", i);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	383 xs_status.currSong = i;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	384 } else
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	385 /* This is the end */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	386 doPlay = FALSE;
281 d913f0f69487 Automatic sub-tune changing. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	387
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	388 XS_MUTEX_UNLOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	389 XS_MUTEX_UNLOCK(xs_cfg);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	390 continue; /* This is ugly, but ... */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	391 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	392 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	393
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	394 /* Tell that we are initializing, update sub-tune controls */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	395 myStatus.currSong = xs_status.currSong;
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	396 myTune->subTunes[myStatus.currSong-1].tunePlayed = TRUE;
306 e6dec620b1b3 Improved locking, still some unlocked parts left, but nothing dangerous. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	397 XS_MUTEX_UNLOCK(xs_status);
e6dec620b1b3 Improved locking, still some unlocked parts left, but nothing dangerous. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	398 XS_MUTEX_UNLOCK(xs_cfg);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	399
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	400 XSDEBUG("subtune #%i selected, initializing...\n", myStatus.currSong);
281 d913f0f69487 Automatic sub-tune changing. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	401
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	402 GDK_THREADS_ENTER();
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	403 xs_subctrl_update();
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	404 GDK_THREADS_LEAVE();
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	405
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	406 /* Check minimum playtime */
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	407 songLength = myTune->subTunes[myStatus.currSong-1].tuneLength;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	408 if (xs_cfg.playMinTimeEnable && (songLength >= 0)) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	409 if (songLength < xs_cfg.playMinTime)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	410 songLength = xs_cfg.playMinTime;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	411 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	412
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	413 /* Initialize song */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	414 if (!myStatus.sidPlayer->plrInitSong(&myStatus)) {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	415 xs_error(_("Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"),
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	416 myTune->sidFilename, myStatus.currSong);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	417 goto xs_err_exit;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	418 }
472 3f02945a0c48 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	419
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	420 /* Open the audio output */
403 b2d233cd01ba Add more debugging output. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	421 XSDEBUG("open audio output (%d, %d, %d)\n",
b2d233cd01ba Add more debugging output. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	422 myStatus.audioFormat, myStatus.audioFrequency, myStatus.audioChannels);
b2d233cd01ba Add more debugging output. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	423
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	424 if (!xs_plugin_ip.output->
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	425 open_audio(myStatus.audioFormat, myStatus.audioFrequency, myStatus.audioChannels)) {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	426 xs_error(_("Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"),
faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	427 myStatus.audioFormat,
faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	428 myStatus.audioFrequency,
faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	429 myStatus.audioChannels);
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	430
277 c27763d388d9 Fixed oversampling buffer overflow problems. Matti Hamalainen <ccr@tnsp.org> parents: 276 diff changeset	431 XS_MUTEX_LOCK(xs_status);
c27763d388d9 Fixed oversampling buffer overflow problems. Matti Hamalainen <ccr@tnsp.org> parents: 276 diff changeset	432 xs_status.isError = TRUE;
c27763d388d9 Fixed oversampling buffer overflow problems. Matti Hamalainen <ccr@tnsp.org> parents: 276 diff changeset	433 XS_MUTEX_UNLOCK(xs_status);
c27763d388d9 Fixed oversampling buffer overflow problems. Matti Hamalainen <ccr@tnsp.org> parents: 276 diff changeset	434 goto xs_err_exit;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	435 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	436
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	437 audioOpen = TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	438
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	439 /* Set song information for current subtune */
403 b2d233cd01ba Add more debugging output. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	440 XSDEBUG("set tune info\n");
472 3f02945a0c48 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	441 myStatus.sidPlayer->plrUpdateSIDInfo(&myStatus);
464 08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	442 tmpTitle = xs_make_titlestring(myTune, myStatus.currSong);
08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	443
08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	444 xs_plugin_ip.set_info(
08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	445 tmpTitle,
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	446 (songLength > 0) ? (songLength * 1000) : 0,
477 53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	447 -1,
464 08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	448 myStatus.audioFrequency,
08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	449 myStatus.audioChannels);
08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	450
08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	451 g_free(tmpTitle);
08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	452
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	453 XSDEBUG("playing\n");
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	454
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	455 /*
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	456 * Play the subtune
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	457 */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	458 while (xs_status.isPlaying && myStatus.isPlaying && (xs_status.currSong == myStatus.currSong)) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	459 /* Render audio data */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	460 if (myStatus.oversampleEnable) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	461 /* Perform oversampled rendering */
477 53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	462 audioGot = myStatus.sidPlayer->plrFillBuffer(
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	463 &myStatus,
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	464 oversampleBuffer,
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	465 (XS_AUDIOBUF_SIZE * myStatus.oversampleFactor));
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	466
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	467 audioGot /= myStatus.oversampleFactor;
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	468
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	469 /* Execute rate-conversion with filtering */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	470 if (xs_filter_rateconv(audioBuffer, oversampleBuffer,
477 53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	471 myStatus.audioFormat, myStatus.oversampleFactor, audioGot) < 0) {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	472 xs_error(_("Oversampling rate-conversion pass failed.\n"));
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	473 XS_MUTEX_LOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	474 xs_status.isError = TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	475 XS_MUTEX_UNLOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	476 goto xs_err_exit;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	477 }
477 53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	478 } else {
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	479 audioGot = myStatus.sidPlayer->plrFillBuffer(
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	480 &myStatus, audioBuffer, XS_AUDIOBUF_SIZE);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	481 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	482
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	483 /* I <3 visualice/haujobb */
477 53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	484 xs_plugin_ip.add_vis_pcm(
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	485 xs_plugin_ip.output->written_time(),
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	486 myStatus.audioFormat, myStatus.audioChannels,
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	487 audioGot, audioBuffer);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	488
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	489 /* Wait a little */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	490 while (xs_status.isPlaying &&
477 53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	491 (xs_status.currSong == myStatus.currSong) &&
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	492 (xs_plugin_ip.output->buffer_free() < audioGot))
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	493 xmms_usleep(500);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	494
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	495 /* Output audio */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	496 if (xs_status.isPlaying && (xs_status.currSong == myStatus.currSong))
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	497 xs_plugin_ip.output->write_audio(audioBuffer, audioGot);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	498
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	499 /* Check if we have played enough */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	500 if (xs_cfg.playMaxTimeEnable) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	501 if (xs_cfg.playMaxTimeUnknown) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	502 if ((songLength < 0) &&
477 53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	503 (xs_plugin_ip.output->output_time() >= (xs_cfg.playMaxTime * 1000)))
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	504 myStatus.isPlaying = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	505 } else {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	506 if (xs_plugin_ip.output->output_time() >= (xs_cfg.playMaxTime * 1000))
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	507 myStatus.isPlaying = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	508 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	509 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	510
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	511 if (songLength >= 0) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	512 if (xs_plugin_ip.output->output_time() >= (songLength * 1000))
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	513 myStatus.isPlaying = FALSE;
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	514 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	515 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	516
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	517 XSDEBUG("subtune ended/stopped\n");
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	518
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	519 /* Close audio output plugin */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	520 if (audioOpen) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	521 XSDEBUG("close audio #1\n");
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	522 xs_plugin_ip.output->close_audio();
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	523 audioOpen = FALSE;
403 b2d233cd01ba Add more debugging output. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	524 XSDEBUG("closed\n");
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	525 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	526
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	527 /* Now determine if we continue by selecting other subtune or something */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	528 if (!myStatus.isPlaying && !xs_cfg.subAutoEnable)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	529 doPlay = FALSE;
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	530 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	531
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	532 xs_err_exit:
403 b2d233cd01ba Add more debugging output. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	533 XSDEBUG("out of playing loop\n");
b2d233cd01ba Add more debugging output. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	534
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	535 /* Close audio output plugin */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	536 if (audioOpen) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	537 XSDEBUG("close audio #2\n");
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	538 xs_plugin_ip.output->close_audio();
403 b2d233cd01ba Add more debugging output. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	539 XSDEBUG("closed\n");
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	540 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	541
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	542 g_free(audioBuffer);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	543 g_free(oversampleBuffer);
241 291715a519e2 Compile-time setting to enable/disable use of dynamically allocated buffers. Matti Hamalainen <ccr@tnsp.org> parents: 235 diff changeset	544
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	545 /* Set playing status to false (stopped), thus when
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	546 * XMMS next calls xs_get_time(), it can return appropriate
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	547 * value "not playing" status and XMMS knows to move to
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	548 * next entry in the playlist .. or whatever it wishes.
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	549 */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	550 XS_MUTEX_LOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	551 xs_status.isPlaying = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	552 XS_MUTEX_UNLOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	553
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	554 /* Exit the playing thread */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	555 XSDEBUG("exiting thread, bye.\n");
532 bc548249464a Audacious glue. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	556 XS_THREAD_EXIT(NULL);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	557 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	558
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	559
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	560 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	561 * Start playing the given file
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	562 * Here we load the tune and initialize the playing thread.
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	563 * Usually you would also initialize the output-plugin, but
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	564 * this is XMMS-SID and we do it on the player thread instead.
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	566 void xs_play_file(gchar * pcFilename)
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	567 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	568 assert(xs_status.sidPlayer);
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	569
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	570 XSDEBUG("play '%s'\n", pcFilename);
72 e3b205a6bc7e Lots re-arranging and new code for upcoming modularization. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	571
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	572 /* Get tune information */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	573 if ((xs_status.tuneInfo = xs_status.sidPlayer->plrGetSIDInfo(pcFilename)) == NULL)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	574 return;
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	575
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	576 /* Initialize the tune */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	577 if (!xs_status.sidPlayer->plrLoadSID(&xs_status, pcFilename)) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	578 xs_tuneinfo_free(xs_status.tuneInfo);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	579 xs_status.tuneInfo = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	580 return;
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	581 }
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	582
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	583 XSDEBUG("load ok\n");
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	584
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	585 /* Set general status information */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	586 xs_status.isPlaying = TRUE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	587 xs_status.isError = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	588 xs_status.currSong = xs_status.tuneInfo->startTune;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	589
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	590 /* Start the playing thread! */
536 8cdd288ebb53 Removed cruft. Matti Hamalainen <ccr@tnsp.org> parents: 535 diff changeset	591 if (pthread_create(&xs_decode_thread, NULL, xs_playthread, NULL) < 0) {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	592 xs_error(_("Couldn't create playing thread!\n"));
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	593 xs_tuneinfo_free(xs_status.tuneInfo);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	594 xs_status.tuneInfo = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	595 xs_status.sidPlayer->plrDeleteSID(&xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	596 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	597
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	598 /* Okay, here the playing thread has started up and we
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	599 * return from here to XMMS. Rest is up to XMMS's GUI
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	600 * and playing thread.
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	601 */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	602 XSDEBUG("systems should be up?\n");
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	603 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	604
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	605
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	606 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	607 * Stop playing
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	608 * Here we set the playing status to stop and wait for playing
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	609 * thread to shut down. In any "correctly" done plugin, this is
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	610 * also the function where you close the output-plugin, but since
264 2316e524d67b Improved comments. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	611 * XMMS-SID has special behaviour (audio opened/closed in the
2316e524d67b Improved comments. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	612 * playing thread), we don't do that here.
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	613 *
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	614 * Finally tune and other memory allocations are free'd.
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	615 */
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	616 void xs_stop(void)
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	617 {
403 b2d233cd01ba Add more debugging output. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	618 XSDEBUG("stop requested\n");
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	619
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	620 /* Close the sub-tune control window, if any */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	621 xs_subctrl_close();
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	622
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	623 /* Lock xs_status and stop playing thread */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	624 XS_MUTEX_LOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	625 if (xs_status.isPlaying) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	626 XSDEBUG("stopping...\n");
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	627 xs_status.isPlaying = FALSE;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	628 XS_MUTEX_UNLOCK(xs_status);
532 bc548249464a Audacious glue. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	629 XS_THREAD_JOIN(xs_decode_thread);
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	630 } else {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	631 XS_MUTEX_UNLOCK(xs_status);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	632 }
75 653c9b0d1320 SIDPlay2 support "works" now. Borked problems with threads. Matti Hamalainen <ccr@tnsp.org> parents: 74 diff changeset	633
403 b2d233cd01ba Add more debugging output. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	634 XSDEBUG("done, updating status\n");
b2d233cd01ba Add more debugging output. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	635
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	636 /* Status is now stopped, update the sub-tune
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	637 * controller in fileinfo window (if open)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	638 */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	639 xs_fileinfo_update();
241 291715a519e2 Compile-time setting to enable/disable use of dynamically allocated buffers. Matti Hamalainen <ccr@tnsp.org> parents: 235 diff changeset	640
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	641 /* Free tune information */
403 b2d233cd01ba Add more debugging output. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	642 XS_MUTEX_LOCK(xs_status);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	643 xs_status.sidPlayer->plrDeleteSID(&xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	644 xs_tuneinfo_free(xs_status.tuneInfo);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	645 xs_status.tuneInfo = NULL;
403 b2d233cd01ba Add more debugging output. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	646 XS_MUTEX_UNLOCK(xs_status);
b2d233cd01ba Add more debugging output. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	647 XSDEBUG("ok\n");
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	648 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	649
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	650
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	651 /*
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	652 * Pause/unpause the playing
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	653 */
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	654 void xs_pause(short pauseState)
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	655 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	656 XS_MUTEX_LOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	657 /* FIXME FIX ME todo: pause should disable sub-tune controls */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	658 XS_MUTEX_UNLOCK(xs_status);
264 2316e524d67b Improved comments. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	659
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	660 xs_subctrl_close();
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	661 xs_fileinfo_update();
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	662 xs_plugin_ip.output->pause(pauseState);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	663 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	664
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	665
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	666 /*
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	667 * Pop-up subtune selector
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	668 */
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	669 void xs_subctrl_setsong(void)
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	670 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	671 gint n;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	672
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	673 XS_MUTEX_LOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	674 XS_MUTEX_LOCK(xs_subctrl);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	675
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	676 if (xs_status.tuneInfo && xs_status.isPlaying) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	677 n = (gint) GTK_ADJUSTMENT(xs_subctrl_adj)->value;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	678 if ((n >= 1) && (n <= xs_status.tuneInfo->nsubTunes))
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	679 xs_status.currSong = n;
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	680 }
e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	681
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	682 XS_MUTEX_UNLOCK(xs_subctrl);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	683 XS_MUTEX_UNLOCK(xs_status);
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	684 }
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	685
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	686
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	687 void xs_subctrl_prevsong(void)
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	688 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	689 XS_MUTEX_LOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	690
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	691 if (xs_status.tuneInfo && xs_status.isPlaying) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	692 if (xs_status.currSong > 1)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	693 xs_status.currSong--;
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	694 }
e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	695
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	696 XS_MUTEX_UNLOCK(xs_status);
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	697
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	698 xs_subctrl_update();
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	699 }
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	700
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	701
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	702 void xs_subctrl_nextsong(void)
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	703 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	704 XS_MUTEX_LOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	705
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	706 if (xs_status.tuneInfo && xs_status.isPlaying) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	707 if (xs_status.currSong < xs_status.tuneInfo->nsubTunes)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	708 xs_status.currSong++;
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	709 }
e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	710
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	711 XS_MUTEX_UNLOCK(xs_status);
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	712
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	713 xs_subctrl_update();
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	714 }
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	715
177 6e350784aa57 Various cleanups. Min-playtime option now works. Configuration has more Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	716
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	717 void xs_subctrl_update(void)
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	718 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	719 GtkAdjustment *tmpAdj;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	720
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	721 XS_MUTEX_LOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	722 XS_MUTEX_LOCK(xs_subctrl);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	723
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	724 /* Check if control window exists, we are currently playing and have a tune */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	725 if (xs_subctrl) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	726 if (xs_status.tuneInfo && xs_status.isPlaying) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	727 tmpAdj = GTK_ADJUSTMENT(xs_subctrl_adj);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	728
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	729 tmpAdj->value = xs_status.currSong;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	730 tmpAdj->lower = 1;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	731 tmpAdj->upper = xs_status.tuneInfo->nsubTunes;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	732 XS_MUTEX_UNLOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	733 XS_MUTEX_UNLOCK(xs_subctrl);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	734 gtk_adjustment_value_changed(tmpAdj);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	735 } else {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	736 XS_MUTEX_UNLOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	737 XS_MUTEX_UNLOCK(xs_subctrl);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	738 xs_subctrl_close();
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	739 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	740 } else {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	741 XS_MUTEX_UNLOCK(xs_subctrl);
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	742 XS_MUTEX_UNLOCK(xs_status);
e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	743 }
177 6e350784aa57 Various cleanups. Min-playtime option now works. Configuration has more Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	744
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	745 xs_fileinfo_update();
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	746 }
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	747
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	748
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	749 void xs_subctrl_close(void)
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	750 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	751 XS_MUTEX_LOCK(xs_subctrl);
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	752
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	753 if (xs_subctrl) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	754 gtk_widget_destroy(xs_subctrl);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	755 xs_subctrl = NULL;
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	756 }
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	757
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	758 XS_MUTEX_UNLOCK(xs_subctrl);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	759 }
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	760
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	761
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	762 gboolean xs_subctrl_keypress(GtkWidget * win, GdkEventKey * ev)
184 4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes. Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	763 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	764 (void) win;
184 4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes. Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	765
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	766 if (ev->keyval == GDK_Escape)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	767 xs_subctrl_close();
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	768
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	769 return FALSE;
184 4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes. Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	770 }
4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes. Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	771
4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes. Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	772
294 f0ece2d20094 Do correct typecasts and declare xs_subctrl_open arguments as void. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	773 void xs_subctrl_open(void)
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	774 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	775 GtkWidget frame25, hbox15, subctrl_prev, subctrl_current, *subctrl_next;
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	776
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	777 XS_MUTEX_LOCK(xs_subctrl);
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	778 if (!xs_status.tuneInfo \|\| !xs_status.isPlaying \|\|
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	779 xs_subctrl \|\| (xs_status.tuneInfo->nsubTunes <= 1)) {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	780 XS_MUTEX_UNLOCK(xs_subctrl);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	781 return;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	782 }
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	783
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	784 /* Create the pop-up window */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	785 xs_subctrl = gtk_window_new(GTK_WINDOW_DIALOG);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	786 gtk_widget_set_name(xs_subctrl, "xs_subctrl");
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	787 gtk_object_set_data(GTK_OBJECT(xs_subctrl), "xs_subctrl", xs_subctrl);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	788
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	789 gtk_window_set_title(GTK_WINDOW(xs_subctrl), _("Subtune Control"));
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	790 gtk_window_set_position(GTK_WINDOW(xs_subctrl), GTK_WIN_POS_MOUSE);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	791 gtk_container_set_border_width(GTK_CONTAINER(xs_subctrl), 0);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	792 gtk_window_set_policy(GTK_WINDOW(xs_subctrl), FALSE, FALSE, FALSE);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	793
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	794 gtk_signal_connect(GTK_OBJECT(xs_subctrl), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &xs_subctrl);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	795
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	796 gtk_signal_connect(GTK_OBJECT(xs_subctrl), "focus_out_event", GTK_SIGNAL_FUNC(xs_subctrl_close), NULL);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	797
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	798 gtk_widget_realize(xs_subctrl);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	799 gdk_window_set_decorations(xs_subctrl->window, (GdkWMDecoration) 0);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	800
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	801
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	802 /* Create the control widgets */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	803 frame25 = gtk_frame_new(NULL);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	804 gtk_container_add(GTK_CONTAINER(xs_subctrl), frame25);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	805 gtk_container_set_border_width(GTK_CONTAINER(frame25), 2);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	806 gtk_frame_set_shadow_type(GTK_FRAME(frame25), GTK_SHADOW_OUT);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	807
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	808 hbox15 = gtk_hbox_new(FALSE, 4);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	809 gtk_container_add(GTK_CONTAINER(frame25), hbox15);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	810
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	811 subctrl_prev = gtk_button_new_with_label(" < ");
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	812 gtk_widget_set_name(subctrl_prev, "subctrl_prev");
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	813 gtk_box_pack_start(GTK_BOX(hbox15), subctrl_prev, FALSE, FALSE, 0);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	814
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	815 xs_subctrl_adj = gtk_adjustment_new(xs_status.currSong, 1, xs_status.tuneInfo->nsubTunes, 1, 1, 0);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	816 gtk_signal_connect(GTK_OBJECT(xs_subctrl_adj), "value_changed", GTK_SIGNAL_FUNC(xs_subctrl_setsong), NULL);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	817
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	818 subctrl_current = gtk_hscale_new(GTK_ADJUSTMENT(xs_subctrl_adj));
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	819 gtk_widget_set_name(subctrl_current, "subctrl_current");
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	820 gtk_box_pack_start(GTK_BOX(hbox15), subctrl_current, FALSE, TRUE, 0);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	821 gtk_scale_set_digits(GTK_SCALE(subctrl_current), 0);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	822 gtk_range_set_update_policy(GTK_RANGE(subctrl_current), GTK_UPDATE_DELAYED);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	823 gtk_widget_grab_focus(subctrl_current);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	824
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	825 subctrl_next = gtk_button_new_with_label(" > ");
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	826 gtk_widget_set_name(subctrl_next, "subctrl_next");
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	827 gtk_box_pack_start(GTK_BOX(hbox15), subctrl_next, FALSE, FALSE, 0);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	828
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	829 gtk_signal_connect(GTK_OBJECT(subctrl_prev), "clicked", GTK_SIGNAL_FUNC(xs_subctrl_prevsong), NULL);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	830
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	831 gtk_signal_connect(GTK_OBJECT(subctrl_next), "clicked", GTK_SIGNAL_FUNC(xs_subctrl_nextsong), NULL);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	832
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	833 gtk_signal_connect(GTK_OBJECT(xs_subctrl), "key_press_event", GTK_SIGNAL_FUNC(xs_subctrl_keypress), NULL);
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	834
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	835 gtk_widget_show_all(xs_subctrl);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	836
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	837 XS_MUTEX_UNLOCK(xs_subctrl);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	838 }
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	839
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	840
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	841 /*
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	842 * Set the time-seek position
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	843 * The playing thread will do the "seeking", which means sub-tune
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	844 * changing in XMMS-SID's case. iTime argument is time in seconds,
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	845 * in contrast to milliseconds used in other occasions.
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	846 *
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	847 * This function is called whenever position slider is clicked or
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	848 * other method of seeking is used (keyboard, etc.)
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	849 */
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	850 void xs_seek(gint iTime)
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	851 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	852 /* Check status */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	853 XS_MUTEX_LOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	854 if (!xs_status.tuneInfo \|\| !xs_status.isPlaying) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	855 XS_MUTEX_UNLOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	856 return;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	857 }
132 4162a5370b9e Added "seek"-subsong control option, in style of xmms-sidplay. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	858
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	859 /* Act according to settings */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	860 switch (xs_cfg.subsongControl) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	861 case XS_SSC_SEEK:
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	862 if (iTime < xs_status.lastTime) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	863 if (xs_status.currSong > 1)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	864 xs_status.currSong--;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	865 } else if (iTime > xs_status.lastTime) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	866 if (xs_status.currSong < xs_status.tuneInfo->nsubTunes)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	867 xs_status.currSong++;
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	868 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	869 break;
78 ab522ab65c85 Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	870
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	871 case XS_SSC_POPUP:
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	872 xs_subctrl_open();
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	873 break;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	874
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	875 /* If we have song-position patch, check settings */
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	876 #ifdef HAVE_SONG_POSITION
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	877 case XS_SSC_PATCH:
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	878 if ((iTime > 0) && (iTime <= xs_status.tuneInfo->nsubTunes))
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	879 xs_status.currSong = iTime;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	880 break;
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	881 #endif
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	882 }
103 fe83646e6baa Changed plrFillBuffer()-functions to return actual number of samples computed. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	883
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	884 XS_MUTEX_UNLOCK(xs_status);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	885 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	886
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	887
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	888 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	889 * Return the playing "position/time"
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	890 * Determine current position/time in song. Used by XMMS to update
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	891 * the song clock and position slider and MOST importantly to determine
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	892 * END OF SONG! Return value of -2 means error, XMMS opens an audio
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	893 * error dialog. -1 means end of song (if one was playing currently).
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	894 */
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	895 gint xs_get_time(void)
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	896 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	897 /* If errorflag is set, return -2 to signal it to XMMS's idle callback */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	898 XS_MUTEX_LOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	899 if (xs_status.isError) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	900 XS_MUTEX_UNLOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	901 return -2;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	902 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	903
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	904 /* If there is no tune, return -1 */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	905 if (!xs_status.tuneInfo) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	906 XS_MUTEX_UNLOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	907 return -1;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	908 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	909
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	910 /* If tune has ended, return -1 */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	911 if (!xs_status.isPlaying) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	912 XS_MUTEX_UNLOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	913 return -1;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	914 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	915
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	916 /* Let's see what we do */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	917 switch (xs_cfg.subsongControl) {
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	918 case XS_SSC_SEEK:
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	919 xs_status.lastTime = (xs_plugin_ip.output->output_time() / 1000);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	920 break;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	921
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	922 #ifdef HAVE_SONG_POSITION
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	923 case XS_SSC_PATCH:
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	924 set_song_position(xs_status.currSong, 1, xs_status.tuneInfo->nsubTunes);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	925 break;
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	926 #endif
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	927 }
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	928
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	929 XS_MUTEX_UNLOCK(xs_status);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	930
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	931 /* Return output time reported by audio output plugin */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	932 return xs_plugin_ip.output->output_time();
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	933 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	934
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	935
477 53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	936 /* Return song information: called by XMMS when initially loading the playlist.
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	937 * Subsequent changes to information are made by the player thread,
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	938 * which uses xs_plugin_ip.set_info();
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	939 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	940 void xs_get_song_info(gchar * songFilename, gchar ** songTitle, gint * songLength)
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	941 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	942 t_xs_tuneinfo *pInfo;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	943
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	944 /* Get tune information from emulation engine */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	945 pInfo = xs_status.sidPlayer->plrGetSIDInfo(songFilename);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	946 if (!pInfo)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	947 return;
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	948
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	949 /* Get sub-tune information, if available */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	950 if ((pInfo->startTune > 0) && (pInfo->startTune <= pInfo->nsubTunes)) {
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	951 gint tmpInt;
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	952
464 08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	953 (*songTitle) = xs_make_titlestring(pInfo, pInfo->startTune);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	954
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	955 tmpInt = pInfo->subTunes[pInfo->startTune-1].tuneLength;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	956 if (tmpInt < 0)
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	957 (*songLength) = -1;
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	958 else
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	959 (songLength) = (tmpInt 1000);
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	960 }
177 6e350784aa57 Various cleanups. Min-playtime option now works. Configuration has more Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	961
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	962 /* Free tune information */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	963 xs_tuneinfo_free(pInfo);
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	964 }
94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	965
94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	966
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	967 /* Allocate a new tune information structure
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	968 */
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	969 t_xs_tuneinfo xs_tuneinfo_new(const gchar pcFilename,
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	970 gint nsubTunes, gint startTune, const gchar * sidName,
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	971 const gchar * sidComposer, const gchar * sidCopyright,
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	972 gint loadAddr, gint initAddr, gint playAddr,
464 08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	973 gint dataFileLen, const gchar *sidFormat, gint sidModel)
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	974 {
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	975 t_xs_tuneinfo *pResult;
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	976 t_xs_sldb_node *tmpLength;
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	977 gint i;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	978
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	979 /* Allocate structure */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	980 pResult = (t_xs_tuneinfo *) g_malloc0(sizeof(t_xs_tuneinfo));
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	981 if (!pResult) {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	982 xs_error(_("Could not allocate memory for t_xs_tuneinfo ('%s')\n"),
faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	983 pcFilename);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	984 return NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	985 }
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	986
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	987 pResult->sidFilename = g_strdup(pcFilename);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	988 if (!pResult->sidFilename) {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	989 xs_error(_("Could not allocate sidFilename ('%s')\n"),
faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	990 pcFilename);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	991 g_free(pResult);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	992 return NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	993 }
333 15c5b231efc9 - subTune -> subTunes Matti Hamalainen <ccr@tnsp.org> parents: 324 diff changeset	994
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	995 /* Allocate space for subtune information */
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	996 pResult->subTunes = g_malloc0(sizeof(t_xs_subtuneinfo) * (nsubTunes + 1));
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	997 if (!pResult->subTunes) {
424 faf12767a6f1 Preparing for internationalization. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	998 xs_error(_("Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"),
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	999 pcFilename, nsubTunes);
333 15c5b231efc9 - subTune -> subTunes Matti Hamalainen <ccr@tnsp.org> parents: 324 diff changeset	1000
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1001 g_free(pResult->sidFilename);
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1002 g_free(pResult);
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1003 return NULL;
333 15c5b231efc9 - subTune -> subTunes Matti Hamalainen <ccr@tnsp.org> parents: 324 diff changeset	1004 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1005
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1006 /* The following allocations don't matter if they fail */
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1007 pResult->sidName = g_strdup(sidName);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1008 pResult->sidComposer = g_strdup(sidComposer);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1009 pResult->sidCopyright = g_strdup(sidCopyright);
333 15c5b231efc9 - subTune -> subTunes Matti Hamalainen <ccr@tnsp.org> parents: 324 diff changeset	1010
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1011 pResult->nsubTunes = nsubTunes;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1012 pResult->startTune = startTune;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	1013
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1014 pResult->loadAddr = loadAddr;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1015 pResult->initAddr = initAddr;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1016 pResult->playAddr = playAddr;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1017 pResult->dataFileLen = dataFileLen;
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1018 pResult->sidFormat = g_strdup(sidFormat);
455 fe3b0623955a Add new fields. Matti Hamalainen <ccr@tnsp.org> parents: 424 diff changeset	1019
fe3b0623955a Add new fields. Matti Hamalainen <ccr@tnsp.org> parents: 424 diff changeset	1020 pResult->sidModel = sidModel;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1021
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1022 /* Get length information (NOTE: Do not free this!) */
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1023 tmpLength = xs_songlen_get(pcFilename);
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1024
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1025 /* Fill in sub-tune information */
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1026 for (i = 0; i < pResult->nsubTunes; i++) {
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1027 if (tmpLength && (i < tmpLength->nLengths))
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1028 pResult->subTunes[i].tuneLength = tmpLength->sLengths[i];
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1029 else
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1030 pResult->subTunes[i].tuneLength = -1;
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1031
464 08038c161936 Accomodate the changes in xs_make_titlestring(), xs_tuneinfo_() and Matti Hamalainen <ccr@tnsp.org>* parents: 462 diff changeset	1032 pResult->subTunes[i].tuneSpeed = -1;
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1033 }
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1034
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1035 return pResult;
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	1036 }
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	1037
94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	1038
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	1039 /* Free given tune information structure
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	1040 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1041 void xs_tuneinfo_free(t_xs_tuneinfo * pTune)
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	1042 {
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1043 if (!pTune) return;
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1044
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1045 g_free(pTune->subTunes);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1046 g_free(pTune->sidFilename);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1047 g_free(pTune->sidName);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1048 g_free(pTune->sidComposer);
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1049 g_free(pTune->sidCopyright);
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	1050 g_free(pTune->sidFormat);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	1051 g_free(pTune);
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	1052 }
461 a1224c1f8670 STILdb handling glue moved to xmms-sid.c Matti Hamalainen <ccr@tnsp.org> parents: 455 diff changeset	1053
477 53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1054
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1055 /* Song length database handling glue
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1056 */
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1057 gint xs_songlen_init(void)
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1058 {
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1059 XS_MUTEX_LOCK(xs_cfg);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1060
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1061 if (!xs_cfg.songlenDBPath) {
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1062 XS_MUTEX_UNLOCK(xs_cfg);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1063 return -1;
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1064 }
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1065
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1066 XS_MUTEX_LOCK(xs_sldb_db);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1067
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1068 /* Check if already initialized */
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1069 if (xs_sldb_db)
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1070 xs_sldb_free(xs_sldb_db);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1071
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1072 /* Allocate database */
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1073 xs_sldb_db = (t_xs_sldb *) g_malloc0(sizeof(t_xs_sldb));
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1074 if (!xs_sldb_db) {
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1075 XS_MUTEX_UNLOCK(xs_cfg);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1076 XS_MUTEX_UNLOCK(xs_sldb_db);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1077 return -2;
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1078 }
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1079
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1080 /* Read the database */
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1081 if (xs_sldb_read(xs_sldb_db, xs_cfg.songlenDBPath) != 0) {
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1082 xs_sldb_free(xs_sldb_db);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1083 xs_sldb_db = NULL;
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1084 XS_MUTEX_UNLOCK(xs_cfg);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1085 XS_MUTEX_UNLOCK(xs_sldb_db);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1086 return -3;
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1087 }
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1088
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1089 /* Create index */
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1090 if (xs_sldb_index(xs_sldb_db) != 0) {
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1091 xs_sldb_free(xs_sldb_db);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1092 xs_sldb_db = NULL;
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1093 XS_MUTEX_UNLOCK(xs_cfg);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1094 XS_MUTEX_UNLOCK(xs_sldb_db);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1095 return -4;
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1096 }
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1097
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1098 XS_MUTEX_UNLOCK(xs_cfg);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1099 XS_MUTEX_UNLOCK(xs_sldb_db);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1100 return 0;
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1101 }
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1102
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1103
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1104 void xs_songlen_close(void)
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1105 {
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1106 XS_MUTEX_LOCK(xs_sldb_db);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1107 xs_sldb_free(xs_sldb_db);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1108 xs_sldb_db = NULL;
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1109 XS_MUTEX_UNLOCK(xs_sldb_db);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1110 }
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1111
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1112
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1113 t_xs_sldb_node xs_songlen_get(const gchar pcFilename)
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1114 {
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1115 t_xs_sldb_node *pResult;
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1116
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1117 XS_MUTEX_LOCK(xs_sldb_db);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1118
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1119 if (xs_cfg.songlenDBEnable && xs_sldb_db)
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1120 pResult = xs_sldb_get(xs_sldb_db, pcFilename);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1121 else
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1122 pResult = NULL;
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1123
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1124 XS_MUTEX_UNLOCK(xs_sldb_db);
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1125
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1126 return pResult;
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	1127 }

Mercurial > hg > xmms-sid

annotate src/xmms-sid.c @ 543:358b2770d32d