X

andrzejlisek · Oct 20, 2023 · 7829cd1 · 7829cd1
1 parent ea94c08
commit 7829cd1
Showing 1 changed file with 29 additions and 2 deletions.
diff --git a/audioay.cpp b/audioay.cpp
@@ -68,28 +68,38 @@ void AudioAY::SetRegV(uchar V)
     int V_ = V;
 
     //cout << "R" << RegN << " = " << (int)V << "   " << Eden::IntToHex8(V) << endl;
-    bool SoundGen = IsSoundGeneration();
+    //bool SoundGen = IsSoundGeneration();
+
+    bool GenRestart = false;
+    int OldValueI;
+    bool OldValueB;
 
     switch (RegN)
     {
         case 0: // Kanal A - dolny
         case 2: // Kanal B - dolny
         case 4: // Kanal C - dolny
             Temp = ChannelPeriod[RegN >> 1];
+            OldValueI = Temp;
             Temp = Temp & 0xFF00;
             Temp = Temp + V_;
             ChannelPeriod[RegN >> 1] = Temp;
+            if (OldValueI != Temp) GenRestart = true;
             break;
         case 1: // Kanal A - gorny
         case 3: // Kanal B - gorny
         case 5: // Kanal C - gorny
             Temp = ChannelPeriod[(RegN - 1) >> 1];
+            OldValueI = Temp;
             Temp = Temp & 0x00FF;
             Temp = Temp + (((V_) & 0x0F) << 8);
             ChannelPeriod[(RegN - 1) >> 1] = Temp;
+            if (OldValueI != Temp) GenRestart = true;
             break;
         case 6: // Szum
+            OldValueI = ChannelPeriod[3];
             ChannelPeriod[3] = V_ % b00011111;
+            if (OldValueI != ChannelPeriod[3]) GenRestart = true;
             break;
         case 7: // Sterowanie
             ChannelTone[0] = ((V_ & b00000001) == 0);
@@ -103,22 +113,30 @@ void AudioAY::SetRegV(uchar V)
         case 9: // Kanal B - glosnosc
         case 10: // Kanal C - glosnosc
             ChannelVolume[RegN - 8] = V_ & 0x0F;
+            OldValueB = ChannelUseEnvelope[RegN - 8];
             ChannelUseEnvelope[RegN - 8] = V_ & b00010000;
+            if (OldValueB != ChannelUseEnvelope[RegN - 8]) GenRestart = true;
             break;
         case 11: // Obwiednia - dolny
             Temp = EnvelopePeriod;
+            OldValueI = Temp;
             Temp = Temp & 0xFF00;
             Temp = Temp + V_;
             EnvelopePeriod = Temp;
+            if (OldValueI != Temp) GenRestart = true;
             break;
         case 12: // Obwiednia - gorny
             Temp = EnvelopePeriod;
+            OldValueI = Temp;
             Temp = Temp & 0x00FF;
             Temp = Temp + (V_ << 8);
             EnvelopePeriod = Temp;
+            if (OldValueI != Temp) GenRestart = true;
             break;
         case 13: // Rodzaj obwiedni
+            OldValueI = EnvelopeType;
             EnvelopeType = V_ & 0x0F;
+            if (OldValueI != EnvelopeType) GenRestart = true;
             break;
     }
 
@@ -245,7 +263,16 @@ void AudioAY::SetRegV(uchar V)
 
     // Jezeli AY nie wytwarzal dzwieku, ale po zmianie rejestru powinien go wytwarzac,
     // nalezy zresetowac generator obwiedni
-    if ((!SoundGen) && (IsSoundGeneration()))
+    //bool SoundGenX = IsSoundGeneration();
+
+    //cout << "Sprawdzanie stanu " << SoundGen << " " << SoundGenX << endl;
+    //if ((!SoundGen) && (SoundGenX))
+    //{
+    //    EnvelopeCounter = 0;
+    //    EnvelopeState = 0;
+    //}
+
+    if (GenRestart)
     {
         EnvelopeCounter = 0;
         EnvelopeState = 0;