1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
--- stsoundlib/YmMusic.cpp.orig 2016-07-26 16:04:42 UTC
+++ stsoundlib/YmMusic.cpp
@@ -167,12 +167,12 @@ ymbool CYmMusic::isSeekable(void)
return getAttrib()&A_TIMECONTROL;
}
-void CYmMusic::setLastError(char *pError)
+void CYmMusic::setLastError(const char *pError)
{
pLastError = pError;
}
-char *CYmMusic::getLastError(void)
+const char *CYmMusic::getLastError(void)
{
return pLastError;
}
@@ -364,11 +364,14 @@ void CYmMusic::player(void)
if (ptr[12])
{
- sampleFrq = (MFP_CLOCK / ptr[12]);
- ymChip.drumStart( 2, // Voice C
- sampleAdress[sampleNum],
- sampleLen[sampleNum],
- sampleFrq);
+ if (sampleNum < MAX_DIGIDRUM)
+ {
+ sampleFrq = (MFP_CLOCK / ptr[12]);
+ ymChip.drumStart( 2, // Voice C
+ sampleAdress[sampleNum],
+ sampleLen[sampleNum],
+ sampleFrq);
+ }
}
}
}
@@ -612,7 +615,6 @@ ymTrackerLine_t *pLine;
for (i=0;i<nbVoice;i++)
{
ymint n;
- ymint freq =
pVoice[i].sampleFreq = ((ymint)pLine->freqHigh<<8) | pLine->freqLow;
if (pVoice[i].sampleFreq)
{
@@ -677,7 +679,7 @@ double step;
#ifdef _LINEAR_OVRS
ymint vb = va;
if (samplePos < (sampleEnd-(1<<YMTPREC)))
- ymint vb = pVolumeTab[pSample[(samplePos>>YMTPREC)+1]];
+ vb = pVolumeTab[pSample[(samplePos>>YMTPREC)+1]];
ymint frac = samplePos & ((1<<YMTPREC)-1);
va += (((vb-va)*frac)>>YMTPREC);
#endif
|
