Mercurial > hg > xmms-sid

annotate src/xs_sidplay2.cc @ 795:3e305ce076e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make old libSIDPlay2 support work again, the one available in most distros, such as Debian.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 07 Nov 2012 11:05:24 +0200
parents 0995fa233462
children c83c08b2ede4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
4 libSIDPlay v2 and libSIDPlay v2-FP 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
460
9e683fb666ba Updates
Matti Hamalainen <ccr@tnsp.org>
parents: 445
diff changeset
27 #include <stdio.h>
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
28 #include "xs_sidplay2.h"
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
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
31
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
32 #ifdef HAVE_SIDPLAY2_FP
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
33 # include <sidplayfp/sidplay2.h>
766
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
34 # include <sidplayfp/SidTuneMod.h>
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
35 # include <sidplayfp/event.h>
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
36 #else
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
37 # include <sidplay/sidplay2.h>
757
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
38 # if G_BYTE_ORDER == G_BIG_ENDIAN
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
39 # define SID2_NATIVE_UNSIGNED SID2_BIG_UNSIGNED
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
40 # define SID2_NATIVE_SIGNED SID2_BIG_SIGNED
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
41 # elif G_BYTE_ORDER == G_LITTLE_ENDIAN
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
42 # define SID2_NATIVE_UNSIGNED SID2_LITTLE_UNSIGNED
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
43 # define SID2_NATIVE_SIGNED SID2_LITTLE_SIGNED
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
44 # else
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
45 # error Unsupported endianess!
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
46 # endif
692
0126579b6652 Actually compiles now with libsidplay2 COM API, but does not work yet.
Matti Hamalainen <ccr@tnsp.org>
parents: 660
diff changeset
47 #endif
694
fd81a16434ed Move builder header inclusions.
Matti Hamalainen <ccr@tnsp.org>
parents: 693
diff changeset
48
757
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
49
756
8299288df6d2 Rename internal structures.
Matti Hamalainen <ccr@tnsp.org>
parents: 754
diff changeset
50 class XSSIDPlay2 {
695
ca594ca1056f COM API support works now.
Matti Hamalainen <ccr@tnsp.org>
parents: 694
diff changeset
51 public:
770
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
52 sidplay2 emu;
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
53 sid2_config_t config;
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
54 SidTune *tune;
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
55 gboolean tuneLoaded;
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
56
756
8299288df6d2 Rename internal structures.
Matti Hamalainen <ccr@tnsp.org>
parents: 754
diff changeset
57 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
58 virtual ~XSSIDPlay2(void);
695
ca594ca1056f COM API support works now.
Matti Hamalainen <ccr@tnsp.org>
parents: 694
diff changeset
59 };
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
60
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
61
694
fd81a16434ed Move builder header inclusions.
Matti Hamalainen <ccr@tnsp.org>
parents: 693
diff changeset
62 #ifdef HAVE_RESID_BUILDER
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
63 # ifdef HAVE_SIDPLAY2_FP
766
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
64 # include <sidplayfp/builders/residfp.h>
773
45108b3d88db Add resid-fp and resid backend to sidplay2fp support.
Matti Hamalainen <ccr@tnsp.org>
parents: 770
diff changeset
65 # include <sidplayfp/builders/resid.h>
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
66 # else
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
67 # include <sidplay/builders/resid.h>
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
68 # endif
694
fd81a16434ed Move builder header inclusions.
Matti Hamalainen <ccr@tnsp.org>
parents: 693
diff changeset
69 #endif
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
70
694
fd81a16434ed Move builder header inclusions.
Matti Hamalainen <ccr@tnsp.org>
parents: 693
diff changeset
71 #ifdef HAVE_HARDSID_BUILDER
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
72 # ifdef HAVE_SIDPLAY2_FP
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
73 # include <sidplayfp/builders/hardsid.h>
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
74 # else
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
75 # include <sidplay/builders/hardsid.h>
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
76 # endif
694
fd81a16434ed Move builder header inclusions.
Matti Hamalainen <ccr@tnsp.org>
parents: 693
diff changeset
77 #endif
fd81a16434ed Move builder header inclusions.
Matti Hamalainen <ccr@tnsp.org>
parents: 693
diff changeset
78
fd81a16434ed Move builder header inclusions.
Matti Hamalainen <ccr@tnsp.org>
parents: 693
diff changeset
79
756
8299288df6d2 Rename internal structures.
Matti Hamalainen <ccr@tnsp.org>
parents: 754
diff changeset
80 XSSIDPlay2::XSSIDPlay2(void)
695
ca594ca1056f COM API support works now.
Matti Hamalainen <ccr@tnsp.org>
parents: 694
diff changeset
81 {
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
82 tune = NULL;
695
ca594ca1056f COM API support works now.
Matti Hamalainen <ccr@tnsp.org>
parents: 694
diff changeset
83 }
ca594ca1056f COM API support works now.
Matti Hamalainen <ccr@tnsp.org>
parents: 694
diff changeset
84
ca594ca1056f COM API support works now.
Matti Hamalainen <ccr@tnsp.org>
parents: 694
diff changeset
85
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
86 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
87 {
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
88 if (tune)
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
89 delete tune;
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
90
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
91 tuneLoaded = 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
92 }
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
93
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
94
270
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
95 /* We need to 'export' all this pseudo-C++ crap */
396
0a60ef2b5ab0 Cleanups
Matti Hamalainen <ccr@tnsp.org>
parents: 394
diff changeset
96 extern "C" {
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
97
75
653c9b0d1320 SIDPlay2 support "works" now. Borked problems with threads.
Matti Hamalainen <ccr@tnsp.org>
parents: 74
diff changeset
98
467
9dafc55c4270 Beginnings of vfs portability.
Matti Hamalainen <ccr@tnsp.org>
parents: 460
diff changeset
99 /* Return song information
9dafc55c4270 Beginnings of vfs portability.
Matti Hamalainen <ccr@tnsp.org>
parents: 460
diff changeset
100 */
692
0126579b6652 Actually compiles now with libsidplay2 COM API, but does not work yet.
Matti Hamalainen <ccr@tnsp.org>
parents: 660
diff changeset
101 #define TFUNCTION xs_sidplay2_getinfo
0126579b6652 Actually compiles now with libsidplay2 COM API, but does not work yet.
Matti Hamalainen <ccr@tnsp.org>
parents: 660
diff changeset
102 #define TFUNCTION2 xs_sidplay2_updateinfo
0126579b6652 Actually compiles now with libsidplay2 COM API, but does not work yet.
Matti Hamalainen <ccr@tnsp.org>
parents: 660
diff changeset
103 #define TTUNEINFO SidTuneInfo
0126579b6652 Actually compiles now with libsidplay2 COM API, but does not work yet.
Matti Hamalainen <ccr@tnsp.org>
parents: 660
diff changeset
104 #define TTUNE SidTune
756
8299288df6d2 Rename internal structures.
Matti Hamalainen <ccr@tnsp.org>
parents: 754
diff changeset
105 #define TENGINE XSSIDPlay2
467
9dafc55c4270 Beginnings of vfs portability.
Matti Hamalainen <ccr@tnsp.org>
parents: 460
diff changeset
106 #include "xs_sidplay.h"
9dafc55c4270 Beginnings of vfs portability.
Matti Hamalainen <ccr@tnsp.org>
parents: 460
diff changeset
107
9dafc55c4270 Beginnings of vfs portability.
Matti Hamalainen <ccr@tnsp.org>
parents: 460
diff changeset
108
270
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
109 /* 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
110 */
751
55eea3fa8868 Rename some structures.
Matti Hamalainen <ccr@tnsp.org>
parents: 748
diff changeset
111 gboolean xs_sidplay2_probe(XSFile *f)
364
421e4fc13bce More and more of indentation fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 359
diff changeset
112 {
702
b5b6b13a6d85 Renamed some types.
Matti Hamalainen <ccr@tnsp.org>
parents: 700
diff changeset
113 gchar tmpBuf[5];
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
114
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
115 if (!f) return FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
116
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
117 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
118 return FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
119
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
120 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
121 return TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
122 else
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
123 return FALSE;
364
421e4fc13bce More and more of indentation fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 359
diff changeset
124 }
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
125
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
126
270
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
127 /* Initialize SIDPlay2
75
653c9b0d1320 SIDPlay2 support "works" now. Borked problems with threads.
Matti Hamalainen <ccr@tnsp.org>
parents: 74
diff changeset
128 */
754
5557837fe5b6 Rename some more variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
129 gboolean xs_sidplay2_init(XSEngineState * state)
364
421e4fc13bce More and more of indentation fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 359
diff changeset
130 {
756
8299288df6d2 Rename internal structures.
Matti Hamalainen <ccr@tnsp.org>
parents: 754
diff changeset
131 XSSIDPlay2 *engine;
766
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
132 #ifndef HAVE_SIDPLAY2_FP
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
133 sid_filter_t tmpFilter;
722
5923dfff1fac Unify xs_sid*_filter_t into one.
Matti Hamalainen <ccr@tnsp.org>
parents: 710
diff changeset
134 xs_sid_filter_t *f;
766
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
135 gint i;
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
136 #endif
754
5557837fe5b6 Rename some more variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
137 assert(state);
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
138
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
139 /* Allocate internal structures */
756
8299288df6d2 Rename internal structures.
Matti Hamalainen <ccr@tnsp.org>
parents: 754
diff changeset
140 engine = new XSSIDPlay2();
754
5557837fe5b6 Rename some more variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
141 state->internal = engine;
770
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
142 if (!engine)
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
143 return FALSE;
75
653c9b0d1320 SIDPlay2 support "works" now. Borked problems with threads.
Matti Hamalainen <ccr@tnsp.org>
parents: 74
diff changeset
144
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
145 /* Get current configuration */
770
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
146 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
147
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
148 /* Configure channels and stuff */
766
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
149 switch (state->audioChannels)
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
150 {
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
151 case XS_CHN_AUTOPAN:
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
152 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
153 break;
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
154
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
155 case XS_CHN_STEREO:
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
156 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
157 break;
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
158
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
159 case XS_CHN_MONO:
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
160 default:
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
161 engine->config.playback = sid2_mono;
754
5557837fe5b6 Rename some more variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
162 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
163 break;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
164 }
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
165
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
166
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
167 /* Memory mode settings */
766
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
168 switch (xs_cfg.memoryMode)
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
169 {
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
170 case XS_MPU_BANK_SWITCHING:
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
171 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
172 break;
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
173
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
174 case XS_MPU_TRANSPARENT_ROM:
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
175 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
176 break;
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
177
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
178 case XS_MPU_PLAYSID_ENVIRONMENT:
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
179 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
180 break;
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
181
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
182 case XS_MPU_REAL:
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
183 default:
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
184 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
185 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
186 break;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
187 }
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
188
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
189
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
190 /* Audio parameters sanity checking and setup */
758
6c8c968595d9 Sanitize some #ifdefs.
Matti Hamalainen <ccr@tnsp.org>
parents: 757
diff changeset
191 #ifdef HAVE_SIDPLAY2_FP
754
5557837fe5b6 Rename some more variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
192 state->audioBitsPerSample = XS_RES_16BIT;
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
193 engine->config.samplingMethod = SID2_RESAMPLE_INTERPOLATE;
758
6c8c968595d9 Sanitize some #ifdefs.
Matti Hamalainen <ccr@tnsp.org>
parents: 757
diff changeset
194 #else
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
195 engine->config.precision = state->audioBitsPerSample;
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
196 #endif
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
197
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
198 engine->config.frequency = state->audioFrequency;
748
d9d769b5dbe2 Remove oversampling support.
Matti Hamalainen <ccr@tnsp.org>
parents: 744
diff changeset
199
74
8cb66a3f75f7 Testing
Matti Hamalainen <ccr@tnsp.org>
parents: 73
diff changeset
200
766
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
201 switch (state->audioBitsPerSample)
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
202 {
758
6c8c968595d9 Sanitize some #ifdefs.
Matti Hamalainen <ccr@tnsp.org>
parents: 757
diff changeset
203 #ifndef HAVE_SIDPLAY2_FP
757
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
204 case XS_RES_8BIT:
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
205 state->audioFormat = FMT_U8;
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
206 engine->config.sampleFormat = SID2_LITTLE_UNSIGNED;
758
6c8c968595d9 Sanitize some #ifdefs.
Matti Hamalainen <ccr@tnsp.org>
parents: 757
diff changeset
207 break;
74
8cb66a3f75f7 Testing
Matti Hamalainen <ccr@tnsp.org>
parents: 73
diff changeset
208 #endif
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 352
diff changeset
209
757
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
210 case XS_RES_16BIT:
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
211 default:
757
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
212 state->audioFormat = FMT_S16_NE;
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
213 #ifndef HAVE_SIDPLAY2_FP
766
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
214 switch (state->audioFormat)
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
215 {
757
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
216 case FMT_U16_LE:
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
217 engine->config.sampleFormat = SID2_LITTLE_UNSIGNED;
757
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
218 break;
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
219
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
220 case FMT_U16_BE:
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
221 engine->config.sampleFormat = SID2_BIG_UNSIGNED;
757
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
222 break;
127
ddb513bd2610 Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents: 103
diff changeset
223
757
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
224 case FMT_U16_NE:
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
225 engine->config.sampleFormat = SID2_NATIVE_UNSIGNED;
757
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
226 break;
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
227
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
228 case FMT_S16_LE:
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
229 engine->config.sampleFormat = SID2_LITTLE_SIGNED;
757
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
230 break;
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
231
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
232 case FMT_S16_BE:
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
233 engine->config.sampleFormat = SID2_BIG_SIGNED;
757
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
234 break;
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
235
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
236 default:
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
237 engine->config.sampleFormat = SID2_NATIVE_SIGNED;
757
9c135d421676 Clean up endianess handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 756
diff changeset
238 break;
766
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
239 }
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
240 #endif
766
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
241 break;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
242 }
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
243
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
244 #if !defined(HAVE_SIDPLAY2_FP)
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
245 /* Convert filter */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
246 f = &(xs_cfg.sid2Filter);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
247 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
248 if (f->npoints > XS_SIDPLAY2_NFPOINTS)
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
249 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
250 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
251 f->npoints, XS_SIDPLAY2_NFPOINTS);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
252 f->npoints = XS_SIDPLAY2_NFPOINTS;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
253 }
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
254
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
255 tmpFilter.points = f->npoints;
766
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
256 for (i = 0; i < f->npoints; i++)
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
257 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
258 tmpFilter.cutoff[i][0] = f->points[i].x;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
259 tmpFilter.cutoff[i][1] = f->points[i].y;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
260 }
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
261 #endif
352
2b4ca75b999f Cleanups
Matti Hamalainen <ccr@tnsp.org>
parents: 324
diff changeset
262
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
263 /* Initialize builder object */
770
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
264 XSDEBUG("init builder #%i, maxsids=%i\n", xs_cfg.sid2Builder, (engine->emu.info()).maxsids);
761
641b7693fecc Cosmetic cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 758
diff changeset
265
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
266 switch (xs_cfg.sid2Builder)
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
267 {
364
421e4fc13bce More and more of indentation fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 359
diff changeset
268 #ifdef HAVE_RESID_BUILDER
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
269 case XS_BLD_RESID:
773
45108b3d88db Add resid-fp and resid backend to sidplay2fp support.
Matti Hamalainen <ccr@tnsp.org>
parents: 770
diff changeset
270 {
45108b3d88db Add resid-fp and resid backend to sidplay2fp support.
Matti Hamalainen <ccr@tnsp.org>
parents: 770
diff changeset
271 ReSIDBuilder *rs = new ReSIDBuilder("ReSID builder");
45108b3d88db Add resid-fp and resid backend to sidplay2fp support.
Matti Hamalainen <ccr@tnsp.org>
parents: 770
diff changeset
272 if (rs)
45108b3d88db Add resid-fp and resid backend to sidplay2fp support.
Matti Hamalainen <ccr@tnsp.org>
parents: 770
diff changeset
273 {
45108b3d88db Add resid-fp and resid backend to sidplay2fp support.
Matti Hamalainen <ccr@tnsp.org>
parents: 770
diff changeset
274 engine->config.sidEmulation = rs;
45108b3d88db Add resid-fp and resid backend to sidplay2fp support.
Matti Hamalainen <ccr@tnsp.org>
parents: 770
diff changeset
275 if (!*rs) return FALSE;
45108b3d88db Add resid-fp and resid backend to sidplay2fp support.
Matti Hamalainen <ccr@tnsp.org>
parents: 770
diff changeset
276 rs->create((engine->emu.info()).maxsids);
45108b3d88db Add resid-fp and resid backend to sidplay2fp support.
Matti Hamalainen <ccr@tnsp.org>
parents: 770
diff changeset
277 if (!*rs) return FALSE;
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
278 #ifdef HAVE_SIDPLAY2_FP
773
45108b3d88db Add resid-fp and resid backend to sidplay2fp support.
Matti Hamalainen <ccr@tnsp.org>
parents: 770
diff changeset
279 rs->bias(0.0f);
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
280 #endif
773
45108b3d88db Add resid-fp and resid backend to sidplay2fp support.
Matti Hamalainen <ccr@tnsp.org>
parents: 770
diff changeset
281 }
45108b3d88db Add resid-fp and resid backend to sidplay2fp support.
Matti Hamalainen <ccr@tnsp.org>
parents: 770
diff changeset
282 }
45108b3d88db Add resid-fp and resid backend to sidplay2fp support.
Matti Hamalainen <ccr@tnsp.org>
parents: 770
diff changeset
283 break;
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
284 #endif
773
45108b3d88db Add resid-fp and resid backend to sidplay2fp support.
Matti Hamalainen <ccr@tnsp.org>
parents: 770
diff changeset
285
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
286 #ifdef HAVE_RESID_FP_BUILDER
773
45108b3d88db Add resid-fp and resid backend to sidplay2fp support.
Matti Hamalainen <ccr@tnsp.org>
parents: 770
diff changeset
287 case XS_BLD_RESID_FP:
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
288 {
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
289 ReSIDfpBuilder *rs = new ReSIDfpBuilder("ReSID builder FP!");
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
290 if (rs)
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
291 {
770
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
292 engine->config.sidEmulation = rs;
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
293 if (!*rs) return FALSE;
770
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
294 rs->create((engine->emu.info()).maxsids);
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
295 if (!*rs) return FALSE;
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 352
diff changeset
296
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
297 rs->filter6581Curve(0.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
298 rs->filter8580Curve(0.0);
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
299 }
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
300 }
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
301 break;
321
45ad9f7c1628 Improved compatibility, some fixes in reSID emulation initialization.
Matti Hamalainen <ccr@tnsp.org>
parents: 270
diff changeset
302 #endif
744
c7fa50576c70 Initial implementation for supporting libSIDPlay2-FP (or libSIDPlay-FP, as
Matti Hamalainen <ccr@tnsp.org>
parents: 723
diff changeset
303
321
45ad9f7c1628 Improved compatibility, some fixes in reSID emulation initialization.
Matti Hamalainen <ccr@tnsp.org>
parents: 270
diff changeset
304 #ifdef HAVE_HARDSID_BUILDER
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
305 case XS_BLD_HARDSID:
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
306 {
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
307 HardSIDBuilder *hs = new HardSIDBuilder("HardSID builder (FP)");
770
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
308 engine->config.sidEmulation = (sidbuilder *) hs;
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
309 if (hs)
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
310 {
770
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
311 hs->create((engine->emu.info()).maxsids);
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
312 if (!*hs)
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
313 {
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
314 xs_error("hardSID->create() failed.\n");
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
315 return FALSE;
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
316 }
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
317 }
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
318 }
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
319 break;
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
320 #endif
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
321
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
322 default:
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
323 xs_error("[SIDPlay2] Invalid or unsupported builder selected.\n");
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
324 break;
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
325 }
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 352
diff changeset
326
770
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
327 if (!engine->config.sidEmulation)
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
328 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
329 xs_error("[SIDPlay2] Could not initialize SIDBuilder object.\n");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
330 return FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
331 }
321
45ad9f7c1628 Improved compatibility, some fixes in reSID emulation initialization.
Matti Hamalainen <ccr@tnsp.org>
parents: 270
diff changeset
332
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
333 #ifdef HAVE_SIDPLAY2_FP
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
334 // Setup filter
770
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
335 engine->config.sidEmulation->filter(xs_cfg.emulateFilters);
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
336 if (!*(engine->config.sidEmulation))
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
337 {
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
338 xs_error("builder->filter(%d) failed.\n", xs_cfg.emulateFilters);
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
339 return FALSE;
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
340 }
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
341 #endif
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
342
770
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
343 XSDEBUG("%s\n", engine->config.sidEmulation->credits());
321
45ad9f7c1628 Improved compatibility, some fixes in reSID emulation initialization.
Matti Hamalainen <ccr@tnsp.org>
parents: 270
diff changeset
344
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
345 /* Clockspeed settings */
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
346 switch (xs_cfg.clockSpeed)
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
347 {
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
348 case XS_CLOCK_NTSC:
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
349 engine->config.clockDefault = SID2_CLOCK_NTSC;
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
350 break;
366
29c4484f1de2 Fixes in emulator engine configuration, make 'forceModel' option work.
Matti Hamalainen <ccr@tnsp.org>
parents: 364
diff changeset
351
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
352 default:
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
353 case XS_CLOCK_PAL:
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
354 engine->config.clockDefault = SID2_CLOCK_PAL;
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
355 xs_cfg.clockSpeed = XS_CLOCK_PAL;
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
356 break;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
357 }
366
29c4484f1de2 Fixes in emulator engine configuration, make 'forceModel' option work.
Matti Hamalainen <ccr@tnsp.org>
parents: 364
diff changeset
358
29c4484f1de2 Fixes in emulator engine configuration, make 'forceModel' option work.
Matti Hamalainen <ccr@tnsp.org>
parents: 364
diff changeset
359
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
360 /* Configure rest of the emulation */
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
361 if (xs_cfg.forceSpeed)
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
362 {
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
363 engine->config.clockForced = true;
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
364 engine->config.clockSpeed = engine->config.clockDefault;
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
365 }
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
366 else
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
367 {
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
368 engine->config.clockForced = false;
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
369 engine->config.clockSpeed = SID2_CLOCK_CORRECT;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
370 }
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
371
710
a6283cf95c99 Updated to work with latest distortion patched libSIDPlay2+reSID from Antti
Matti Hamalainen <ccr@tnsp.org>
parents: 702
diff changeset
372
761
641b7693fecc Cosmetic cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 758
diff changeset
373 #ifndef HAVE_SIDPLAY2_FP
641b7693fecc Cosmetic cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 758
diff changeset
374 if (xs_cfg.sid2OptLevel < 0 || xs_cfg.sid2OptLevel > SID2_MAX_OPTIMISATION)
641b7693fecc Cosmetic cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 758
diff changeset
375 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
376 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
377 xs_cfg.sid2OptLevel, SID2_DEFAULT_OPTIMISATION);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
378
761
641b7693fecc Cosmetic cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 758
diff changeset
379 xs_cfg.sid2OptLevel = SID2_DEFAULT_OPTIMISATION;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
380 }
766
19e2745f75d8 Cosmetics and leftover cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 765
diff changeset
381 engine->config.optimisation = xs_cfg.sid2OptLevel;
710
a6283cf95c99 Updated to work with latest distortion patched libSIDPlay2+reSID from Antti
Matti Hamalainen <ccr@tnsp.org>
parents: 702
diff changeset
382 #endif
366
29c4484f1de2 Fixes in emulator engine configuration, make 'forceModel' option work.
Matti Hamalainen <ccr@tnsp.org>
parents: 364
diff changeset
383
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
384 engine->config.sidDefault = xs_cfg.mos8580 ? SID2_MOS8580 : SID2_MOS6581;
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
385 engine->config.sidModel = xs_cfg.forceModel ? engine->config.sidDefault : SID2_MODEL_CORRECT;
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
386 engine->config.sidSamples = TRUE;
321
45ad9f7c1628 Improved compatibility, some fixes in reSID emulation initialization.
Matti Hamalainen <ccr@tnsp.org>
parents: 270
diff changeset
387
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
388 return TRUE;
364
421e4fc13bce More and more of indentation fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 359
diff changeset
389 }
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
390
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
391
270
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
392 /* Close SIDPlay2 engine
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
393 */
754
5557837fe5b6 Rename some more variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
394 void xs_sidplay2_close(XSEngineState * state)
364
421e4fc13bce More and more of indentation fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 359
diff changeset
395 {
769
120d6f247f1b Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 768
diff changeset
396 XSSIDPlay2 *engine = (XSSIDPlay2 *) state->internal;
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 352
diff changeset
397
775
0e9f2894b0a9 Proper order of freeing/deletion.
Matti Hamalainen <ccr@tnsp.org>
parents: 774
diff changeset
398 xs_sidplay2_delete(state);
0e9f2894b0a9 Proper order of freeing/deletion.
Matti Hamalainen <ccr@tnsp.org>
parents: 774
diff changeset
399
770
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
400 if (engine)
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
401 {
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
402 delete engine;
775
0e9f2894b0a9 Proper order of freeing/deletion.
Matti Hamalainen <ccr@tnsp.org>
parents: 774
diff changeset
403 engine = NULL;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
404 }
270
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
405
754
5557837fe5b6 Rename some more variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
406 state->internal = NULL;
364
421e4fc13bce More and more of indentation fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 359
diff changeset
407 }
270
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
408
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
409
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
410 /* Initialize current song and sub-tune
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
411 */
754
5557837fe5b6 Rename some more variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
412 gboolean xs_sidplay2_initsong(XSEngineState * state)
364
421e4fc13bce More and more of indentation fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 359
diff changeset
413 {
768
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
414 XSSIDPlay2 *engine = (XSSIDPlay2 *) state->internal;
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 352
diff changeset
415
768
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
416 if (!engine)
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
417 return FALSE;
270
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
418
769
120d6f247f1b Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 768
diff changeset
419 if (!engine->tune->selectSong(state->currSong))
120d6f247f1b Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 768
diff changeset
420 {
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
421 xs_error("[SIDPlay2] tune->selectSong() failed\n");
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
422 return FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
423 }
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 352
diff changeset
424
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
425 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
426 {
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
427 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
428 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
429 }
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
430
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
431 engine->tuneLoaded = TRUE;
770
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
432 if (engine->emu.load(engine->tune) < 0)
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
433 {
72e58ecb1a2c Still not working. Urgh.
Matti Hamalainen <ccr@tnsp.org>
parents: 769
diff changeset
434 xs_error("[SIDPlay2] emu.load() failed\n");
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
435 return FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
436 }
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
437
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
438 return TRUE;
364
421e4fc13bce More and more of indentation fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 359
diff changeset
439 }
270
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
440
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
441
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
442 /* 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
443 */
754
5557837fe5b6 Rename some more variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
444 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
445 {
768
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
446 XSSIDPlay2 *engine = (XSSIDPlay2 *) state->internal;
270
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
447
768
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
448 if (!engine)
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
449 return 0;
270
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
450
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
451 #if 1
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
452 #ifdef HAVE_SIDPLAY2_FP
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
453 int nsamples = audioBufSize / sizeof(short);
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
454 return engine->emu.play((short *) audioBuffer, nsamples) * sizeof(short);
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
455 #else
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
456 return engine->emu.play(audioBuffer, audioBufSize);
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
457 #endif
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
458 #else
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
459 int nsamples = audioBufSize / sizeof(short);
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
460 fprintf(stderr, "%p, %d -> %d\n", audioBuffer, audioBufSize, nsamples);
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
461 return 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
462 #endif
364
421e4fc13bce More and more of indentation fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 359
diff changeset
463 }
270
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
464
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
465
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
466 /* Load a given SID-tune file
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
467 */
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
468 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
469 {
768
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
470 XSSIDPlay2 *engine = (XSSIDPlay2 *) state->internal;
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
471
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
472 if (!engine)
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
473 return FALSE;
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
474
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
475 if (!(engine->tune = new SidTune(filename)))
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
476 return FALSE;
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
477
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
478 engine->tuneLoaded = FALSE;
270
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
479
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
480 return TRUE;
364
421e4fc13bce More and more of indentation fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 359
diff changeset
481 }
270
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
482
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
483
583f5651abff Cleanups, moved engine configuration to initialization function.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
484 /* Delete INTERNAL information
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
485 */
754
5557837fe5b6 Rename some more variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
486 void xs_sidplay2_delete(XSEngineState * state)
364
421e4fc13bce More and more of indentation fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 359
diff changeset
487 {
768
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
488 XSSIDPlay2 *engine = (XSSIDPlay2 *) state->internal;
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
489
768
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
490 if (engine)
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
491 {
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
492 if (engine->tuneLoaded)
768
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
493 {
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
494 engine->emu.load(0);
768
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
495 }
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
496
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
497 delete engine->tune;
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
498 engine->tune = NULL;
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
499 engine->tuneLoaded = FALSE;
765
1294df516d2e Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 761
diff changeset
500 }
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
501 }
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
502
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
503
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
504 /* 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
505 */
754
5557837fe5b6 Rename some more variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
506 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
507 {
779
8fb51f9ef44e Fix some HardSID builder related things.
Matti Hamalainen <ccr@tnsp.org>
parents: 776
diff changeset
508 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
509
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
510 #ifdef HAVE_HARDSID_BUILDER
768
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
511 if (xs_cfg.sid2Builder == XS_BLD_HARDSID)
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
512 {
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
513 #ifdef HSID_SID2_COM
779
8fb51f9ef44e Fix some HardSID builder related things.
Matti Hamalainen <ccr@tnsp.org>
parents: 776
diff changeset
514 IfPtr<HardSIDBuilder> hs(engine->config.sidEmulation);
768
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
515 if (hs)
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
516 hs->flush();
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
517 #else
779
8fb51f9ef44e Fix some HardSID builder related things.
Matti Hamalainen <ccr@tnsp.org>
parents: 776
diff changeset
518 ((HardSIDBuilder *) engine->config.sidEmulation)->flush();
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
519 #endif
768
f145ba458acd Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 766
diff changeset
520 }
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
521 #endif
364
421e4fc13bce More and more of indentation fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 359
diff changeset
522 }
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
523
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
524
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
525 } /* extern "C" */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 657
diff changeset
526 #endif /* HAVE_SIDPLAY2 */