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

annotate src/xmms-sid.c @ 299:9ddce00a8653

Fixes.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 25 Dec 2004 20:42:01 +0000
parents	5db529b397bd
children	e6dec620b1b3

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

Mercurial > hg > xmms-sid

annotate src/xmms-sid.c @ 299:9ddce00a8653