Mercurial > hg > xmms-sid

comparison src/xs_sidplay2.cc @ 694:fd81a16434ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move builder header inclusions.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 22 May 2008 10:54:25 +0300
parents 56514f717cc3
children ca594ca1056f
comparison
equal deleted inserted replaced
693:56514f717cc3 694:fd81a16434ed
31 31
32 #include <sidplay/sidplay2.h> 32 #include <sidplay/sidplay2.h>
33 #ifdef HAVE_SIDPLAY2_COMI 33 #ifdef HAVE_SIDPLAY2_COMI
34 # include <sidplay/sidlazyiptr.h> 34 # include <sidplay/sidlazyiptr.h>
35 #endif 35 #endif
36 #ifdef HAVE_RESID_BUILDER 36
37 # include <sidplay/builders/resid.h>
38 #endif
39 #ifdef HAVE_HARDSID_BUILDER
40 # include <sidplay/builders/hardsid.h>
41 #endif
42 37
43 typedef struct { 38 typedef struct {
44 #ifdef HAVE_SIDPLAY2_COMI 39 #ifdef HAVE_SIDPLAY2_COMI
45 SidIPtr<ISidplay2> currEng; 40 SidIPtr<ISidplay2> currEng;
46 SidLazyIPtr<ISidUnknown> currBuilder; 41 SidLazyIPtr<ISidUnknown> currBuilder;
51 sid2_config_t currConfig; 46 sid2_config_t currConfig;
52 SidTune *currTune; 47 SidTune *currTune;
53 guint8 *buf; 48 guint8 *buf;
54 size_t bufSize; 49 size_t bufSize;
55 } xs_sidplay2_t; 50 } xs_sidplay2_t;
51
52
53 #ifdef HAVE_RESID_BUILDER
54 # include <sidplay/builders/resid.h>
55 #endif
56 #ifdef HAVE_HARDSID_BUILDER
57 # include <sidplay/builders/hardsid.h>
58 #endif
56 59
57 60
58 /* We need to 'export' all this pseudo-C++ crap */ 61 /* We need to 'export' all this pseudo-C++ crap */
59 extern "C" { 62 extern "C" {
60 63