Mercurial > hg > xmms-sid
comparison src/xs_sidplay.h @ 95:4e929bb71057
Fixes and improvements
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sat, 10 Jan 2004 22:53:04 +0000 |
parents | 63cf9b2ddadf |
children | 426e443240b8 |
comparison
equal
deleted
inserted
replaced
94:086681f70910 | 95:4e929bb71057 |
---|---|
137 { | 137 { |
138 t_xs_sldb_node *tuneLen = NULL; | 138 t_xs_sldb_node *tuneLen = NULL; |
139 t_xs_tune *pResult; | 139 t_xs_tune *pResult; |
140 TTUNEINFO tuneInfo; | 140 TTUNEINFO tuneInfo; |
141 TTUNE *testTune; | 141 TTUNE *testTune; |
142 gboolean haveInfo = false; | 142 gboolean haveInfo = FALSE; |
143 gint i; | 143 gint i; |
144 | 144 |
145 /* Check if the tune exists and is readable */ | 145 /* Check if the tune exists and is readable */ |
146 if ((testTune = new TTUNE(pcFilename)) == NULL) | 146 if ((testTune = new TTUNE(pcFilename)) == NULL) |
147 return NULL; | 147 return NULL; |
151 delete testTune; | 151 delete testTune; |
152 return NULL; | 152 return NULL; |
153 } | 153 } |
154 | 154 |
155 /* Get general tune information */ | 155 /* Get general tune information */ |
156 #ifdef _XS_SIDPLAY1_H | |
156 haveInfo = testTune->getInfo(tuneInfo); | 157 haveInfo = testTune->getInfo(tuneInfo); |
158 #endif | |
159 #ifdef _XS_SIDPLAY2_H | |
160 tuneInfo = testTune->getInfo(); | |
161 haveInfo = TRUE; | |
162 #endif | |
163 | |
157 | 164 |
158 /* Get length information (NOTE: Do not free this!) */ | 165 /* Get length information (NOTE: Do not free this!) */ |
159 tuneLen = xs_songlen_get(pcFilename); | 166 tuneLen = xs_songlen_get(pcFilename); |
160 | 167 |
161 /* Allocate tuneinfo structure */ | 168 /* Allocate tuneinfo structure */ |
185 delete testTune; | 192 delete testTune; |
186 | 193 |
187 return pResult; | 194 return pResult; |
188 } | 195 } |
189 | 196 |
190 | 197 /* Undefine these */ |
198 #undef TFUNCTION1 | |
199 #undef TFUNCTION2 | |
200 #undef TTUNEINFO | |
201 #undef TTUNE |