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

annotate src/xmms-sid.c @ 927:8fc22804ab61

Added tag dev-0_8_97 for changeset 970ff4d30e89

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 13 Nov 2012 18:57:23 +0200
parents	2a50d36215c3
children	04dc44e87e03

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

Mercurial > hg > xmms-sid

annotate src/xmms-sid.c @ 927:8fc22804ab61