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

annotate src/xmms-sid.c @ 835:d508c7c4bc69

Add libSIDPlay2-FP backend interface module.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 08 Nov 2012 20:47:49 +0200
parents	8f155eca3612
children	29f3c3f29c0d

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>
723 9321ffa2ea7e Update copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 714 diff changeset	7 (C) Copyright 1999-2009 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"
235 d04191d1ea64 Add xs_fileinfo.h, move appropriate function prototypes there. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	37 #include "xs_fileinfo.h"
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	38 #include "xs_interface.h"
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39 #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	40 #include "xs_player.h"
622 d7389ea52113 Move SLDB and STIL utility functions to xs_slsup.[ch] and amend some changes between XMMS-SID and Aud-SID via a macro mess. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	41 #include "xs_slsup.h"
d7389ea52113 Move SLDB and STIL utility functions to xs_slsup.[ch] and amend some changes between XMMS-SID and Aud-SID via a macro mess. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	42
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	43
787 8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	44 /* List of emulator engines
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	45 */
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	46 #ifdef HAVE_SIDPLAY1
835 d508c7c4bc69 Add libSIDPlay2-FP backend interface module. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	47 # include "xs_sidplay1.h"
787 8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	48 #endif
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	49 #ifdef HAVE_SIDPLAY2
835 d508c7c4bc69 Add libSIDPlay2-FP backend interface module. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	50 # include "xs_sidplay2.h"
d508c7c4bc69 Add libSIDPlay2-FP backend interface module. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	51 #endif
d508c7c4bc69 Add libSIDPlay2-FP backend interface module. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	52 #ifdef HAVE_SIDPLAY2
d508c7c4bc69 Add libSIDPlay2-FP backend interface module. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	53 # include "xs_sidplay2.h"
787 8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	54 #endif
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	55
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	56 static XSEngine xs_enginelist[] =
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	57 {
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	58 #ifdef HAVE_SIDPLAY1
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	59 {
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	60 XS_ENG_SIDPLAY1,
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	61 xs_sidplay1_probe,
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	62 xs_sidplay1_init, xs_sidplay1_close,
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	63 xs_sidplay1_initsong, xs_sidplay1_fillbuffer,
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	64 xs_sidplay1_load, xs_sidplay1_delete,
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	65 xs_sidplay1_getinfo, xs_sidplay1_updateinfo,
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	66 NULL
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	67 },
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	68 #endif
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	69 #ifdef HAVE_SIDPLAY2
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	70 {
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	71 XS_ENG_SIDPLAY2,
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	72 xs_sidplay2_probe,
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	73 xs_sidplay2_init, xs_sidplay2_close,
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	74 xs_sidplay2_initsong, xs_sidplay2_fillbuffer,
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	75 xs_sidplay2_load, xs_sidplay2_delete,
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	76 xs_sidplay2_getinfo, xs_sidplay2_updateinfo,
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	77 xs_sidplay2_flush
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	78 },
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	79 #endif
835 d508c7c4bc69 Add libSIDPlay2-FP backend interface module. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	80 #ifdef HAVE_SIDPLAY2_FP
d508c7c4bc69 Add libSIDPlay2-FP backend interface module. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	81 {
d508c7c4bc69 Add libSIDPlay2-FP backend interface module. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	82 XS_ENG_SIDPLAY2_FP,
d508c7c4bc69 Add libSIDPlay2-FP backend interface module. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	83 xs_sidplayfp_probe,
d508c7c4bc69 Add libSIDPlay2-FP backend interface module. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	84 xs_sidplayfp_init, xs_sidplayfp_close,
d508c7c4bc69 Add libSIDPlay2-FP backend interface module. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	85 xs_sidplayfp_initsong, xs_sidplayfp_fillbuffer,
d508c7c4bc69 Add libSIDPlay2-FP backend interface module. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	86 xs_sidplayfp_load, xs_sidplayfp_delete,
d508c7c4bc69 Add libSIDPlay2-FP backend interface module. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	87 xs_sidplayfp_getinfo, xs_sidplayfp_updateinfo,
d508c7c4bc69 Add libSIDPlay2-FP backend interface module. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	88 xs_sidplayfp_flush
d508c7c4bc69 Add libSIDPlay2-FP backend interface module. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	89 },
d508c7c4bc69 Add libSIDPlay2-FP backend interface module. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	90 #endif
787 8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	91 };
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	92
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	93 static const gint xs_nenginelist = sizeof(xs_enginelist) / sizeof(xs_enginelist[0]);
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	94
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	95
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	96 /* Global variables
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97 */
751 55eea3fa8868 Rename some structures. Matti Hamalainen <ccr@tnsp.org> parents: 748 diff changeset	98 XSEngineState xs_status;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	99 XS_MUTEX(xs_status);
532 bc548249464a Audacious glue. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	100 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	101
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	102 static GtkWidget *xs_subctrl = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	103 static GtkObject *xs_subctrl_adj = NULL;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	104 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	105
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	106 void xs_subctrl_close(void);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	107 void xs_subctrl_update(void);
477 53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	108
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	109
787 8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	110 /* Error messages
297 ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	111 */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 383 diff changeset	112 void xs_error(const char *fmt, ...)
297 ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	113 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	114 va_list ap;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	115 fprintf(stderr, "XMMS-SID: ");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	116 va_start(ap, fmt);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	117 vfprintf(stderr, fmt, ap);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	118 va_end(ap);
297 ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	119 }
ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	120
299 9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	121 #ifndef DEBUG_NP
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	122 void XSDEBUG(const char *fmt, ...)
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	123 {
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	124 #ifdef DEBUG
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	125 va_list ap;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	126 fprintf(stderr, "XSDEBUG: ");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	127 va_start(ap, fmt);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	128 vfprintf(stderr, fmt, ap);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	129 va_end(ap);
299 9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	130 #endif
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	131 }
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	132 #endif
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	133
461 a1224c1f8670 STILdb handling glue moved to xmms-sid.c Matti Hamalainen <ccr@tnsp.org> parents: 455 diff changeset	134
297 ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	135 /*
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	136 * Initialization functions
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	137 */
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	138 void xs_reinit(void)
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139 {
787 8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	140 gint engine;
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	141 gboolean initialized = FALSE;
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	142
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	143 /* Stop playing, if we are */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	144 XS_MUTEX_LOCK(xs_status);
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	145 if (xs_status.playing)
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	146 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	147 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	148 xs_stop();
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	149 }
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	150 else
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	151 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	152 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	153 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	154
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	155 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	156 XS_MUTEX_LOCK(xs_cfg);
606 59046d70c0ef Fixed a thread race conds in xs_reinit() and xs_get_song_info() Matti Hamalainen <ccr@tnsp.org> parents: 543 diff changeset	157
809 8f155eca3612 Shut down/delete player resources at reinit. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	158 // Close player stuff
8f155eca3612 Shut down/delete player resources at reinit. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	159 xs_tuneinfo_free(xs_status.tuneInfo);
8f155eca3612 Shut down/delete player resources at reinit. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	160 xs_status.tuneInfo = NULL;
8f155eca3612 Shut down/delete player resources at reinit. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	161 if (xs_status.engine != NULL)
8f155eca3612 Shut down/delete player resources at reinit. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	162 {
8f155eca3612 Shut down/delete player resources at reinit. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	163 xs_status.engine->plrDeleteSID(&xs_status);
8f155eca3612 Shut down/delete player resources at reinit. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	164 xs_status.engine->plrClose(&xs_status);
8f155eca3612 Shut down/delete player resources at reinit. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	165 }
8f155eca3612 Shut down/delete player resources at reinit. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	166
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	167 /* Initialize status and sanitize configuration */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	168 memset(&xs_status, 0, sizeof(xs_status));
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	169
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	170 if (xs_cfg.audioFrequency < 8000)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	171 xs_cfg.audioFrequency = 8000;
273 f6daddca03c7 Merging in oversampling support, audio settings sanitation. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	172
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	173 xs_status.audioFrequency = xs_cfg.audioFrequency;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	174 xs_status.audioBitsPerSample = xs_cfg.audioBitsPerSample;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	175 xs_status.audioChannels = xs_cfg.audioChannels;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	176 xs_status.audioFormat = -1;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	177
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	178 /* Try to initialize emulator engine */
787 8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	179 XSDEBUG("initializing emulator engine #%i...\n", xs_cfg.playerEngine);
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	180
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	181 for (engine = 0; engine < xs_nenginelist && !initialized; engine++)
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	182 {
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	183 if (xs_enginelist[engine].plrIdent == xs_cfg.playerEngine &&
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	184 xs_enginelist[engine].plrInit(&xs_status))
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	185 {
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	186 initialized = TRUE;
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	187 xs_status.engine = &xs_enginelist[engine];
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	188 }
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	189 }
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	190
8f0d11865742 Move some code around, remove xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 767 diff changeset	191 XSDEBUG("init#1: %s, %i\n", initialized ? "OK" : "FAILED", xs_cfg.playerEngine);
606 59046d70c0ef Fixed a thread race conds in xs_reinit() and xs_get_song_info() Matti Hamalainen <ccr@tnsp.org> parents: 543 diff changeset	192
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	193 /* Get settings back, in case the chosen emulator backend changed them */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	194 xs_cfg.audioFrequency = xs_status.audioFrequency;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	195 xs_cfg.audioBitsPerSample = xs_status.audioBitsPerSample;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	196 xs_cfg.audioChannels = xs_status.audioChannels;
273 f6daddca03c7 Merging in oversampling support, audio settings sanitation. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	197
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	198 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	199 XS_MUTEX_UNLOCK(xs_cfg);
606 59046d70c0ef Fixed a thread race conds in xs_reinit() and xs_get_song_info() Matti Hamalainen <ccr@tnsp.org> parents: 543 diff changeset	200
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	201 /* Initialize song-length database */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	202 xs_songlen_close();
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	203 if (xs_cfg.songlenDBEnable && (xs_songlen_init() != 0))
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	204 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	205 xs_error("Error initializing song-length database!\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	206 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	207
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	208 /* Initialize STIL database */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	209 xs_stil_close();
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	210 if (xs_cfg.stilDBEnable && (xs_stil_init() != 0))
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	211 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	212 xs_error("Error initializing STIL database!\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	213 }
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	214 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	215
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	216
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 * Initialize XMMS-SID
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	219 */
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	220 void xs_init(void)
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	221 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	222 XSDEBUG("xs_init()\n");
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	223
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	224 /* Initialize and get configuration */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	225 xs_init_configuration();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	226 xs_read_configuration();
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	227
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	228 /* Initialize subsystems */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	229 xs_reinit();
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	230
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	231 XSDEBUG("OK\n");
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	232 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	233
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 * Shut down XMMS-SID
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 void xs_close(void)
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	239 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	240 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	241
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	242 /* Stop playing, free structures */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	243 xs_stop();
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	244
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	245 xs_tuneinfo_free(xs_status.tuneInfo);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	246 xs_status.tuneInfo = NULL;
794 3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't Matti Hamalainen <ccr@tnsp.org> parents: 787 diff changeset	247 if (xs_status.engine != NULL)
3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't Matti Hamalainen <ccr@tnsp.org> parents: 787 diff changeset	248 {
3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't Matti Hamalainen <ccr@tnsp.org> parents: 787 diff changeset	249 xs_status.engine->plrDeleteSID(&xs_status);
3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't Matti Hamalainen <ccr@tnsp.org> parents: 787 diff changeset	250 xs_status.engine->plrClose(&xs_status);
3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't Matti Hamalainen <ccr@tnsp.org> parents: 787 diff changeset	251 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	252
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	253 xs_songlen_close();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	254 xs_stil_close();
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	255
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	256 XSDEBUG("shutdown finished.\n");
71 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
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	260 /*
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	261 * 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	262 */
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	263 gint xs_is_our_file(gchar *filename)
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	264 {
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	265 gchar *ext;
760 f6a57c0656fa Handle engine initialization failures a bit more .. "gracefully". Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	266 if (xs_status.engine == NULL)
f6a57c0656fa Handle engine initialization failures a bit more .. "gracefully". Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	267 return FALSE;
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	268
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	269 /* Check the filename */
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	270 if (filename == NULL)
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	271 return FALSE;
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	272
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	273 /* Try to detect via detection routine, if required */
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	274 if (xs_cfg.detectMagic)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	275 {
751 55eea3fa8868 Rename some structures. Matti Hamalainen <ccr@tnsp.org> parents: 748 diff changeset	276 XSFile *f;
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	277 if ((f = xs_fopen(filename, "rb")) != NULL)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	278 {
753 36c6a6e629bb Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 751 diff changeset	279 if (xs_status.engine->plrProbe(f))
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	280 return TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	281 xs_fclose(f);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	282 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	283 }
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	284
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	285 /* Detect just by checking filename extension */
763 61a527ac3baa Cleanups, remove useless function. Matti Hamalainen <ccr@tnsp.org> parents: 760 diff changeset	286 ext = strrchr(filename, '.');
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	287 if (ext)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	288 {
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	289 ext++;
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	290 switch (xs_cfg.playerEngine)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	291 {
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	292 case XS_ENG_SIDPLAY1:
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	293 case XS_ENG_SIDPLAY2:
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	294 if (!g_strcasecmp(ext, "psid"))
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	295 return TRUE;
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	296 if (!g_strcasecmp(ext, "sid"))
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	297 return TRUE;
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	298 if (!g_strcasecmp(ext, "dat"))
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	299 return TRUE;
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	300 if (!g_strcasecmp(ext, "inf"))
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	301 return TRUE;
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	302 if (!g_strcasecmp(ext, "info"))
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	303 return TRUE;
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	304 break;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	305 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	306 }
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	307
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	308 return FALSE;
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	309 }
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	310
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	311
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	312 /*
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	313 * Main playing thread loop
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	314 */
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	315 void xs_playthread(void argPointer)
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	316 {
751 55eea3fa8868 Rename some structures. Matti Hamalainen <ccr@tnsp.org> parents: 748 diff changeset	317 XSEngineState myStatus;
55eea3fa8868 Rename some structures. Matti Hamalainen <ccr@tnsp.org> parents: 748 diff changeset	318 XSTuneInfo *myTune;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	319 gboolean audioOpen = FALSE, doPlay = FALSE, isFound = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	320 gint audioGot, songLength, i;
748 d9d769b5dbe2 Remove oversampling support. Matti Hamalainen <ccr@tnsp.org> parents: 735 diff changeset	321 gchar audioBuffer = NULL, tmpTitle;
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	322
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	323 (void) argPointer;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	324
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	325 /* Initialize */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	326 XSDEBUG("entering player thread\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	327 XS_MUTEX_LOCK(xs_status);
751 55eea3fa8868 Rename some structures. Matti Hamalainen <ccr@tnsp.org> parents: 748 diff changeset	328 memcpy(&myStatus, &xs_status, sizeof(XSEngineState));
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	329 myTune = xs_status.tuneInfo;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	330 for (i = 0; i <= myTune->nsubTunes; i++)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	331 myTune->subTunes[i].tunePlayed = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	332 XS_MUTEX_UNLOCK(xs_status);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	333
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	334 /* Allocate audio buffer */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	335 audioBuffer = (gchar *) g_malloc(XS_AUDIOBUF_SIZE);
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	336 if (audioBuffer == NULL)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	337 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	338 xs_error("Couldn't allocate memory for audio data buffer!\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	339 goto xs_err_exit;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	340 }
273 f6daddca03c7 Merging in oversampling support, audio settings sanitation. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	341
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	342 /*
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	343 * Main player loop: while not stopped, loop here - play subtunes
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	344 */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	345 audioOpen = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	346 doPlay = TRUE;
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	347 while (xs_status.playing && doPlay)
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	348 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	349 /* Automatic sub-tune change logic */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	350 XS_MUTEX_LOCK(xs_cfg);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	351 XS_MUTEX_LOCK(xs_status);
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	352 myStatus.playing = TRUE;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	353
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	354 if (xs_status.currSong < 1 \|\| myStatus.currSong < 1)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	355 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	356 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	357 XS_MUTEX_UNLOCK(xs_cfg);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	358 goto xs_err_exit;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	359 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	360
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	361 if (xs_cfg.subAutoEnable && (myStatus.currSong == xs_status.currSong))
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	362 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	363 /* Check if currently selected sub-tune has been played already */
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	364 if (myTune->subTunes[myStatus.currSong-1].tunePlayed)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	365 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	366 /* Find a tune that has not been played */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	367 XSDEBUG("tune #%i already played, finding next match ...\n", myStatus.currSong);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	368 isFound = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	369 i = 0;
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	370 while (!isFound && (++i <= myTune->nsubTunes))
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	371 {
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	372 if (xs_cfg.subAutoMinOnly)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	373 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	374 /* A tune with minimum length must be found */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	375 if (!myTune->subTunes[i-1].tunePlayed &&
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	376 myTune->subTunes[i-1].tuneLength >= xs_cfg.subAutoMinTime)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	377 isFound = TRUE;
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	378 }
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	379 else
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	380 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	381 /* Any unplayed tune is okay */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	382 if (!myTune->subTunes[i-1].tunePlayed)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	383 isFound = TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	384 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	385 }
281 d913f0f69487 Automatic sub-tune changing. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	386
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	387 if (isFound)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	388 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	389 /* Set the new sub-tune */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	390 XSDEBUG("found #%i\n", i);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	391 xs_status.currSong = i;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	392 } else
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	393 /* This is the end */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	394 doPlay = FALSE;
281 d913f0f69487 Automatic sub-tune changing. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	395
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	396 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	397 XS_MUTEX_UNLOCK(xs_cfg);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	398 continue; /* This is ugly, but ... */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	399 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	400 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	401
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	402 /* Tell that we are initializing, update sub-tune controls */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	403 myStatus.currSong = xs_status.currSong;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	404 myTune->subTunes[myStatus.currSong-1].tunePlayed = TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	405 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	406 XS_MUTEX_UNLOCK(xs_cfg);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	407
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	408 XSDEBUG("subtune #%i selected, initializing...\n", myStatus.currSong);
281 d913f0f69487 Automatic sub-tune changing. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	409
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	410 GDK_THREADS_ENTER();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	411 xs_subctrl_update();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	412 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	413
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	414 /* Check minimum playtime */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	415 songLength = myTune->subTunes[myStatus.currSong-1].tuneLength;
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	416 if (xs_cfg.playMinTimeEnable && songLength >= 0)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	417 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	418 if (songLength < xs_cfg.playMinTime)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	419 songLength = xs_cfg.playMinTime;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	420 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	421
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	422 /* Initialize song */
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	423 if (!myStatus.engine->plrInitSong(&myStatus))
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	424 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	425 xs_error("Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n",
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	426 myTune->sidFilename, myStatus.currSong);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	427 goto xs_err_exit;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	428 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	429
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	430 /* Open the audio output */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	431 XSDEBUG("open audio output (%d, %d, %d)\n",
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	432 myStatus.audioFormat, myStatus.audioFrequency, myStatus.audioChannels);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	433
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	434 if (!xs_plugin_ip.output->
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	435 open_audio(myStatus.audioFormat, myStatus.audioFrequency, myStatus.audioChannels))
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	436 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	437 xs_error("Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n",
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	438 myStatus.audioFormat,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	439 myStatus.audioFrequency,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	440 myStatus.audioChannels);
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	441
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	442 XS_MUTEX_LOCK(xs_status);
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	443 xs_status.error = TRUE;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	444 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	445 goto xs_err_exit;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	446 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	447
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	448 audioOpen = TRUE;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	449
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	450 /* Set song information for current subtune */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	451 XSDEBUG("set tune info\n");
753 36c6a6e629bb Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 751 diff changeset	452 myStatus.engine->plrUpdateSIDInfo(&myStatus);
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	453 tmpTitle = xs_make_titlestring(myTune, myStatus.currSong);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	454
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	455 xs_plugin_ip.set_info(
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	456 tmpTitle,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	457 (songLength > 0) ? (songLength * 1000) : 0,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	458 -1,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	459 myStatus.audioFrequency,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	460 myStatus.audioChannels);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	461
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	462 g_free(tmpTitle);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	463
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	464 XSDEBUG("playing\n");
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	465
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	466 /*
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	467 * Play the subtune
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	468 */
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	469 while (xs_status.playing && myStatus.playing && (xs_status.currSong == myStatus.currSong))
767 cf644ac89b54 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 763 diff changeset	470 {
753 36c6a6e629bb Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 751 diff changeset	471 audioGot = myStatus.engine->plrFillBuffer(
748 d9d769b5dbe2 Remove oversampling support. Matti Hamalainen <ccr@tnsp.org> parents: 735 diff changeset	472 &myStatus, audioBuffer, XS_AUDIOBUF_SIZE);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	473
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	474 /* I <3 visualice/haujobb */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	475 xs_plugin_ip.add_vis_pcm(
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	476 xs_plugin_ip.output->written_time(),
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	477 myStatus.audioFormat, myStatus.audioChannels,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	478 audioGot, audioBuffer);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	479
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	480 /* Wait a little */
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	481 while (xs_status.playing &&
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	482 (xs_status.currSong == myStatus.currSong) &&
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	483 (xs_plugin_ip.output->buffer_free() < audioGot))
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	484 xmms_usleep(500);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	485
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	486 /* Output audio */
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	487 if (xs_status.playing && xs_status.currSong == myStatus.currSong)
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	488 xs_plugin_ip.output->write_audio(audioBuffer, audioGot);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	489
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	490 /* Check if we have played enough */
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	491 if (xs_cfg.playMaxTimeEnable)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	492 {
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	493 if (xs_cfg.playMaxTimeUnknown)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	494 {
767 cf644ac89b54 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 763 diff changeset	495 if (songLength < 0 &&
cf644ac89b54 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 763 diff changeset	496 xs_plugin_ip.output->output_time() >= xs_cfg.playMaxTime * 1000)
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	497 myStatus.playing = FALSE;
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	498 }
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	499 else
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	500 {
767 cf644ac89b54 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 763 diff changeset	501 if (xs_plugin_ip.output->output_time() >= xs_cfg.playMaxTime * 1000)
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	502 myStatus.playing = FALSE;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	503 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	504 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	505
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	506 if (songLength >= 0)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	507 {
767 cf644ac89b54 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 763 diff changeset	508 if (xs_plugin_ip.output->output_time() >= songLength * 1000)
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	509 myStatus.playing = FALSE;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	510 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	511 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	512
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	513 XSDEBUG("subtune ended/stopped\n");
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	514
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	515 /* Close audio output plugin */
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	516 if (audioOpen)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	517 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	518 XSDEBUG("close audio #1\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	519 xs_plugin_ip.output->close_audio();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	520 audioOpen = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	521 XSDEBUG("closed\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	522 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	523
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	524 /* Now determine if we continue by selecting other subtune or something */
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	525 if (!myStatus.playing && !xs_cfg.subAutoEnable)
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	526 doPlay = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	527 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	528
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	529 xs_err_exit:
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	530 XSDEBUG("out of playing loop\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	531
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	532 /* Close audio output plugin */
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	533 if (audioOpen)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	534 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	535 XSDEBUG("close audio #2\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	536 xs_plugin_ip.output->close_audio();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	537 XSDEBUG("closed\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	538 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	539
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	540 g_free(audioBuffer);
241 291715a519e2 Compile-time setting to enable/disable use of dynamically allocated buffers. Matti Hamalainen <ccr@tnsp.org> parents: 235 diff changeset	541
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	542 /* Set playing status to false (stopped), thus when
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	543 * XMMS next calls xs_get_time(), it can return appropriate
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	544 * value "not playing" status and XMMS knows to move to
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	545 * next entry in the playlist .. or whatever it wishes.
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	546 */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	547 XS_MUTEX_LOCK(xs_status);
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	548 xs_status.playing = FALSE;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	549 XS_MUTEX_UNLOCK(xs_status);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	550
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	551 /* Exit the playing thread */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	552 XSDEBUG("exiting thread, bye.\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	553 XS_THREAD_EXIT(NULL);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	554 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	555
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	556
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 * Start playing the given file
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	559 * Here we load the tune and initialize the playing thread.
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	560 * Usually you would also initialize the output-plugin, but
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	561 * 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	562 */
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	563 void xs_play_file(gchar *filename)
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	564 {
760 f6a57c0656fa Handle engine initialization failures a bit more .. "gracefully". Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	565 if (xs_status.engine == NULL)
f6a57c0656fa Handle engine initialization failures a bit more .. "gracefully". Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	566 return;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	567
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	568 XSDEBUG("play '%s'\n", filename);
72 e3b205a6bc7e Lots re-arranging and new code for upcoming modularization. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	569
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	570 /* Get tune information */
753 36c6a6e629bb Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 751 diff changeset	571 if ((xs_status.tuneInfo = xs_status.engine->plrGetSIDInfo(filename)) == NULL)
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	572 return;
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	573
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	574 /* Initialize the tune */
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	575 if (!xs_status.engine->plrLoadSID(&xs_status, filename))
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	576 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	577 xs_tuneinfo_free(xs_status.tuneInfo);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	578 xs_status.tuneInfo = NULL;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	579 return;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	580 }
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	581
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	582 XSDEBUG("load ok\n");
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	583
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	584 /* Set general status information */
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	585 xs_status.playing = TRUE;
4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	586 xs_status.error = FALSE;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	587 xs_status.currSong = xs_status.tuneInfo->startTune;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	588
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	589 /* Start the playing thread! */
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	590 if (pthread_create(&xs_decode_thread, NULL, xs_playthread, NULL) < 0)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	591 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	592 xs_error("Couldn't create playing thread!\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	593 xs_tuneinfo_free(xs_status.tuneInfo);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	594 xs_status.tuneInfo = NULL;
753 36c6a6e629bb Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 751 diff changeset	595 xs_status.engine->plrDeleteSID(&xs_status);
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	596 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	597
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	598 /* Okay, here the playing thread has started up and we
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	599 * return from here to XMMS. Rest is up to XMMS's GUI
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	600 * and playing thread.
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	601 */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 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 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 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
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	620 /* Close the sub-tune control window, if any */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	621 xs_subctrl_close();
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	622
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	623 /* Lock xs_status and stop playing thread */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	624 XS_MUTEX_LOCK(xs_status);
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	625 if (xs_status.playing)
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	626 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	627 XSDEBUG("stopping...\n");
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	628 xs_status.playing = FALSE;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	629 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	630 XS_THREAD_JOIN(xs_decode_thread);
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	631 }
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	632 else
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	633 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	634 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	635 }
75 653c9b0d1320 SIDPlay2 support "works" now. Borked problems with threads. Matti Hamalainen <ccr@tnsp.org> parents: 74 diff changeset	636
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	637 XSDEBUG("done, updating status\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	638
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	639 /* Status is now stopped, update the sub-tune
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	640 * controller in fileinfo window (if open)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	641 */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	642 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	643
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	644 /* Free tune information */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	645 XS_MUTEX_LOCK(xs_status);
794 3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't Matti Hamalainen <ccr@tnsp.org> parents: 787 diff changeset	646 if (xs_status.engine != NULL)
3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't Matti Hamalainen <ccr@tnsp.org> parents: 787 diff changeset	647 xs_status.engine->plrDeleteSID(&xs_status);
3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't Matti Hamalainen <ccr@tnsp.org> parents: 787 diff changeset	648
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	649 xs_tuneinfo_free(xs_status.tuneInfo);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	650 xs_status.tuneInfo = NULL;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	651 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	652 XSDEBUG("ok\n");
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
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	655
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	656 /*
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	657 * Pause/unpause the playing
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	658 */
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	659 void xs_pause(short pause)
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	660 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	661 XS_MUTEX_LOCK(xs_status);
799 13483b855058 Fix subsong control window problems during pause state. Matti Hamalainen <ccr@tnsp.org> parents: 798 diff changeset	662 xs_status.paused = pause;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	663 XS_MUTEX_UNLOCK(xs_status);
264 2316e524d67b Improved comments. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	664
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	665 xs_subctrl_close();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	666 xs_fileinfo_update();
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	667 xs_plugin_ip.output->pause(pause);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	668 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	669
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	670
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	671 /*
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	672 * Pop-up subtune selector
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	673 */
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	674 void xs_subctrl_setsong(void)
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	675 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	676 gint n;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	677
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	678 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	679 XS_MUTEX_LOCK(xs_subctrl);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	680
799 13483b855058 Fix subsong control window problems during pause state. Matti Hamalainen <ccr@tnsp.org> parents: 798 diff changeset	681 if (!xs_status.paused && xs_status.tuneInfo && xs_status.playing)
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	682 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	683 n = (gint) GTK_ADJUSTMENT(xs_subctrl_adj)->value;
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	684 if (n >= 1 && n <= xs_status.tuneInfo->nsubTunes)
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	685 xs_status.currSong = n;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	686 }
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	687
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	688 XS_MUTEX_UNLOCK(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	689 XS_MUTEX_UNLOCK(xs_status);
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	690 }
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	691
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	692
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	693 void xs_subctrl_prevsong(void)
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	694 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	695 XS_MUTEX_LOCK(xs_status);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	696
799 13483b855058 Fix subsong control window problems during pause state. Matti Hamalainen <ccr@tnsp.org> parents: 798 diff changeset	697 if (!xs_status.paused && xs_status.tuneInfo && xs_status.playing)
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	698 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	699 if (xs_status.currSong > 1)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	700 xs_status.currSong--;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	701 }
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	702
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	703 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	704
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	705 xs_subctrl_update();
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	706 }
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	707
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	708
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	709 void xs_subctrl_nextsong(void)
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	710 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	711 XS_MUTEX_LOCK(xs_status);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	712
799 13483b855058 Fix subsong control window problems during pause state. Matti Hamalainen <ccr@tnsp.org> parents: 798 diff changeset	713 if (!xs_status.paused && xs_status.tuneInfo && xs_status.playing)
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	714 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	715 if (xs_status.currSong < xs_status.tuneInfo->nsubTunes)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	716 xs_status.currSong++;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	717 }
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	718
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	719 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	720
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	721 xs_subctrl_update();
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	722 }
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	723
177 6e350784aa57 Various cleanups. Min-playtime option now works. Configuration has more Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	724
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	725 void xs_subctrl_update(void)
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	726 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	727 GtkAdjustment *tmpAdj;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	728
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	729 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	730 XS_MUTEX_LOCK(xs_subctrl);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	731
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	732 /* Check if control window exists, we are currently playing and have a tune */
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	733 if (xs_subctrl)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	734 {
799 13483b855058 Fix subsong control window problems during pause state. Matti Hamalainen <ccr@tnsp.org> parents: 798 diff changeset	735 if (!xs_status.paused && xs_status.tuneInfo && xs_status.playing)
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	736 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	737 tmpAdj = GTK_ADJUSTMENT(xs_subctrl_adj);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	738
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	739 tmpAdj->value = xs_status.currSong;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	740 tmpAdj->lower = 1;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	741 tmpAdj->upper = xs_status.tuneInfo->nsubTunes;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	742 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	743 XS_MUTEX_UNLOCK(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	744 gtk_adjustment_value_changed(tmpAdj);
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	745 }
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	746 else
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	747 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	748 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	749 XS_MUTEX_UNLOCK(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	750 xs_subctrl_close();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	751 }
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	752 }
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	753 else
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	754 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	755 XS_MUTEX_UNLOCK(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	756 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	757 }
177 6e350784aa57 Various cleanups. Min-playtime option now works. Configuration has more Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	758
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	759 xs_fileinfo_update();
140 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
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	762
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	763 void xs_subctrl_close(void)
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	764 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	765 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	766
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	767 if (xs_subctrl)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	768 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	769 gtk_widget_destroy(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	770 xs_subctrl = NULL;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	771 }
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	772
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	773 XS_MUTEX_UNLOCK(xs_subctrl);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	774 }
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	775
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 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	778 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	779 (void) win;
184 4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes. Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	780
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	781 if (ev->keyval == GDK_Escape)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	782 xs_subctrl_close();
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	783
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	784 return FALSE;
184 4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes. Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	785 }
4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes. Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	786
4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes. Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	787
294 f0ece2d20094 Do correct typecasts and declare xs_subctrl_open arguments as void. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	788 void xs_subctrl_open(void)
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	789 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	790 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	791
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	792 XS_MUTEX_LOCK(xs_subctrl);
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	793
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	794 if (!xs_status.tuneInfo \|\| !xs_status.playing \|\|
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	795 xs_subctrl \|\| xs_status.tuneInfo->nsubTunes <= 1)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	796 goto out;
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	797
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	798 /* Create the pop-up window */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	799 xs_subctrl = gtk_window_new(GTK_WINDOW_DIALOG);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	800 gtk_widget_set_name(xs_subctrl, "xs_subctrl");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	801 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	802
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	803 gtk_window_set_title(GTK_WINDOW(xs_subctrl), _("Subtune Control"));
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	804 gtk_window_set_position(GTK_WINDOW(xs_subctrl), GTK_WIN_POS_MOUSE);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	805 gtk_container_set_border_width(GTK_CONTAINER(xs_subctrl), 0);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	806 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	807
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	808 XS_SIGNAL_CONNECT(xs_subctrl, "destroy", gtk_widget_destroyed, &xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	809 XS_SIGNAL_CONNECT(xs_subctrl, "focus_out_event", xs_subctrl_close, NULL);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	810
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	811 gtk_widget_realize(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	812 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	813
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	814
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	815 /* Create the control widgets */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	816 frame25 = gtk_frame_new(NULL);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	817 gtk_container_add(GTK_CONTAINER(xs_subctrl), frame25);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	818 gtk_container_set_border_width(GTK_CONTAINER(frame25), 2);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	819 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	820
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	821 hbox15 = gtk_hbox_new(FALSE, 4);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	822 gtk_container_add(GTK_CONTAINER(frame25), hbox15);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	823
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	824 subctrl_prev = gtk_button_new_with_label(" < ");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	825 gtk_widget_set_name(subctrl_prev, "subctrl_prev");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	826 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	827
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	828 xs_subctrl_adj = gtk_adjustment_new(xs_status.currSong, 1, xs_status.tuneInfo->nsubTunes, 1, 1, 0);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	829 XS_SIGNAL_CONNECT(xs_subctrl_adj, "value_changed", xs_subctrl_setsong, NULL);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	830
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	831 subctrl_current = gtk_hscale_new(GTK_ADJUSTMENT(xs_subctrl_adj));
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	832 gtk_widget_set_name(subctrl_current, "subctrl_current");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	833 gtk_box_pack_start(GTK_BOX(hbox15), subctrl_current, FALSE, TRUE, 0);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	834 gtk_scale_set_digits(GTK_SCALE(subctrl_current), 0);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	835 gtk_range_set_update_policy(GTK_RANGE(subctrl_current), GTK_UPDATE_DELAYED);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	836 gtk_widget_grab_focus(subctrl_current);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	837
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	838 subctrl_next = gtk_button_new_with_label(" > ");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	839 gtk_widget_set_name(subctrl_next, "subctrl_next");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	840 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	841
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	842 XS_SIGNAL_CONNECT(subctrl_prev, "clicked", xs_subctrl_prevsong, NULL);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	843 XS_SIGNAL_CONNECT(subctrl_next, "clicked", xs_subctrl_nextsong, NULL);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	844 XS_SIGNAL_CONNECT(xs_subctrl, "key_press_event", xs_subctrl_keypress, NULL);
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	845
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	846 gtk_widget_show_all(xs_subctrl);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	847
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	848 out:
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	849 XS_MUTEX_UNLOCK(xs_subctrl);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	850 }
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	851
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	852
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	853 /*
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	854 * Set the time-seek position
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	855 * The playing thread will do the "seeking", which means sub-tune
672 f22a708d29fd Remove some camelcasing / hungarian notation. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	856 * changing in XMMS-SID's case. time argument is time in seconds,
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	857 * in contrast to milliseconds used in other occasions.
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	858 *
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	859 * This function is called whenever position slider is clicked or
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	860 * 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	861 */
672 f22a708d29fd Remove some camelcasing / hungarian notation. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	862 void xs_seek(gint time)
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	863 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	864 XS_MUTEX_LOCK(xs_status);
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	865 if (!xs_status.tuneInfo \|\| !xs_status.playing)
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	866 goto out;
132 4162a5370b9e Added "seek"-subsong control option, in style of xmms-sidplay. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	867
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	868 switch (xs_cfg.subsongControl)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	869 {
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	870 case XS_SSC_SEEK:
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	871 if (time < xs_status.lastTime)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	872 {
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	873 if (xs_status.currSong > 1)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	874 xs_status.currSong--;
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	875 }
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	876 else
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	877 if (time > xs_status.lastTime)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	878 {
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	879 if (xs_status.currSong < xs_status.tuneInfo->nsubTunes)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	880 xs_status.currSong++;
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	881 }
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	882 break;
78 ab522ab65c85 Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	883
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	884 case XS_SSC_POPUP:
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	885 xs_subctrl_open();
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	886 break;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	887
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	888 /* 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	889 #ifdef HAVE_SONG_POSITION
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	890 case XS_SSC_PATCH:
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	891 if (time > 0 && time <= xs_status.tuneInfo->nsubTunes)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	892 xs_status.currSong = time;
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	893 break;
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	894 #endif
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	895 }
103 fe83646e6baa Changed plrFillBuffer()-functions to return actual number of samples computed. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	896
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	897 out:
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	898 XS_MUTEX_UNLOCK(xs_status);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	899 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	900
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	901
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	902 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	903 * Return the playing "position/time"
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	904 * Determine current position/time in song. Used by XMMS to update
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	905 * the song clock and position slider and MOST importantly to determine
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	906 * 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	907 * 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	908 */
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	909 gint xs_get_time(void)
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	910 {
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	911 int err;
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	912
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	913 /* If errorflag is set, return -2 to signal it to XMMS's idle callback */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	914 XS_MUTEX_LOCK(xs_status);
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	915 if (xs_status.error)
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	916 {
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	917 err = -2;
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	918 goto error;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	919 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	920
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	921 /* If there is no tune or tune has ended, return -1 */
798 4c5b695fd85e Rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	922 if (!xs_status.tuneInfo \|\| !xs_status.playing)
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	923 {
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	924 err = -1;
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	925 goto error;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	926 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	927
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	928 /* Let's see what we do */
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	929 switch (xs_cfg.subsongControl)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	930 {
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	931 case XS_SSC_SEEK:
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	932 xs_status.lastTime = (xs_plugin_ip.output->output_time() / 1000);
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	933 break;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	934
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	935 #ifdef HAVE_SONG_POSITION
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	936 case XS_SSC_PATCH:
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	937 set_song_position(xs_status.currSong, 1, xs_status.tuneInfo->nsubTunes);
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	938 break;
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	939 #endif
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	940 }
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	941
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	942 XS_MUTEX_UNLOCK(xs_status);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	943
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	944 /* Return output time reported by audio output plugin */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	945 return xs_plugin_ip.output->output_time();
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	946
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	947 error:
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	948 XS_MUTEX_UNLOCK(xs_status);
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	949 return err;
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	950 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	951
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	952
477 53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	953 /* Return song information: called by XMMS when initially loading the playlist.
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	954 * Subsequent changes to information are made by the player thread,
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	955 * 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	956 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	957 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	958 {
751 55eea3fa8868 Rename some structures. Matti Hamalainen <ccr@tnsp.org> parents: 748 diff changeset	959 XSTuneInfo *info;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	960
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	961 XS_MUTEX_LOCK(xs_status);
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	962
794 3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't Matti Hamalainen <ccr@tnsp.org> parents: 787 diff changeset	963 if (xs_status.engine == NULL)
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	964 goto out;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	965
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	966 /* Get tune information from emulation engine */
753 36c6a6e629bb Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 751 diff changeset	967 info = xs_status.engine->plrGetSIDInfo(songFilename);
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	968 if (!info)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	969 goto out;
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	970
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	971 /* Get sub-tune information, if available */
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	972 if (info->startTune > 0 && info->startTune <= info->nsubTunes)
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	973 {
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	974 gint length;
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	975
672 f22a708d29fd Remove some camelcasing / hungarian notation. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	976 (*songTitle) = xs_make_titlestring(info, info->startTune);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	977
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	978 length = info->subTunes[info->startTune-1].tuneLength;
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	979 (songLength) = length < 0 ? -1 : length 1000;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	980 }
177 6e350784aa57 Various cleanups. Min-playtime option now works. Configuration has more Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	981
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	982 /* Free tune information */
672 f22a708d29fd Remove some camelcasing / hungarian notation. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	983 xs_tuneinfo_free(info);
797 02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	984
02512cbc6d9f Cleanup, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 794 diff changeset	985 out:
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	986 XS_MUTEX_UNLOCK(xs_status);
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	987 }

Mercurial > hg > xmms-sid

annotate src/xmms-sid.c @ 835:d508c7c4bc69