Mercurial > hg > xmms-sid

diff 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
line wrap: on
line diff
--- a/src/xs_sidplayfp.cpp	Tue Nov 20 22:39:27 2012 +0200
+++ b/src/xs_sidplayfp.cpp	Tue Nov 20 23:00:33 2012 +0200
@@ -481,7 +481,7 @@
         info->infoString(0), info->infoString(1), info->infoString(2),
         info->loadAddr(), info->initAddr(), info->playAddr(),
         info->dataFileLen(), info->formatString(),
-        info->sidModel1()
+        info->sidModel1(), info->sidModel2()
         );
 #else
     const SidTuneInfo info = tune->getInfo();
@@ -491,7 +491,7 @@
         info.infoString[0], info.infoString[1], info.infoString[2],
         info.loadAddr, info.initAddr, info.playAddr,
         info.dataFileLen, info.formatString,
-        info.sidModel1
+        info.sidModel1, info.sidModel2
         );
 #endif
     }
@@ -523,7 +523,8 @@
 
     const SidTuneInfo *info = engine->tune.getInfo();
 
-    state->tuneInfo->sidModel = info->sidModel1();
+    state->tuneInfo->sidModel1 = info->sidModel1();
+    state->tuneInfo->sidModel2 = info->sidModel2();
 
     if (state->currSong > 0 && state->currSong <= state->tuneInfo->nsubTunes)
     {