Mercurial > hg > xmms-sid

comparison src/xs_sidplay.h @ 838:ae1f6418d093

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
libSIDPlay2-FP backend interface is now in a separate module. Configuration related things still pending.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 08 Nov 2012 21:24:38 +0200
parents 778531e968ed
children 2663b1ac9ce6
comparison
equal deleted inserted replaced
837:5b3e2116408f 838:ae1f6418d093
65 res = xs_tuneinfo_new(filename, 65 res = xs_tuneinfo_new(filename,
66 info.songs, info.startSong, 66 info.songs, info.startSong,
67 info.infoString[0], info.infoString[1], info.infoString[2], 67 info.infoString[0], info.infoString[1], info.infoString[2],
68 info.loadAddr, info.initAddr, info.playAddr, 68 info.loadAddr, info.initAddr, info.playAddr,
69 info.dataFileLen, info.formatString, 69 info.dataFileLen, info.formatString,
70 #if defined(XS_SIDPLAY2_H) && defined(HAVE_SIDPLAY2_FP) 70 #if defined(XS_SIDPLAYFP_H) && defined(HAVE_SIDPLAYFP)
71 info.sidModel1 71 info.sidModel1
72 #else 72 #else
73 info.sidModel 73 info.sidModel
74 #endif 74 #endif
75 ); 75 );
101 engine = (TENGINE *) state->internal; 101 engine = (TENGINE *) state->internal;
102 if (!(engine->tune)) 102 if (!(engine->tune))
103 return FALSE; 103 return FALSE;
104 104
105 /* Get currently playing tune information */ 105 /* Get currently playing tune information */
106 #ifdef XS_SIDPLAY1_H 106 #if defined(XS_SIDPLAY1_H)
107 engine->tune->getInfo(info); 107 engine->tune->getInfo(info);
108 #endif 108 #elif defined(XS_SIDPLAY2_H)
109 #ifdef XS_SIDPLAY2_H 109 info = engine->tune.getInfo();
110 #elif defined(XS_SIDPLAYFP_H)
110 info = engine->tune.getInfo(); 111 info = engine->tune.getInfo();
111 #endif 112 #endif
112 113
113 /* NOTICE! Here we assume that libSIDPlay[12] headers define 114 /* NOTICE! Here we assume that libSIDPlay[12] headers define
114 * SIDTUNE_SIDMODEL_* similarly to our enums in xs_config.h ... 115 * SIDTUNE_SIDMODEL_* similarly to our enums in xs_config.h ...
115 */ 116 */
116 #if defined(XS_SIDPLAY2_H) && defined(HAVE_SIDPLAY2_FP) 117 #if defined(XS_SIDPLAYFP_H) && defined(HAVE_SIDPLAYFP)
117 state->tuneInfo->sidModel = info.sidModel1; 118 state->tuneInfo->sidModel = info.sidModel1;
118 #else 119 #else
119 state->tuneInfo->sidModel = info.sidModel; 120 state->tuneInfo->sidModel = info.sidModel;
120 #endif 121 #endif
121 122