Mercurial > hg > xmms-sid

comparison src/xs_sidplayfp.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 32435407eb9c
children f165db0e8ab8
comparison
equal deleted inserted replaced
960:5711abf1ff39 961:be2a8436461a
479 res = xs_tuneinfo_new(filename, 479 res = xs_tuneinfo_new(filename,
480 info->songs(), info->startSong(), 480 info->songs(), info->startSong(),
481 info->infoString(0), info->infoString(1), info->infoString(2), 481 info->infoString(0), info->infoString(1), info->infoString(2),
482 info->loadAddr(), info->initAddr(), info->playAddr(), 482 info->loadAddr(), info->initAddr(), info->playAddr(),
483 info->dataFileLen(), info->formatString(), 483 info->dataFileLen(), info->formatString(),
484 info->sidModel1() 484 info->sidModel1(), info->sidModel2()
485 ); 485 );
486 #else 486 #else
487 const SidTuneInfo info = tune->getInfo(); 487 const SidTuneInfo info = tune->getInfo();
488 488
489 res = xs_tuneinfo_new(filename, 489 res = xs_tuneinfo_new(filename,
490 info.songs, info.startSong, 490 info.songs, info.startSong,
491 info.infoString[0], info.infoString[1], info.infoString[2], 491 info.infoString[0], info.infoString[1], info.infoString[2],
492 info.loadAddr, info.initAddr, info.playAddr, 492 info.loadAddr, info.initAddr, info.playAddr,
493 info.dataFileLen, info.formatString, 493 info.dataFileLen, info.formatString,
494 info.sidModel1 494 info.sidModel1, info.sidModel2
495 ); 495 );
496 #endif 496 #endif
497 } 497 }
498 498
499 error: 499 error:
521 if (!engine->tune.getStatus()) 521 if (!engine->tune.getStatus())
522 return FALSE; 522 return FALSE;
523 523
524 const SidTuneInfo *info = engine->tune.getInfo(); 524 const SidTuneInfo *info = engine->tune.getInfo();
525 525
526 state->tuneInfo->sidModel = info->sidModel1(); 526 state->tuneInfo->sidModel1 = info->sidModel1();
527 state->tuneInfo->sidModel2 = info->sidModel2();
527 528
528 if (state->currSong > 0 && state->currSong <= state->tuneInfo->nsubTunes) 529 if (state->currSong > 0 && state->currSong <= state->tuneInfo->nsubTunes)
529 { 530 {
530 gint tmpSpeed = info->clockSpeed(); 531 gint tmpSpeed = info->clockSpeed();
531 switch (info->clockSpeed()) 532 switch (info->clockSpeed())