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

annotate src/xmms-sid.c @ 735:fb218dbc90cd

Remove unused variables.

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 05 Nov 2012 12:06:42 +0200
parents	53a4210889e2
children	d9d769b5dbe2

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
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45 * Global variables
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	46 */
657 acaba070cf49 Lots of cosmetic code cleanups; synced the de-gettextification from Audacious-SID, I suppose it makes some sense ... Matti Hamalainen <ccr@tnsp.org> parents: 644 diff changeset	47 xs_status_t xs_status;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	48 XS_MUTEX(xs_status);
532 bc548249464a Audacious glue. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	49 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	50
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	51 static GtkWidget *xs_subctrl = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	52 static GtkObject *xs_subctrl_adj = NULL;
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	53 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	54
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	55 void xs_subctrl_close(void);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	56 void xs_subctrl_update(void);
477 53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	57
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	58
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	59 /*
297 ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	60 * Error messages
ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	61 */
392 b09d74eb71e6 Working on getting STIL and SLDB using completely dynamically allocated Matti Hamalainen <ccr@tnsp.org> parents: 383 diff changeset	62 void xs_error(const char *fmt, ...)
297 ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	63 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	64 va_list ap;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	65 fprintf(stderr, "XMMS-SID: ");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	66 va_start(ap, fmt);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	67 vfprintf(stderr, fmt, ap);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	68 va_end(ap);
297 ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	69 }
ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	70
299 9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	71 #ifndef DEBUG_NP
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	72 void XSDEBUG(const char *fmt, ...)
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	73 {
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	74 #ifdef DEBUG
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	75 va_list ap;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	76 fprintf(stderr, "XSDEBUG: ");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	77 va_start(ap, fmt);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	78 vfprintf(stderr, fmt, ap);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	79 va_end(ap);
299 9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	80 #endif
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	81 }
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	82 #endif
9ddce00a8653 Fixes. Matti Hamalainen <ccr@tnsp.org> parents: 298 diff changeset	83
461 a1224c1f8670 STILdb handling glue moved to xmms-sid.c Matti Hamalainen <ccr@tnsp.org> parents: 455 diff changeset	84
297 ac9a484e3430 Make XSERR into function. Matti Hamalainen <ccr@tnsp.org> parents: 294 diff changeset	85 /*
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	86 * Initialization functions
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87 */
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	88 void xs_reinit(void)
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	90 /* Stop playing, if we are */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	91 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	92 if (xs_status.isPlaying) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	93 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	94 xs_stop();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	95 } else {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	96 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	97 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	98
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	99 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	100 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	101
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	102 /* Initialize status and sanitize configuration */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	103 memset(&xs_status, 0, sizeof(xs_status));
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	104
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	105 if (xs_cfg.audioFrequency < 8000)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	106 xs_cfg.audioFrequency = 8000;
273 f6daddca03c7 Merging in oversampling support, audio settings sanitation. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	107
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	108 if (xs_cfg.oversampleFactor < XS_MIN_OVERSAMPLE)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	109 xs_cfg.oversampleFactor = XS_MIN_OVERSAMPLE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	110 else if (xs_cfg.oversampleFactor > XS_MAX_OVERSAMPLE)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	111 xs_cfg.oversampleFactor = XS_MAX_OVERSAMPLE;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	112
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	113 if (xs_cfg.audioChannels != XS_CHN_MONO)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	114 xs_cfg.oversampleEnable = FALSE;
273 f6daddca03c7 Merging in oversampling support, audio settings sanitation. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	115
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	116 xs_status.audioFrequency = xs_cfg.audioFrequency;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	117 xs_status.audioBitsPerSample = xs_cfg.audioBitsPerSample;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	118 xs_status.audioChannels = xs_cfg.audioChannels;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	119 xs_status.audioFormat = -1;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	120 xs_status.oversampleEnable = xs_cfg.oversampleEnable;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	121 xs_status.oversampleFactor = xs_cfg.oversampleFactor;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	122
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	123 /* Try to initialize emulator engine */
726 53a4210889e2 Move engine choosing / initialization code to xs_player.c Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	124 xs_init_emu_engine(&xs_cfg.playerEngine, &xs_status);
606 59046d70c0ef Fixed a thread race conds in xs_reinit() and xs_get_song_info() Matti Hamalainen <ccr@tnsp.org> parents: 543 diff changeset	125
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	126 /* 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	127 xs_cfg.audioFrequency = xs_status.audioFrequency;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	128 xs_cfg.audioBitsPerSample = xs_status.audioBitsPerSample;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	129 xs_cfg.audioChannels = xs_status.audioChannels;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	130 xs_cfg.oversampleEnable = xs_status.oversampleEnable;
273 f6daddca03c7 Merging in oversampling support, audio settings sanitation. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	131
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	132 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	133 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	134
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	135 /* Initialize song-length database */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	136 xs_songlen_close();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	137 if (xs_cfg.songlenDBEnable && (xs_songlen_init() != 0)) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	138 xs_error("Error initializing song-length database!\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	139 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	140
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	141 /* Initialize STIL database */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	142 xs_stil_close();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	143 if (xs_cfg.stilDBEnable && (xs_stil_init() != 0)) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	144 xs_error("Error initializing STIL database!\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	145 }
606 59046d70c0ef Fixed a thread race conds in xs_reinit() and xs_get_song_info() Matti Hamalainen <ccr@tnsp.org> parents: 543 diff changeset	146
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	147 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	148
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	149
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	150 /*
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	151 * Initialize XMMS-SID
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	152 */
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	153 void xs_init(void)
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	154 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	155 XSDEBUG("xs_init()\n");
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	156
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	157 /* Initialize and get configuration */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	158 xs_init_configuration();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	159 xs_read_configuration();
147 a7abcda7a86c SLDB, STIL and emulation engine settings are now updated Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	160
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	161 /* Initialize subsystems */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	162 xs_reinit();
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	163
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	164 XSDEBUG("OK\n");
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	165 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	166
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	167
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	168 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	169 * Shut down XMMS-SID
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	170 */
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171 void xs_close(void)
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	172 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	173 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	174
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	175 /* Stop playing, free structures */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	176 xs_stop();
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	177
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	178 xs_tuneinfo_free(xs_status.tuneInfo);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	179 xs_status.tuneInfo = NULL;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	180 xs_status.sidPlayer->plrDeleteSID(&xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	181 xs_status.sidPlayer->plrClose(&xs_status);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	182
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	183 xs_songlen_close();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	184 xs_stil_close();
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	185
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	186 XSDEBUG("shutdown finished.\n");
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	187 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	188
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	189
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	190 /*
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	191 * 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	192 */
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	193 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	194 {
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	195 gchar *ext;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	196 assert(xs_status.sidPlayer);
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	197
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	198 /* Check the filename */
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	199 if (filename == NULL)
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	200 return FALSE;
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	201
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	202 /* Try to detect via detection routine, if required */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	203 if (xs_cfg.detectMagic) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	204 xs_file_t *f;
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	205 if ((f = xs_fopen(filename, "rb")) != NULL) {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	206 if (xs_status.sidPlayer->plrProbe(f))
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	207 return TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	208 xs_fclose(f);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	209 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	210 }
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	211
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	212 /* Detect just by checking filename extension */
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	213 ext = xs_strrchr(filename, '.');
ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	214 if (ext) {
ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	215 ext++;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	216 switch (xs_cfg.playerEngine) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	217 case XS_ENG_SIDPLAY1:
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	218 case XS_ENG_SIDPLAY2:
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	219 if (!g_strcasecmp(ext, "psid"))
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	220 return TRUE;
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	221 if (!g_strcasecmp(ext, "sid"))
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	222 return TRUE;
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	223 if (!g_strcasecmp(ext, "dat"))
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	224 return TRUE;
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	225 if (!g_strcasecmp(ext, "inf"))
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	226 return TRUE;
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	227 if (!g_strcasecmp(ext, "info"))
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	228 return TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	229 break;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	230 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	231 }
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	232
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	233 return FALSE;
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	234 }
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	235
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	236
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	237 /*
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	238 * Main playing thread loop
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	239 */
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	240 void xs_playthread(void argPointer)
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 xs_status_t myStatus;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	243 xs_tuneinfo_t *myTune;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	244 gboolean audioOpen = FALSE, doPlay = FALSE, isFound = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	245 gint audioGot, songLength, i;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	246 gchar audioBuffer = NULL, oversampleBuffer = NULL, *tmpTitle;
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	247
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	248 (void) argPointer;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	249
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	250 /* Initialize */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	251 XSDEBUG("entering player thread\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	252 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	253 memcpy(&myStatus, &xs_status, sizeof(xs_status_t));
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	254 myTune = xs_status.tuneInfo;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	255 for (i = 0; i <= myTune->nsubTunes; i++)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	256 myTune->subTunes[i].tunePlayed = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	257 XS_MUTEX_UNLOCK(xs_status);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	258
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	259 /* Allocate audio buffer */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	260 audioBuffer = (gchar *) g_malloc(XS_AUDIOBUF_SIZE);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	261 if (audioBuffer == NULL) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	262 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	263 goto xs_err_exit;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	264 }
273 f6daddca03c7 Merging in oversampling support, audio settings sanitation. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	265
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	266 if (myStatus.oversampleEnable) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	267 oversampleBuffer = (gchar ) g_malloc(XS_AUDIOBUF_SIZE myStatus.oversampleFactor);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	268 if (oversampleBuffer == NULL) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	269 xs_error("Couldn't allocate memory for audio oversampling buffer!\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	270 goto xs_err_exit;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	271 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	272 }
241 291715a519e2 Compile-time setting to enable/disable use of dynamically allocated buffers. Matti Hamalainen <ccr@tnsp.org> parents: 235 diff changeset	273
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	274 /*
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	275 * 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	276 */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	277 audioOpen = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	278 doPlay = TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	279 while (xs_status.isPlaying && doPlay) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	280 /* Automatic sub-tune change logic */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	281 XS_MUTEX_LOCK(xs_cfg);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	282 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	283 myStatus.isPlaying = TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	284
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	285 if (xs_status.currSong < 1 \|\| myStatus.currSong < 1) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	286 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	287 XS_MUTEX_UNLOCK(xs_cfg);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	288 goto xs_err_exit;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	289 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	290
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	291 if (xs_cfg.subAutoEnable && (myStatus.currSong == xs_status.currSong)) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	292 /* Check if currently selected sub-tune has been played already */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	293 if (myTune->subTunes[myStatus.currSong-1].tunePlayed) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	294 /* Find a tune that has not been played */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	295 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	296 isFound = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	297 i = 0;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	298 while (!isFound && (++i <= myTune->nsubTunes)) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	299 if (xs_cfg.subAutoMinOnly) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	300 /* A tune with minimum length must be found */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	301 if (!myTune->subTunes[i-1].tunePlayed &&
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	302 myTune->subTunes[i-1].tuneLength >= xs_cfg.subAutoMinTime)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	303 isFound = TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	304 } else {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	305 /* Any unplayed tune is okay */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	306 if (!myTune->subTunes[i-1].tunePlayed)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	307 isFound = TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	308 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	309 }
281 d913f0f69487 Automatic sub-tune changing. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	310
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	311 if (isFound) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	312 /* Set the new sub-tune */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	313 XSDEBUG("found #%i\n", i);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	314 xs_status.currSong = i;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	315 } else
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	316 /* This is the end */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	317 doPlay = FALSE;
281 d913f0f69487 Automatic sub-tune changing. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	318
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	319 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	320 XS_MUTEX_UNLOCK(xs_cfg);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	321 continue; /* This is ugly, but ... */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	322 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	323 }
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 /* 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	326 myStatus.currSong = xs_status.currSong;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	327 myTune->subTunes[myStatus.currSong-1].tunePlayed = TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	328 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	329 XS_MUTEX_UNLOCK(xs_cfg);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	330
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	331 XSDEBUG("subtune #%i selected, initializing...\n", myStatus.currSong);
281 d913f0f69487 Automatic sub-tune changing. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	332
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	333 GDK_THREADS_ENTER();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	334 xs_subctrl_update();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	335 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	336
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	337 /* Check minimum playtime */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	338 songLength = myTune->subTunes[myStatus.currSong-1].tuneLength;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	339 if (xs_cfg.playMinTimeEnable && (songLength >= 0)) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	340 if (songLength < xs_cfg.playMinTime)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	341 songLength = xs_cfg.playMinTime;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	342 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	343
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	344 /* Initialize song */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	345 if (!myStatus.sidPlayer->plrInitSong(&myStatus)) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	346 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	347 myTune->sidFilename, myStatus.currSong);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	348 goto xs_err_exit;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	349 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	350
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	351 /* Open the audio output */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	352 XSDEBUG("open audio output (%d, %d, %d)\n",
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	353 myStatus.audioFormat, myStatus.audioFrequency, myStatus.audioChannels);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	354
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	355 if (!xs_plugin_ip.output->
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	356 open_audio(myStatus.audioFormat, myStatus.audioFrequency, myStatus.audioChannels)) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	357 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	358 myStatus.audioFormat,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	359 myStatus.audioFrequency,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	360 myStatus.audioChannels);
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	361
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	362 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	363 xs_status.isError = TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	364 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	365 goto xs_err_exit;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	366 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	367
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	368 audioOpen = TRUE;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	369
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	370 /* Set song information for current subtune */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	371 XSDEBUG("set tune info\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	372 myStatus.sidPlayer->plrUpdateSIDInfo(&myStatus);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	373 tmpTitle = xs_make_titlestring(myTune, myStatus.currSong);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	374
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	375 xs_plugin_ip.set_info(
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	376 tmpTitle,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	377 (songLength > 0) ? (songLength * 1000) : 0,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	378 -1,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	379 myStatus.audioFrequency,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	380 myStatus.audioChannels);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	381
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	382 g_free(tmpTitle);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	383
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	384 XSDEBUG("playing\n");
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	385
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	386 /*
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	387 * Play the subtune
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	388 */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	389 while (xs_status.isPlaying && myStatus.isPlaying && (xs_status.currSong == myStatus.currSong)) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	390 /* Render audio data */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	391 if (myStatus.oversampleEnable) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	392 /* Perform oversampled rendering */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	393 audioGot = myStatus.sidPlayer->plrFillBuffer(
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	394 &myStatus,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	395 oversampleBuffer,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	396 (XS_AUDIOBUF_SIZE * myStatus.oversampleFactor));
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	397
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	398 audioGot /= myStatus.oversampleFactor;
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	399
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	400 /* Execute rate-conversion with filtering */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	401 if (xs_filter_rateconv(audioBuffer, oversampleBuffer,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	402 myStatus.audioFormat, myStatus.oversampleFactor, audioGot) < 0) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	403 xs_error("Oversampling rate-conversion pass failed.\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	404 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	405 xs_status.isError = TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	406 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	407 goto xs_err_exit;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	408 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	409 } else {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	410 audioGot = myStatus.sidPlayer->plrFillBuffer(
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	411 &myStatus, audioBuffer, XS_AUDIOBUF_SIZE);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	412 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	413
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	414 /* I <3 visualice/haujobb */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	415 xs_plugin_ip.add_vis_pcm(
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	416 xs_plugin_ip.output->written_time(),
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	417 myStatus.audioFormat, myStatus.audioChannels,
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	418 audioGot, audioBuffer);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	419
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	420 /* Wait a little */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	421 while (xs_status.isPlaying &&
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	422 (xs_status.currSong == myStatus.currSong) &&
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	423 (xs_plugin_ip.output->buffer_free() < audioGot))
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	424 xmms_usleep(500);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	425
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	426 /* Output audio */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	427 if (xs_status.isPlaying && (xs_status.currSong == myStatus.currSong))
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	428 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	429
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	430 /* Check if we have played enough */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	431 if (xs_cfg.playMaxTimeEnable) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	432 if (xs_cfg.playMaxTimeUnknown) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	433 if ((songLength < 0) &&
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	434 (xs_plugin_ip.output->output_time() >= (xs_cfg.playMaxTime * 1000)))
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	435 myStatus.isPlaying = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	436 } else {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	437 if (xs_plugin_ip.output->output_time() >= (xs_cfg.playMaxTime * 1000))
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	438 myStatus.isPlaying = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	439 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	440 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	441
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	442 if (songLength >= 0) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	443 if (xs_plugin_ip.output->output_time() >= (songLength * 1000))
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	444 myStatus.isPlaying = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	445 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	446 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	447
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	448 XSDEBUG("subtune ended/stopped\n");
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	449
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	450 /* Close audio output plugin */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	451 if (audioOpen) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	452 XSDEBUG("close audio #1\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	453 xs_plugin_ip.output->close_audio();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	454 audioOpen = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	455 XSDEBUG("closed\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	456 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	457
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	458 /* Now determine if we continue by selecting other subtune or something */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	459 if (!myStatus.isPlaying && !xs_cfg.subAutoEnable)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	460 doPlay = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	461 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	462
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 392 diff changeset	463 xs_err_exit:
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	464 XSDEBUG("out of playing loop\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	465
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	466 /* Close audio output plugin */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	467 if (audioOpen) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	468 XSDEBUG("close audio #2\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	469 xs_plugin_ip.output->close_audio();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	470 XSDEBUG("closed\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	471 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	472
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	473 g_free(audioBuffer);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	474 g_free(oversampleBuffer);
241 291715a519e2 Compile-time setting to enable/disable use of dynamically allocated buffers. Matti Hamalainen <ccr@tnsp.org> parents: 235 diff changeset	475
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	476 /* Set playing status to false (stopped), thus when
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	477 * 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	478 * 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	479 * 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	480 */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	481 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	482 xs_status.isPlaying = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	483 XS_MUTEX_UNLOCK(xs_status);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	484
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	485 /* Exit the playing thread */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	486 XSDEBUG("exiting thread, bye.\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	487 XS_THREAD_EXIT(NULL);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	488 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	489
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	490
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	491 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	492 * Start playing the given file
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	493 * Here we load the tune and initialize the playing thread.
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	494 * Usually you would also initialize the output-plugin, but
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	495 * 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	496 */
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	497 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	498 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	499 assert(xs_status.sidPlayer);
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	500
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	501 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	502
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	503 /* Get tune information */
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	504 if ((xs_status.tuneInfo = xs_status.sidPlayer->plrGetSIDInfo(filename)) == NULL)
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	505 return;
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	506
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	507 /* Initialize the tune */
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	508 if (!xs_status.sidPlayer->plrLoadSID(&xs_status, filename)) {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	509 xs_tuneinfo_free(xs_status.tuneInfo);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	510 xs_status.tuneInfo = NULL;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	511 return;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	512 }
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	513
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	514 XSDEBUG("load ok\n");
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	515
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	516 /* Set general status information */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	517 xs_status.isPlaying = TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	518 xs_status.isError = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	519 xs_status.currSong = xs_status.tuneInfo->startTune;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	520
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	521 /* Start the playing thread! */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	522 if (pthread_create(&xs_decode_thread, NULL, xs_playthread, NULL) < 0) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	523 xs_error("Couldn't create playing thread!\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	524 xs_tuneinfo_free(xs_status.tuneInfo);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	525 xs_status.tuneInfo = NULL;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	526 xs_status.sidPlayer->plrDeleteSID(&xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	527 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	528
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	529 /* 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	530 * 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	531 * and playing thread.
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	532 */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	533 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	534 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	535
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	536
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	537 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	538 * Stop playing
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	539 * Here we set the playing status to stop and wait for playing
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	540 * thread to shut down. In any "correctly" done plugin, this is
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	541 * also the function where you close the output-plugin, but since
264 2316e524d67b Improved comments. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	542 * XMMS-SID has special behaviour (audio opened/closed in the
2316e524d67b Improved comments. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	543 * playing thread), we don't do that here.
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	544 *
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	545 * 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	546 */
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	547 void xs_stop(void)
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	548 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	549 XSDEBUG("stop requested\n");
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	550
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	551 /* Close the sub-tune control window, if any */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	552 xs_subctrl_close();
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	553
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	554 /* Lock xs_status and stop playing thread */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	555 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	556 if (xs_status.isPlaying) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	557 XSDEBUG("stopping...\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	558 xs_status.isPlaying = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	559 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	560 XS_THREAD_JOIN(xs_decode_thread);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	561 } else {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	562 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	563 }
75 653c9b0d1320 SIDPlay2 support "works" now. Borked problems with threads. Matti Hamalainen <ccr@tnsp.org> parents: 74 diff changeset	564
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	565 XSDEBUG("done, updating status\n");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	566
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	567 /* Status is now stopped, update the sub-tune
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	568 * controller in fileinfo window (if open)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	569 */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	570 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	571
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	572 /* Free tune information */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	573 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	574 xs_status.sidPlayer->plrDeleteSID(&xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	575 xs_tuneinfo_free(xs_status.tuneInfo);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	576 xs_status.tuneInfo = NULL;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	577 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	578 XSDEBUG("ok\n");
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	580
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	581
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	582 /*
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	583 * Pause/unpause the playing
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	584 */
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	585 void xs_pause(short pause)
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	586 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	587 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	588 /* FIXME FIX ME todo: pause should disable sub-tune controls */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	589 XS_MUTEX_UNLOCK(xs_status);
264 2316e524d67b Improved comments. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	590
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	591 xs_subctrl_close();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	592 xs_fileinfo_update();
688 ba851baac5a0 Etc. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	593 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	594 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	595
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	596
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	597 /*
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	598 * Pop-up subtune selector
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	599 */
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	600 void xs_subctrl_setsong(void)
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	601 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	602 gint n;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	603
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	604 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	605 XS_MUTEX_LOCK(xs_subctrl);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	606
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	607 if (xs_status.tuneInfo && xs_status.isPlaying) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	608 n = (gint) GTK_ADJUSTMENT(xs_subctrl_adj)->value;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	609 if ((n >= 1) && (n <= xs_status.tuneInfo->nsubTunes))
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	610 xs_status.currSong = n;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	611 }
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	612
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	613 XS_MUTEX_UNLOCK(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	614 XS_MUTEX_UNLOCK(xs_status);
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	615 }
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	616
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	617
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	618 void xs_subctrl_prevsong(void)
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	619 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	620 XS_MUTEX_LOCK(xs_status);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	621
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	622 if (xs_status.tuneInfo && xs_status.isPlaying) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	623 if (xs_status.currSong > 1)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	624 xs_status.currSong--;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	625 }
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	626
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	627 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	628
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	629 xs_subctrl_update();
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	630 }
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	631
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	632
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	633 void xs_subctrl_nextsong(void)
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	634 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	635 XS_MUTEX_LOCK(xs_status);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	636
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	637 if (xs_status.tuneInfo && xs_status.isPlaying) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	638 if (xs_status.currSong < xs_status.tuneInfo->nsubTunes)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	639 xs_status.currSong++;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	640 }
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	641
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	642 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	643
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	644 xs_subctrl_update();
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	645 }
608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	646
177 6e350784aa57 Various cleanups. Min-playtime option now works. Configuration has more Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	647
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	648 void xs_subctrl_update(void)
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	649 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	650 GtkAdjustment *tmpAdj;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	651
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	652 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	653 XS_MUTEX_LOCK(xs_subctrl);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	654
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	655 /* Check if control window exists, we are currently playing and have a tune */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	656 if (xs_subctrl) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	657 if (xs_status.tuneInfo && xs_status.isPlaying) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	658 tmpAdj = GTK_ADJUSTMENT(xs_subctrl_adj);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	659
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	660 tmpAdj->value = xs_status.currSong;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	661 tmpAdj->lower = 1;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	662 tmpAdj->upper = xs_status.tuneInfo->nsubTunes;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	663 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	664 XS_MUTEX_UNLOCK(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	665 gtk_adjustment_value_changed(tmpAdj);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	666 } else {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	667 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	668 XS_MUTEX_UNLOCK(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	669 xs_subctrl_close();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	670 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	671 } else {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	672 XS_MUTEX_UNLOCK(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	673 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	674 }
177 6e350784aa57 Various cleanups. Min-playtime option now works. Configuration has more Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	675
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	676 xs_fileinfo_update();
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	677 }
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	678
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	679
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	680 void xs_subctrl_close(void)
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	681 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	682 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	683
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	684 if (xs_subctrl) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	685 gtk_widget_destroy(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	686 xs_subctrl = NULL;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	687 }
232 e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?) Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	688
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	689 XS_MUTEX_UNLOCK(xs_subctrl);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	690 }
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	691
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	692
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	693 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	694 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	695 (void) win;
184 4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes. Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	696
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	697 if (ev->keyval == GDK_Escape)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	698 xs_subctrl_close();
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	699
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	700 return FALSE;
184 4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes. Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	701 }
4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes. Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	702
4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes. Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	703
294 f0ece2d20094 Do correct typecasts and declare xs_subctrl_open arguments as void. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	704 void xs_subctrl_open(void)
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	705 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	706 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	707
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	708 XS_MUTEX_LOCK(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	709 if (!xs_status.tuneInfo \|\| !xs_status.isPlaying \|\|
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	710 xs_subctrl \|\| (xs_status.tuneInfo->nsubTunes <= 1)) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	711 XS_MUTEX_UNLOCK(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	712 return;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	713 }
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	714
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	715 /* Create the pop-up window */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	716 xs_subctrl = gtk_window_new(GTK_WINDOW_DIALOG);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	717 gtk_widget_set_name(xs_subctrl, "xs_subctrl");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	718 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	719
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	720 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	721 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	722 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	723 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	724
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	725 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	726 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	727
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	728 gtk_widget_realize(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	729 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	730
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	731
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	732 /* Create the control widgets */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	733 frame25 = gtk_frame_new(NULL);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	734 gtk_container_add(GTK_CONTAINER(xs_subctrl), frame25);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	735 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	736 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	737
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	738 hbox15 = gtk_hbox_new(FALSE, 4);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	739 gtk_container_add(GTK_CONTAINER(frame25), hbox15);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	740
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	741 subctrl_prev = gtk_button_new_with_label(" < ");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	742 gtk_widget_set_name(subctrl_prev, "subctrl_prev");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	743 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	744
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	745 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	746 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	747
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	748 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	749 gtk_widget_set_name(subctrl_current, "subctrl_current");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	750 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	751 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	752 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	753 gtk_widget_grab_focus(subctrl_current);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	754
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	755 subctrl_next = gtk_button_new_with_label(" > ");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	756 gtk_widget_set_name(subctrl_next, "subctrl_next");
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	757 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	758
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	759 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	760 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	761 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	762
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	763 gtk_widget_show_all(xs_subctrl);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	764
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	765 XS_MUTEX_UNLOCK(xs_subctrl);
140 8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	766 }
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	767
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	768
8b9c14540e53 - Added UADE-style popup subsong-selector Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	769 /*
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	770 * Set the time-seek position
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	771 * 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	772 * 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	773 * in contrast to milliseconds used in other occasions.
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	774 *
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	775 * This function is called whenever position slider is clicked or
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	776 * 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	777 */
672 f22a708d29fd Remove some camelcasing / hungarian notation. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	778 void xs_seek(gint time)
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	779 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	780 /* Check status */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	781 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	782 if (!xs_status.tuneInfo \|\| !xs_status.isPlaying) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	783 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	784 return;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	785 }
132 4162a5370b9e Added "seek"-subsong control option, in style of xmms-sidplay. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	786
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	787 /* Act according to settings */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	788 switch (xs_cfg.subsongControl) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	789 case XS_SSC_SEEK:
672 f22a708d29fd Remove some camelcasing / hungarian notation. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	790 if (time < xs_status.lastTime) {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	791 if (xs_status.currSong > 1)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	792 xs_status.currSong--;
672 f22a708d29fd Remove some camelcasing / hungarian notation. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	793 } else if (time > xs_status.lastTime) {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	794 if (xs_status.currSong < xs_status.tuneInfo->nsubTunes)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	795 xs_status.currSong++;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	796 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	797 break;
78 ab522ab65c85 Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	798
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	799 case XS_SSC_POPUP:
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	800 xs_subctrl_open();
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	801 break;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	802
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	803 /* 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	804 #ifdef HAVE_SONG_POSITION
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	805 case XS_SSC_PATCH:
672 f22a708d29fd Remove some camelcasing / hungarian notation. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	806 if ((time > 0) && (time <= xs_status.tuneInfo->nsubTunes))
f22a708d29fd Remove some camelcasing / hungarian notation. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	807 xs_status.currSong = time;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	808 break;
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	809 #endif
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	810 }
103 fe83646e6baa Changed plrFillBuffer()-functions to return actual number of samples computed. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	811
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	812 XS_MUTEX_UNLOCK(xs_status);
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	813 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	814
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	815
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	816 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	817 * Return the playing "position/time"
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	818 * Determine current position/time in song. Used by XMMS to update
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	819 * the song clock and position slider and MOST importantly to determine
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	820 * 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	821 * 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	822 */
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	823 gint xs_get_time(void)
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	824 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	825 /* 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	826 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	827 if (xs_status.isError) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	828 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	829 return -2;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	830 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	831
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	832 /* If there is no tune, return -1 */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	833 if (!xs_status.tuneInfo) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	834 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	835 return -1;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	836 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	837
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	838 /* If tune has ended, return -1 */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	839 if (!xs_status.isPlaying) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	840 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	841 return -1;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	842 }
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	843
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	844 /* Let's see what we do */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	845 switch (xs_cfg.subsongControl) {
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	846 case XS_SSC_SEEK:
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	847 xs_status.lastTime = (xs_plugin_ip.output->output_time() / 1000);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	848 break;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	849
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	850 #ifdef HAVE_SONG_POSITION
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	851 case XS_SSC_PATCH:
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	852 set_song_position(xs_status.currSong, 1, xs_status.tuneInfo->nsubTunes);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	853 break;
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	854 #endif
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	855 }
230 608f31f6c095 Raw cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	856
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	857 XS_MUTEX_UNLOCK(xs_status);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	858
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	859 /* Return output time reported by audio output plugin */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	860 return xs_plugin_ip.output->output_time();
71 2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	861 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	862
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	863
477 53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	864 /* Return song information: called by XMMS when initially loading the playlist.
202 fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	865 * Subsequent changes to information are made by the player thread,
fe684a2ccdc7 Reworking code. Matti Hamalainen <ccr@tnsp.org> parents: 200 diff changeset	866 * 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	867 */
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	868 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	869 {
672 f22a708d29fd Remove some camelcasing / hungarian notation. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	870 xs_tuneinfo_t *info;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	871
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	872 XS_MUTEX_LOCK(xs_status);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	873
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	874 /* Get tune information from emulation engine */
672 f22a708d29fd Remove some camelcasing / hungarian notation. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	875 info = xs_status.sidPlayer->plrGetSIDInfo(songFilename);
f22a708d29fd Remove some camelcasing / hungarian notation. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	876 if (!info) {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	877 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	878 return;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	879 }
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	880
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	881 /* Get sub-tune information, if available */
672 f22a708d29fd Remove some camelcasing / hungarian notation. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	882 if ((info->startTune > 0) && (info->startTune <= info->nsubTunes)) {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	883 gint tmpInt;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	884
672 f22a708d29fd Remove some camelcasing / hungarian notation. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	885 (*songTitle) = xs_make_titlestring(info, info->startTune);
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	886
672 f22a708d29fd Remove some camelcasing / hungarian notation. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	887 tmpInt = info->subTunes[info->startTune-1].tuneLength;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	888 if (tmpInt < 0)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	889 (*songLength) = -1;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	890 else
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	891 (songLength) = (tmpInt 1000);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	892 }
177 6e350784aa57 Various cleanups. Min-playtime option now works. Configuration has more Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	893
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	894 /* Free tune information */
672 f22a708d29fd Remove some camelcasing / hungarian notation. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	895 xs_tuneinfo_free(info);
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 659 diff changeset	896 XS_MUTEX_UNLOCK(xs_status);
87 94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	897 }
94497283affa Various fixes and improvements Matti Hamalainen <ccr@tnsp.org> parents: 84 diff changeset	898

Mercurial > hg > xmms-sid

annotate src/xmms-sid.c @ 735:fb218dbc90cd