Mercurial > hg > xmms-sid

comparison src/xs_sidplay1.cpp @ 961:be2a8436461a dev-0_8_99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add display of second SID chip to titles, and also new custom format tokens %1 and %2 for first and second SID respectively. The old "%m" now expands to one or both SID models, depending how many are in use.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 20 Nov 2012 23:00:33 +0200
parents a5b118c853f5
children
comparison
equal deleted inserted replaced
960:5711abf1ff39 961:be2a8436461a
393 res = xs_tuneinfo_new(filename, 393 res = xs_tuneinfo_new(filename,
394 info.songs, info.startSong, 394 info.songs, info.startSong,
395 info.infoString[0], info.infoString[1], info.infoString[2], 395 info.infoString[0], info.infoString[1], info.infoString[2],
396 info.loadAddr, info.initAddr, info.playAddr, 396 info.loadAddr, info.initAddr, info.playAddr,
397 info.dataFileLen, info.formatString, 397 info.dataFileLen, info.formatString,
398 info.sidModel 398 info.sidModel, XS_SIDMODEL_UNKNOWN
399 ); 399 );
400 400
401 error: 401 error:
402 if (tune) 402 if (tune)
403 delete tune; 403 delete tune;
426 engine->tune->getInfo(info); 426 engine->tune->getInfo(info);
427 427
428 /* NOTICE! Here we assume that libSIDPlay[12] headers define 428 /* NOTICE! Here we assume that libSIDPlay[12] headers define
429 * SIDTUNE_SIDMODEL_* similarly to our enums in xs_config.h ... 429 * SIDTUNE_SIDMODEL_* similarly to our enums in xs_config.h ...
430 */ 430 */
431 state->tuneInfo->sidModel = info.sidModel; 431 state->tuneInfo->sidModel1 = info.sidModel;
432 state->tuneInfo->sidModel2 = XS_SIDMODEL_UNKNOWN;
432 433
433 if (state->currSong > 0 && state->currSong <= state->tuneInfo->nsubTunes) 434 if (state->currSong > 0 && state->currSong <= state->tuneInfo->nsubTunes)
434 { 435 {
435 gint tmpSpeed = info.clockSpeed; 436 gint tmpSpeed = info.clockSpeed;
436 switch (info.clockSpeed) 437 switch (info.clockSpeed)