xmms-sid: src/xs_sidplay2.cpp annotate

annotate src/xs_sidplay2.cpp @ 927:8fc22804ab61

Added tag dev-0_8_97 for changeset 970ff4d30e89

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 13 Nov 2012 18:57:23 +0200
parents	3a9bf45178ff
children	a5b118c853f5

rev	line source
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3
838 ae1f6418d093 libSIDPlay2-FP backend interface is now in a separate module. Configuration Matti Hamalainen <ccr@tnsp.org> parents: 834 diff changeset	4 libSIDPlay2 support
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5
324 dd201740a720 Changed copyright text. Matti Hamalainen <ccr@tnsp.org> parents: 321 diff changeset	6 Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	7 (C) Copyright 1999-2012 Tecnic Software productions (TNSP)
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 This program is free software; you can redistribute it and/or modify
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10 it under the terms of the GNU General Public License as published by
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11 the Free Software Foundation; either version 2 of the License, or
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	12 (at your option) any later version.
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14 This program is distributed in the hope that it will be useful,
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	15 but WITHOUT ANY WARRANTY; without even the implied warranty of
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	17 GNU General Public License for more details.
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	18
412 7f694e5a1493 Updated GNU GPL (new FSF address) and some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	19 You should have received a copy of the GNU General Public License along
7f694e5a1493 Updated GNU GPL (new FSF address) and some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	20 with this program; if not, write to the Free Software Foundation, Inc.,
7f694e5a1493 Updated GNU GPL (new FSF address) and some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 402 diff changeset	21 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22 */
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23 #include "xmms-sid.h"
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	24
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25 #ifdef HAVE_SIDPLAY2
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	26
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	27 #include "xs_sidplay2.h"
832 b158abe91a75 Header include cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 821 diff changeset	28 #include "xs_slsup.h"
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	29 #include "xs_config.h"
402 f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely Matti Hamalainen <ccr@tnsp.org> parents: 396 diff changeset	30
833 c0e892fa914a Begin moving libSIDPlay2-FP stuff to a separete module by removing the Matti Hamalainen <ccr@tnsp.org> parents: 832 diff changeset	31 #include <sidplay/sidplay2.h>
c0e892fa914a Begin moving libSIDPlay2-FP stuff to a separete module by removing the Matti Hamalainen <ccr@tnsp.org> parents: 832 diff changeset	32 #if G_BYTE_ORDER == G_BIG_ENDIAN
c0e892fa914a Begin moving libSIDPlay2-FP stuff to a separete module by removing the Matti Hamalainen <ccr@tnsp.org> parents: 832 diff changeset	33 # define SID2_NATIVE_UNSIGNED SID2_BIG_UNSIGNED
c0e892fa914a Begin moving libSIDPlay2-FP stuff to a separete module by removing the Matti Hamalainen <ccr@tnsp.org> parents: 832 diff changeset	34 # define SID2_NATIVE_SIGNED SID2_BIG_SIGNED
c0e892fa914a Begin moving libSIDPlay2-FP stuff to a separete module by removing the Matti Hamalainen <ccr@tnsp.org> parents: 832 diff changeset	35 #elif G_BYTE_ORDER == G_LITTLE_ENDIAN
c0e892fa914a Begin moving libSIDPlay2-FP stuff to a separete module by removing the Matti Hamalainen <ccr@tnsp.org> parents: 832 diff changeset	36 # define SID2_NATIVE_UNSIGNED SID2_LITTLE_UNSIGNED
c0e892fa914a Begin moving libSIDPlay2-FP stuff to a separete module by removing the Matti Hamalainen <ccr@tnsp.org> parents: 832 diff changeset	37 # define SID2_NATIVE_SIGNED SID2_LITTLE_SIGNED
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	38 #else
833 c0e892fa914a Begin moving libSIDPlay2-FP stuff to a separete module by removing the Matti Hamalainen <ccr@tnsp.org> parents: 832 diff changeset	39 # error Unsupported endianess!
692 0126579b6652 Actually compiles now with libsidplay2 COM API, but does not work yet. Matti Hamalainen <ccr@tnsp.org> parents: 660 diff changeset	40 #endif
694 fd81a16434ed Move builder header inclusions. Matti Hamalainen <ccr@tnsp.org> parents: 693 diff changeset	41
757 9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	42
756 8299288df6d2 Rename internal structures. Matti Hamalainen <ccr@tnsp.org> parents: 754 diff changeset	43 class XSSIDPlay2 {
695 ca594ca1056f COM API support works now. Matti Hamalainen <ccr@tnsp.org> parents: 694 diff changeset	44 public:
770 72e58ecb1a2c Still not working. Urgh. Matti Hamalainen <ccr@tnsp.org> parents: 769 diff changeset	45 sidplay2 emu;
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	46 sid2_config_t config;
820 778531e968ed Clean up tune loading. Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	47 SidTune tune;
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	48
756 8299288df6d2 Rename internal structures. Matti Hamalainen <ccr@tnsp.org> parents: 754 diff changeset	49 XSSIDPlay2(void);
795 3e305ce076e8 Make old libSIDPlay2 support work again, the one available in most distros, such as Debian. Matti Hamalainen <ccr@tnsp.org> parents: 791 diff changeset	50 virtual ~XSSIDPlay2(void);
695 ca594ca1056f COM API support works now. Matti Hamalainen <ccr@tnsp.org> parents: 694 diff changeset	51 };
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	52
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53
694 fd81a16434ed Move builder header inclusions. Matti Hamalainen <ccr@tnsp.org> parents: 693 diff changeset	54 #ifdef HAVE_RESID_BUILDER
833 c0e892fa914a Begin moving libSIDPlay2-FP stuff to a separete module by removing the Matti Hamalainen <ccr@tnsp.org> parents: 832 diff changeset	55 # include <sidplay/builders/resid.h>
694 fd81a16434ed Move builder header inclusions. Matti Hamalainen <ccr@tnsp.org> parents: 693 diff changeset	56 #endif
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	57
694 fd81a16434ed Move builder header inclusions. Matti Hamalainen <ccr@tnsp.org> parents: 693 diff changeset	58 #ifdef HAVE_HARDSID_BUILDER
833 c0e892fa914a Begin moving libSIDPlay2-FP stuff to a separete module by removing the Matti Hamalainen <ccr@tnsp.org> parents: 832 diff changeset	59 # include <sidplay/builders/hardsid.h>
694 fd81a16434ed Move builder header inclusions. Matti Hamalainen <ccr@tnsp.org> parents: 693 diff changeset	60 #endif
fd81a16434ed Move builder header inclusions. Matti Hamalainen <ccr@tnsp.org> parents: 693 diff changeset	61
fd81a16434ed Move builder header inclusions. Matti Hamalainen <ccr@tnsp.org> parents: 693 diff changeset	62
820 778531e968ed Clean up tune loading. Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	63 XSSIDPlay2::XSSIDPlay2(void) : tune(0)
695 ca594ca1056f COM API support works now. Matti Hamalainen <ccr@tnsp.org> parents: 694 diff changeset	64 {
ca594ca1056f COM API support works now. Matti Hamalainen <ccr@tnsp.org> parents: 694 diff changeset	65 }
ca594ca1056f COM API support works now. Matti Hamalainen <ccr@tnsp.org> parents: 694 diff changeset	66
ca594ca1056f COM API support works now. Matti Hamalainen <ccr@tnsp.org> parents: 694 diff changeset	67
795 3e305ce076e8 Make old libSIDPlay2 support work again, the one available in most distros, such as Debian. Matti Hamalainen <ccr@tnsp.org> parents: 791 diff changeset	68 XSSIDPlay2::~XSSIDPlay2(void)
3e305ce076e8 Make old libSIDPlay2 support work again, the one available in most distros, such as Debian. Matti Hamalainen <ccr@tnsp.org> parents: 791 diff changeset	69 {
820 778531e968ed Clean up tune loading. Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	70 emu.load(NULL);
795 3e305ce076e8 Make old libSIDPlay2 support work again, the one available in most distros, such as Debian. Matti Hamalainen <ccr@tnsp.org> parents: 791 diff changeset	71 }
3e305ce076e8 Make old libSIDPlay2 support work again, the one available in most distros, such as Debian. Matti Hamalainen <ccr@tnsp.org> parents: 791 diff changeset	72
3e305ce076e8 Make old libSIDPlay2 support work again, the one available in most distros, such as Debian. Matti Hamalainen <ccr@tnsp.org> parents: 791 diff changeset	73
270 583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	74 /* We need to 'export' all this pseudo-C++ crap */
396 0a60ef2b5ab0 Cleanups Matti Hamalainen <ccr@tnsp.org> parents: 394 diff changeset	75 extern "C" {
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	76
75 653c9b0d1320 SIDPlay2 support "works" now. Borked problems with threads. Matti Hamalainen <ccr@tnsp.org> parents: 74 diff changeset	77
270 583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	78 /* Check if we can play the given file
75 653c9b0d1320 SIDPlay2 support "works" now. Borked problems with threads. Matti Hamalainen <ccr@tnsp.org> parents: 74 diff changeset	79 */
751 55eea3fa8868 Rename some structures. Matti Hamalainen <ccr@tnsp.org> parents: 748 diff changeset	80 gboolean xs_sidplay2_probe(XSFile *f)
364 421e4fc13bce More and more of indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	81 {
702 b5b6b13a6d85 Renamed some types. Matti Hamalainen <ccr@tnsp.org> parents: 700 diff changeset	82 gchar tmpBuf[5];
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	83
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	84 if (!f) return FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	85
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	86 if (xs_fread(tmpBuf, sizeof(gchar), 4, f) != 4)
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	87 return FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	88
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	89 if (!strncmp(tmpBuf, "PSID", 4) \|\| !strncmp(tmpBuf, "RSID", 4))
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	90 return TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	91 else
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	92 return FALSE;
364 421e4fc13bce More and more of indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	93 }
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	94
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	95
270 583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	96 /* Initialize SIDPlay2
75 653c9b0d1320 SIDPlay2 support "works" now. Borked problems with threads. Matti Hamalainen <ccr@tnsp.org> parents: 74 diff changeset	97 */
754 5557837fe5b6 Rename some more variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	98 gboolean xs_sidplay2_init(XSEngineState * state)
364 421e4fc13bce More and more of indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	99 {
756 8299288df6d2 Rename internal structures. Matti Hamalainen <ccr@tnsp.org> parents: 754 diff changeset	100 XSSIDPlay2 *engine;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	101 sid_filter_t tmpFilter;
722 5923dfff1fac Unify xs_sid_filter_t into one. Matti Hamalainen <ccr@tnsp.org>* parents: 710 diff changeset	102 xs_sid_filter_t *f;
766 19e2745f75d8 Cosmetics and leftover cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 765 diff changeset	103 gint i;
754 5557837fe5b6 Rename some more variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	104 assert(state);
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105
847 5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	106 XSDEBUG("SIDPlay2 backend initializing.\n");
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	107
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	108 /* Allocate internal structures */
756 8299288df6d2 Rename internal structures. Matti Hamalainen <ccr@tnsp.org> parents: 754 diff changeset	109 engine = new XSSIDPlay2();
754 5557837fe5b6 Rename some more variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	110 state->internal = engine;
770 72e58ecb1a2c Still not working. Urgh. Matti Hamalainen <ccr@tnsp.org> parents: 769 diff changeset	111 if (!engine)
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	112 return FALSE;
75 653c9b0d1320 SIDPlay2 support "works" now. Borked problems with threads. Matti Hamalainen <ccr@tnsp.org> parents: 74 diff changeset	113
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	114 /* Get current configuration */
847 5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	115 XSDEBUG("SIDPlay2 emulation configuration\n");
770 72e58ecb1a2c Still not working. Urgh. Matti Hamalainen <ccr@tnsp.org> parents: 769 diff changeset	116 engine->config = engine->emu.config();
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	117
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	118 /* Configure channels and stuff */
766 19e2745f75d8 Cosmetics and leftover cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 765 diff changeset	119 switch (state->audioChannels)
19e2745f75d8 Cosmetics and leftover cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 765 diff changeset	120 {
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	121 case XS_CHN_AUTOPAN:
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	122 engine->config.playback = sid2_stereo;
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	123 break;
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	125 case XS_CHN_STEREO:
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	126 engine->config.playback = sid2_stereo;
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	127 break;
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	129 case XS_CHN_MONO:
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	130 default:
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	131 engine->config.playback = sid2_mono;
754 5557837fe5b6 Rename some more variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	132 state->audioChannels = XS_CHN_MONO;
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	133 break;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	134 }
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	136
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	137 /* Memory mode settings */
766 19e2745f75d8 Cosmetics and leftover cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 765 diff changeset	138 switch (xs_cfg.memoryMode)
19e2745f75d8 Cosmetics and leftover cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 765 diff changeset	139 {
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	140 case XS_MPU_BANK_SWITCHING:
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	141 engine->config.environment = sid2_envBS;
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	142 break;
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	144 case XS_MPU_TRANSPARENT_ROM:
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	145 engine->config.environment = sid2_envTP;
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	146 break;
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	147
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	148 case XS_MPU_PLAYSID_ENVIRONMENT:
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	149 engine->config.environment = sid2_envPS;
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	150 break;
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	151
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	152 case XS_MPU_REAL:
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	153 default:
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	154 engine->config.environment = sid2_envR;
744 c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	155 xs_cfg.memoryMode = XS_MPU_REAL;
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as Matti Hamalainen <ccr@tnsp.org> parents: 723 diff changeset	156 break;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	157 }
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	160 /* Audio parameters sanity checking and setup */
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	161 engine->config.precision = state->audioBitsPerSample;
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	162 engine->config.frequency = state->audioFrequency;
748 d9d769b5dbe2 Remove oversampling support. Matti Hamalainen <ccr@tnsp.org> parents: 744 diff changeset	163
74 8cb66a3f75f7 Testing Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	164
766 19e2745f75d8 Cosmetics and leftover cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 765 diff changeset	165 switch (state->audioBitsPerSample)
19e2745f75d8 Cosmetics and leftover cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 765 diff changeset	166 {
757 9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	167 case XS_RES_8BIT:
9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	168 state->audioFormat = FMT_U8;
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	169 engine->config.sampleFormat = SID2_LITTLE_UNSIGNED;
758 6c8c968595d9 Sanitize some #ifdefs. Matti Hamalainen <ccr@tnsp.org> parents: 757 diff changeset	170 break;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	171
757 9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	172 case XS_RES_16BIT:
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	173 default:
766 19e2745f75d8 Cosmetics and leftover cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 765 diff changeset	174 switch (state->audioFormat)
19e2745f75d8 Cosmetics and leftover cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 765 diff changeset	175 {
757 9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	176 case FMT_U16_LE:
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	177 engine->config.sampleFormat = SID2_LITTLE_UNSIGNED;
757 9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	178 break;
9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	179
9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	180 case FMT_U16_BE:
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	181 engine->config.sampleFormat = SID2_BIG_UNSIGNED;
757 9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	182 break;
127 ddb513bd2610 Improved audio format support, now supported formats are "queried" from Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	183
757 9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	184 case FMT_U16_NE:
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	185 engine->config.sampleFormat = SID2_NATIVE_UNSIGNED;
757 9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	186 break;
9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	187
9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	188 case FMT_S16_LE:
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	189 engine->config.sampleFormat = SID2_LITTLE_SIGNED;
757 9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	190 break;
9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	191
9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	192 case FMT_S16_BE:
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	193 engine->config.sampleFormat = SID2_BIG_SIGNED;
757 9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	194 break;
9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	195
9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	196 default:
821 dea579b6c3b3 Oops, need to set FMT_S16_NE audio format for XMMS output backend as well Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	197 state->audioFormat = FMT_S16_NE;
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	198 engine->config.sampleFormat = SID2_NATIVE_SIGNED;
757 9c135d421676 Clean up endianess handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 756 diff changeset	199 break;
766 19e2745f75d8 Cosmetics and leftover cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 765 diff changeset	200 }
19e2745f75d8 Cosmetics and leftover cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 765 diff changeset	201 break;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	202 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	203
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	204 /* Convert filter */
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	205 f = &(xs_cfg.sid2Filter);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	206 XSDEBUG("using filter '%s', %d points\n", f->name, f->npoints);
766 19e2745f75d8 Cosmetics and leftover cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 765 diff changeset	207 if (f->npoints > XS_SIDPLAY2_NFPOINTS)
19e2745f75d8 Cosmetics and leftover cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 765 diff changeset	208 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	209 xs_error("[SIDPlay2] Invalid number of filter curve points (%d > %d)\n",
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	210 f->npoints, XS_SIDPLAY2_NFPOINTS);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	211 f->npoints = XS_SIDPLAY2_NFPOINTS;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	212 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	213
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	214 tmpFilter.points = f->npoints;
766 19e2745f75d8 Cosmetics and leftover cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 765 diff changeset	215 for (i = 0; i < f->npoints; i++)
19e2745f75d8 Cosmetics and leftover cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 765 diff changeset	216 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	217 tmpFilter.cutoff[i][0] = f->points[i].x;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	218 tmpFilter.cutoff[i][1] = f->points[i].y;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	219 }
352 2b4ca75b999f Cleanups Matti Hamalainen <ccr@tnsp.org> parents: 324 diff changeset	220
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	221 /* Clockspeed settings */
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	222 switch (xs_cfg.clockSpeed)
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	223 {
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	224 case XS_CLOCK_NTSC:
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	225 engine->config.clockDefault = SID2_CLOCK_NTSC;
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	226 break;
366 29c4484f1de2 Fixes in emulator engine configuration, make 'forceModel' option work. Matti Hamalainen <ccr@tnsp.org> parents: 364 diff changeset	227
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	228 default:
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	229 case XS_CLOCK_PAL:
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	230 engine->config.clockDefault = SID2_CLOCK_PAL;
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	231 xs_cfg.clockSpeed = XS_CLOCK_PAL;
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	232 break;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	233 }
366 29c4484f1de2 Fixes in emulator engine configuration, make 'forceModel' option work. Matti Hamalainen <ccr@tnsp.org> parents: 364 diff changeset	234
29c4484f1de2 Fixes in emulator engine configuration, make 'forceModel' option work. Matti Hamalainen <ccr@tnsp.org> parents: 364 diff changeset	235
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	236 /* Configure rest of the emulation */
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	237 if (xs_cfg.forceSpeed)
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	238 {
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	239 engine->config.clockForced = true;
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	240 engine->config.clockSpeed = engine->config.clockDefault;
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	241 }
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	242 else
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	243 {
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	244 engine->config.clockForced = false;
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	245 engine->config.clockSpeed = SID2_CLOCK_CORRECT;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	246 }
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	247
710 a6283cf95c99 Updated to work with latest distortion patched libSIDPlay2+reSID from Antti Matti Hamalainen <ccr@tnsp.org> parents: 702 diff changeset	248
761 641b7693fecc Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 758 diff changeset	249 if (xs_cfg.sid2OptLevel < 0 \|\| xs_cfg.sid2OptLevel > SID2_MAX_OPTIMISATION)
641b7693fecc Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 758 diff changeset	250 {
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	251 xs_error("Invalid sid2OptLevel=%d, falling back to %d.\n",
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	252 xs_cfg.sid2OptLevel, SID2_DEFAULT_OPTIMISATION);
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	253
761 641b7693fecc Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 758 diff changeset	254 xs_cfg.sid2OptLevel = SID2_DEFAULT_OPTIMISATION;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	255 }
766 19e2745f75d8 Cosmetics and leftover cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 765 diff changeset	256 engine->config.optimisation = xs_cfg.sid2OptLevel;
366 29c4484f1de2 Fixes in emulator engine configuration, make 'forceModel' option work. Matti Hamalainen <ccr@tnsp.org> parents: 364 diff changeset	257
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	258 engine->config.sidDefault = xs_cfg.mos8580 ? SID2_MOS8580 : SID2_MOS6581;
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	259 engine->config.sidModel = xs_cfg.forceModel ? engine->config.sidDefault : SID2_MODEL_CORRECT;
1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	260 engine->config.sidSamples = TRUE;
321 45ad9f7c1628 Improved compatibility, some fixes in reSID emulation initialization. Matti Hamalainen <ccr@tnsp.org> parents: 270 diff changeset	261
847 5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	262
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	263 /* Initialize builder object */
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	264 XSDEBUG("init builder #%i, maxsids=%i\n", xs_cfg.sid2Builder, (engine->emu.info()).maxsids);
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	265
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	266 switch (xs_cfg.sid2Builder)
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	267 {
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	268 #ifdef HAVE_RESID_BUILDER
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	269 case XS_BLD_RESID:
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	270 {
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	271 ReSIDBuilder *rs = new ReSIDBuilder("ReSID builder");
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	272 if (rs)
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	273 {
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	274 engine->config.sidEmulation = rs;
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	275 if (!*rs) return FALSE;
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	276 rs->create((engine->emu.info()).maxsids);
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	277 if (!*rs) return FALSE;
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	278 }
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	279 }
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	280 break;
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	281 #endif
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	282
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	283 #ifdef HAVE_HARDSID_BUILDER
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	284 case XS_BLD_HARDSID:
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	285 {
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	286 HardSIDBuilder *hs = new HardSIDBuilder("HardSID builder (FP)");
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	287 engine->config.sidEmulation = (sidbuilder *) hs;
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	288 if (hs)
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	289 {
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	290 hs->create((engine->emu.info()).maxsids);
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	291 if (!*hs)
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	292 {
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	293 xs_error("hardSID->create() failed.\n");
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	294 return FALSE;
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	295 }
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	296 }
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	297 }
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	298 break;
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	299 #endif
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	300
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	301 default:
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	302 xs_error("[SIDPlay2] Invalid or unsupported builder selected.\n");
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	303 return FALSE;
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	304 }
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	305
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	306 if (!engine->config.sidEmulation)
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	307 {
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	308 xs_error("[SIDPlay2] Could not initialize SIDBuilder object.\n");
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	309 return FALSE;
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	310 }
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	311
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	312 #if 0
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	313 // Setup filter
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	314 engine->config.sidEmulation->filter(xs_cfg.emulateFilters);
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	315 if (!*(engine->config.sidEmulation))
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	316 {
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	317 xs_error("builder->filter(%d) failed.\n", xs_cfg.emulateFilters);
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	318 return FALSE;
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	319 }
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	320 #endif
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	321
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	322 XSDEBUG("%s\n", engine->config.sidEmulation->credits());
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	323
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	324
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	325 return TRUE;
364 421e4fc13bce More and more of indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	326 }
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	327
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	328
270 583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	329 /* Close SIDPlay2 engine
583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	330 */
754 5557837fe5b6 Rename some more variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	331 void xs_sidplay2_close(XSEngineState * state)
364 421e4fc13bce More and more of indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	332 {
769 120d6f247f1b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 768 diff changeset	333 XSSIDPlay2 engine = (XSSIDPlay2 ) state->internal;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	334
847 5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	335 XSDEBUG("SIDPlay2 backend shutdown.\n");
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	336
775 0e9f2894b0a9 Proper order of freeing/deletion. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	337 xs_sidplay2_delete(state);
0e9f2894b0a9 Proper order of freeing/deletion. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	338
770 72e58ecb1a2c Still not working. Urgh. Matti Hamalainen <ccr@tnsp.org> parents: 769 diff changeset	339 if (engine)
72e58ecb1a2c Still not working. Urgh. Matti Hamalainen <ccr@tnsp.org> parents: 769 diff changeset	340 {
72e58ecb1a2c Still not working. Urgh. Matti Hamalainen <ccr@tnsp.org> parents: 769 diff changeset	341 delete engine;
775 0e9f2894b0a9 Proper order of freeing/deletion. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	342 engine = NULL;
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	343 }
270 583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	344
754 5557837fe5b6 Rename some more variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	345 state->internal = NULL;
364 421e4fc13bce More and more of indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	346 }
270 583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	347
583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	348
583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	349 /* Initialize current song and sub-tune
583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	350 */
754 5557837fe5b6 Rename some more variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	351 gboolean xs_sidplay2_initsong(XSEngineState * state)
364 421e4fc13bce More and more of indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	352 {
768 f145ba458acd Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 766 diff changeset	353 XSSIDPlay2 engine = (XSSIDPlay2 ) state->internal;
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	354
768 f145ba458acd Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 766 diff changeset	355 if (!engine)
f145ba458acd Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 766 diff changeset	356 return FALSE;
270 583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	357
820 778531e968ed Clean up tune loading. Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	358 if (!engine->tune.selectSong(state->currSong))
769 120d6f247f1b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 768 diff changeset	359 {
820 778531e968ed Clean up tune loading. Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	360 xs_error("[SIDPlay2] tune.selectSong() failed\n");
778531e968ed Clean up tune loading. Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	361 return FALSE;
778531e968ed Clean up tune loading. Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	362 }
778531e968ed Clean up tune loading. Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	363
778531e968ed Clean up tune loading. Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	364 if (engine->emu.load(&(engine->tune)) < 0)
778531e968ed Clean up tune loading. Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	365 {
778531e968ed Clean up tune loading. Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	366 xs_error("[SIDPlay2] emu.load() failed\n");
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	367 return FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	368 }
359 b1a858b8cb1a Re-indentation all (non-generated) code. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	369
795 3e305ce076e8 Make old libSIDPlay2 support work again, the one available in most distros, such as Debian. Matti Hamalainen <ccr@tnsp.org> parents: 791 diff changeset	370 if (engine->emu.config(engine->config) < 0)
3e305ce076e8 Make old libSIDPlay2 support work again, the one available in most distros, such as Debian. Matti Hamalainen <ccr@tnsp.org> parents: 791 diff changeset	371 {
3e305ce076e8 Make old libSIDPlay2 support work again, the one available in most distros, such as Debian. Matti Hamalainen <ccr@tnsp.org> parents: 791 diff changeset	372 xs_error("[SIDPlay2] Emulator engine configuration failed!\n");
3e305ce076e8 Make old libSIDPlay2 support work again, the one available in most distros, such as Debian. Matti Hamalainen <ccr@tnsp.org> parents: 791 diff changeset	373 return FALSE;
3e305ce076e8 Make old libSIDPlay2 support work again, the one available in most distros, such as Debian. Matti Hamalainen <ccr@tnsp.org> parents: 791 diff changeset	374 }
3e305ce076e8 Make old libSIDPlay2 support work again, the one available in most distros, such as Debian. Matti Hamalainen <ccr@tnsp.org> parents: 791 diff changeset	375
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	376 return TRUE;
364 421e4fc13bce More and more of indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	377 }
270 583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	378
583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	379
583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	380 /* Emulate and render audio data to given buffer
583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	381 */
754 5557837fe5b6 Rename some more variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	382 guint xs_sidplay2_fillbuffer(XSEngineState * state, gchar * audioBuffer, guint audioBufSize)
364 421e4fc13bce More and more of indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	383 {
768 f145ba458acd Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 766 diff changeset	384 XSSIDPlay2 engine = (XSSIDPlay2 ) state->internal;
270 583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	385
768 f145ba458acd Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 766 diff changeset	386 if (!engine)
f145ba458acd Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 766 diff changeset	387 return 0;
270 583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	388
795 3e305ce076e8 Make old libSIDPlay2 support work again, the one available in most distros, such as Debian. Matti Hamalainen <ccr@tnsp.org> parents: 791 diff changeset	389 return engine->emu.play(audioBuffer, audioBufSize);
364 421e4fc13bce More and more of indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	390 }
270 583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	391
583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	392
583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	393 /* Load a given SID-tune file
583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	394 */
765 1294df516d2e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 761 diff changeset	395 gboolean xs_sidplay2_load(XSEngineState * state, gchar * filename)
364 421e4fc13bce More and more of indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	396 {
768 f145ba458acd Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 766 diff changeset	397 XSSIDPlay2 engine = (XSSIDPlay2 ) state->internal;
869 3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	398 gboolean res = FALSE;
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	399 guint8 *buf = NULL;
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	400 size_t bufSize;
768 f145ba458acd Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 766 diff changeset	401
869 3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	402 if (!engine)
768 f145ba458acd Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 766 diff changeset	403 return FALSE;
869 3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	404
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	405 if (!xs_fload_buffer(filename, &buf, &bufSize, XS_SIDBUF_SIZE, TRUE))
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	406 goto error;
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	407
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	408 engine->tune.read(buf, bufSize);
820 778531e968ed Clean up tune loading. Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	409 if (!engine->tune)
778531e968ed Clean up tune loading. Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	410 {
778531e968ed Clean up tune loading. Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	411 xs_error("Could not load file '%s': %s\n",
778531e968ed Clean up tune loading. Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	412 filename, (engine->tune.getInfo()).statusString);
869 3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	413 goto error;
820 778531e968ed Clean up tune loading. Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	414 }
869 3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	415
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	416 res = TRUE;
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	417
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	418 error:
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	419 g_free(buf);
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	420 return res;
364 421e4fc13bce More and more of indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	421 }
270 583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	422
583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	423
583f5651abff Cleanups, moved engine configuration to initialization function. Matti Hamalainen <ccr@tnsp.org> parents: 232 diff changeset	424 /* Delete INTERNAL information
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	425 */
754 5557837fe5b6 Rename some more variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	426 void xs_sidplay2_delete(XSEngineState * state)
364 421e4fc13bce More and more of indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	427 {
838 ae1f6418d093 libSIDPlay2-FP backend interface is now in a separate module. Configuration Matti Hamalainen <ccr@tnsp.org> parents: 834 diff changeset	428 (void) state;
ae1f6418d093 libSIDPlay2-FP backend interface is now in a separate module. Configuration Matti Hamalainen <ccr@tnsp.org> parents: 834 diff changeset	429 // XSSIDPlay2 engine = (XSSIDPlay2 ) state->internal;
526 fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 474 diff changeset	430 }
fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 474 diff changeset	431
fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 474 diff changeset	432
fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 474 diff changeset	433 /* Hardware backend flushing
fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 474 diff changeset	434 */
754 5557837fe5b6 Rename some more variables. Matti Hamalainen <ccr@tnsp.org> parents: 753 diff changeset	435 void xs_sidplay2_flush(XSEngineState * state)
526 fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 474 diff changeset	436 {
779 8fb51f9ef44e Fix some HardSID builder related things. Matti Hamalainen <ccr@tnsp.org> parents: 776 diff changeset	437 XSSIDPlay2 engine = (XSSIDPlay2 ) state->internal;
526 fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 474 diff changeset	438
fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 474 diff changeset	439 #ifdef HAVE_HARDSID_BUILDER
768 f145ba458acd Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 766 diff changeset	440 if (xs_cfg.sid2Builder == XS_BLD_HARDSID)
f145ba458acd Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 766 diff changeset	441 {
779 8fb51f9ef44e Fix some HardSID builder related things. Matti Hamalainen <ccr@tnsp.org> parents: 776 diff changeset	442 ((HardSIDBuilder *) engine->config.sidEmulation)->flush();
768 f145ba458acd Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 766 diff changeset	443 }
526 fa95d942f226 Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions. Matti Hamalainen <ccr@tnsp.org> parents: 474 diff changeset	444 #endif
364 421e4fc13bce More and more of indentation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 359 diff changeset	445 }
73 2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	446
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	447
862 011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	448 /* This function gets most of the information, though we do miss some
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	449 * (those variables that are only set by libSIDPlay when tune is initialized).
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	450 * Rest of the information is acquired in xs_sidplay2_updateinfo()
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	451 */
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	452 XSTuneInfo xs_sidplay2_getinfo(const gchar filename)
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	453 {
869 3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	454 XSTuneInfo *res = NULL;
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	455 SidTune *tune = NULL;
862 011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	456 SidTuneInfo info;
869 3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	457 guint8 *buf = NULL;
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	458 size_t bufSize;
862 011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	459
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	460 /* Check if the tune exists and is readable */
869 3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	461 if (!xs_fload_buffer(filename, &buf, &bufSize, XS_SIDBUF_SIZE, TRUE))
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	462 {
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	463 XSDEBUG("could not load file '%s'.\n", filename);
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	464 goto error;
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	465 }
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	466
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	467 if ((tune = new SidTune(buf, bufSize)) == NULL)
862 011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	468 {
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	469 XSDEBUG("could not initialize tune from '%s'.\n", filename);
869 3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	470 goto error;
862 011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	471 }
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	472
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	473 if (!tune->getStatus())
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	474 {
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	475 XSDEBUG("tune->getStatus() returned false for '%s'.\n", filename);
869 3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	476 goto error;
862 011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	477 }
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	478
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	479 /* Get general tune information */
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	480 tune->getInfo(info);
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	481
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	482 /* Allocate tuneinfo structure and set information */
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	483 res = xs_tuneinfo_new(filename,
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	484 info.songs, info.startSong,
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	485 info.infoString[0], info.infoString[1], info.infoString[2],
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	486 info.loadAddr, info.initAddr, info.playAddr,
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	487 info.dataFileLen, info.formatString,
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	488 info.sidModel
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	489 );
869 3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	490
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	491 error:
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	492 if (tune)
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	493 delete tune;
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	494
3a9bf45178ff Use xs_fload_buffer() again, to support potential VFS backends. Matti Hamalainen <ccr@tnsp.org> parents: 862 diff changeset	495 g_free(buf);
862 011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	496 return res;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	497 }
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	498
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	499
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	500 /* Updates the information of currently playing tune
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	501 */
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	502 gboolean xs_sidplay2_updateinfo(XSEngineState *state)
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	503 {
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	504 XSSIDPlay2 *engine;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	505 SidTuneInfo info;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	506
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	507 /* Check if we have required structures initialized */
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	508 if (!state \|\| !state->tuneInfo \|\| !state->internal)
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	509 return FALSE;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	510
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	511 engine = (XSSIDPlay2 *) state->internal;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	512 if (!(engine->tune))
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	513 return FALSE;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	514
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	515 /* Get general tune information */
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	516 engine->tune.getInfo(info);
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	517
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	518 /* NOTICE! Here we assume that libSIDPlay[12] headers define
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	519 * SIDTUNE_SIDMODEL_* similarly to our enums in xs_config.h ...
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	520 */
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	521 state->tuneInfo->sidModel = info.sidModel;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	522
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	523 if (state->currSong > 0 && state->currSong <= state->tuneInfo->nsubTunes)
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	524 {
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	525 gint tmpSpeed = info.clockSpeed;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	526 switch (info.clockSpeed)
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	527 {
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	528 case SIDTUNE_CLOCK_PAL: tmpSpeed = XS_CLOCK_PAL; break;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	529 case SIDTUNE_CLOCK_NTSC: tmpSpeed = XS_CLOCK_NTSC; break;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	530 case SIDTUNE_CLOCK_ANY: tmpSpeed = XS_CLOCK_ANY; break;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	531 case SIDTUNE_CLOCK_UNKNOWN:
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	532 switch (info.songSpeed)
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	533 {
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	534 case SIDTUNE_SPEED_VBI: tmpSpeed = XS_CLOCK_VBI; break;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	535 case SIDTUNE_SPEED_CIA_1A: tmpSpeed = XS_CLOCK_CIA; break;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	536 default: tmpSpeed = info.songSpeed; break;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	537 }
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	538 break;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	539 }
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	540 state->tuneInfo->subTunes[state->currSong - 1].tuneSpeed = tmpSpeed;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	541 }
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	542
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	543 return TRUE;
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	544 }
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	545
011ba70e271e Major cleanups, make SIDPlayFP backend compile with libSIDPlayFP v1.0.0 Matti Hamalainen <ccr@tnsp.org> parents: 849 diff changeset	546
660 b0743dc9165d Change tabs to 4 spaces, everywhere. Matti Hamalainen <ccr@tnsp.org> parents: 657 diff changeset	547 } /* extern "C" */
847 5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	548 #endif /* HAVE_SIDPLAY2
5b93bd8c7814 Cleanups, adjust backend configuration sequences, more error checking, Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	549 */

Mercurial > hg > xmms-sid

annotate src/xs_sidplay2.cpp @ 927:8fc22804ab61