Mercurial > hg > xmms-sid

comparison src/xs_sidplay2.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 828dce1195e6
children ede5374e9294
comparison
equal deleted inserted replaced
960:5711abf1ff39 961:be2a8436461a
452 res = xs_tuneinfo_new(filename, 452 res = xs_tuneinfo_new(filename,
453 info.songs, info.startSong, 453 info.songs, info.startSong,
454 info.infoString[0], info.infoString[1], info.infoString[2], 454 info.infoString[0], info.infoString[1], info.infoString[2],
455 info.loadAddr, info.initAddr, info.playAddr, 455 info.loadAddr, info.initAddr, info.playAddr,
456 info.dataFileLen, info.formatString, 456 info.dataFileLen, info.formatString,
457 info.sidModel 457 info.sidModel, XS_SIDMODEL_UNKNOWN
458 ); 458 );
459 459
460 error: 460 error:
461 if (tune) 461 if (tune)
462 delete tune; 462 delete tune;
485 engine->tune.getInfo(info); 485 engine->tune.getInfo(info);
486 486
487 /* NOTICE! Here we assume that libSIDPlay[12] headers define 487 /* NOTICE! Here we assume that libSIDPlay[12] headers define
488 * SIDTUNE_SIDMODEL_* similarly to our enums in xs_config.h ... 488 * SIDTUNE_SIDMODEL_* similarly to our enums in xs_config.h ...
489 */ 489 */
490 state->tuneInfo->sidModel = info.sidModel; 490 state->tuneInfo->sidModel1 = info.sidModel;
491 state->tuneInfo->sidModel2 = XS_SIDMODEL_UNKNOWN;
491 492
492 if (state->currSong > 0 && state->currSong <= state->tuneInfo->nsubTunes) 493 if (state->currSong > 0 && state->currSong <= state->tuneInfo->nsubTunes)
493 { 494 {
494 gint tmpSpeed = info.clockSpeed; 495 gint tmpSpeed = info.clockSpeed;
495 switch (info.clockSpeed) 496 switch (info.clockSpeed)