- 6.0.3.0 Support Loop Point PAULA_8364(AMIGA).

  - Limitation1: The length of the PCM must be at least 2 bytes.
  - Limitation2: Does not support too short/too early loop point.

Author: 110-kenichi

README.md

@@ -1,4 +1,4 @@
-MAmidiMEmo 6.0.2.3 Itoken (c)2019, 2025 / GPL-2.0
+MAmidiMEmo 6.0.3.0 Itoken (c)2019, 2025 / GPL-2.0
 
 *** What is the MAmidiMEmo? ***
 
@@ -274,6 +274,9 @@ e.g.) YM2151 has 8ch FM sounds, so you can play 8 chords on MIDI 1ch or sharing
    [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=SNQ9JE3JAQMNQ)
 
 *** Changes
+- 6.0.3.0 Support Loop Point PAULA_8364(AMIGA).
+  - Limitation1: The length of the PCM must be at least 2 bytes.  
+  - Limitation2: Does not support too short/too early loop point.  
 - 6.0.2.3 Fixed PAULA_8364(AMIGA) Wait I/O error.
 - 6.0.2.2 Fixed PAULA_8364(AMIGA) annoying noize issue.
 - 6.0.2.1 Fixed PAULA_8364(AMIGA) freezing issue.

src/VSIF/VSIF_AMIGA/main.c

@@ -467,10 +467,12 @@ VWritef("Completed serial setting.\n", NULL);
 
 					UBYTE id = *dataBufPtr++;
 					UWORD len = *(UWORD *)dataBufPtr++;
-					//UWORD loop = *(UWORD *)dataBufPtr++;
+					//UWORD loop = *(UWORD *)dataBufPtr;
 					//if(loop >= len)
 					//	loop = 0xFFFF;
-					UWORD loop = 0;
+#ifndef NO_LOOP
+						UWORD loop = 0;
+#endif
 #ifdef LOG
 					ULONG arg[] = {id, len, loop};
 					VWritef("%N %N %N\n", arg);
@@ -483,48 +485,48 @@ VWritef("Completed serial setting.\n", NULL);
 						BYTE* pcmDataPtr = (BYTE*)AllocMem(len, MEMF_CHIP);
 						if(pcmDataPtr != NULL)
 						{
-							UBYTE *pcmptr = (UBYTE *)readArray(pcmDataPtr, len);
-							if(pcmptr == NULL)
+							if(readArray(pcmDataPtr, len) == NULL)
 							{
-			error = -1;
+								error = -1;
 								FreeMem(pcmDataPtr, len);
 								break;
-		}
+							}
+							requestSerial(5);
 						}else
 						{
 							UWORD received = 0;
 							UWORD chunk_size;
-							while (received < len) {
+							while (received < len)
+							{
 								// 256バイト単位で受信（最後のブロックは余りを処理）
 								chunk_size = (len - received >= SERIAL_BUFFER_SIZE) ? SERIAL_BUFFER_SIZE : (len - received);
 								readArray(recvBuffer[recvBufferId], chunk_size);
 								received += chunk_size;
-	}
+							}
+							requestSerial(5);
 							showMessage("No PCM memory!");
-							error = -1;
 							break;
 						}
 
 						pdt->dataPtr = pcmDataPtr;
 						pdt->length = len;
-						pdt->loop  = loop;
+						pdt->loop  = 0;
 					}else{
+						requestSerial(5);
+
 						pdt->dataPtr = NULL;
 						pdt->length = 0;
 						pdt->loop  = 0;
 					}
-					requestSerial(5);
-
 					if(oldPcm != NULL)
 						FreeMem(oldPcm, oldLen);
-
 #ifdef LOG
 					VWritef("PCM Received\n", NULL);
 #endif
 				}
 				break;
-			case 7:	// PCM Loop
-	{
+			case 7:	// Change PCM Loop Pos
+				{
 					requestSerial(5);
 
 					UBYTE id = *dataBufPtr++;
@@ -539,6 +541,23 @@ VWritef("Completed serial setting.\n", NULL);
 #endif
 				}
 				break;
+
+			case 8:	// Set PCM Loop
+				{
+					requestSerial(5);
+
+					UBYTE id = *dataBufPtr++;
+					UWORD loop = *(UWORD *)dataBufPtr++;
+
+					custom->aud[ch].ac_len = (pcmDataTable[id].length - loop) >> 1;
+					custom->aud[ch].ac_ptr = (volatile UWORD *)(pcmDataTable[id].dataPtr + loop);
+#ifdef LOG
+					ULONG arg[] = {id, loop};
+					VWritef("LOOP %N %N\n", arg);
+#endif
+				}
+				break;
+
 			default:
 				error = -1;
 				break;

src/VSIF/VSIF_AMIGA/out/VSIF_AMIGA.exe

@@ -41,7 +41,7 @@ public static class Program
         /// <summary>
         /// 
         /// </summary>
-        public const string FILE_VERSION = "6.0.2.3";
+        public const string FILE_VERSION = "6.0.3.0";
 
         public const string FILE_COPYRIGHT = @"Virtual chiptune sound MIDI module ""MAmidiMEmo"" Version {0}
 Copyright(C) 2019, 2025 Itoken.All rights reserved.";

src/mamidimemo/Program.cs

@@ -439,7 +439,7 @@ private void transferPcmData(PaulaTimbre tim, FormProgress fp)
                             // id, len, loop, data...
                             List<byte> data = new List<byte>
                             {
-                                (byte)PAULA_CMD.PCM,
+                                (byte)PAULA_CMD.SetPcmData,
                                 //ID
                                 (byte)tim.Index,
                                 //Length
@@ -496,7 +496,7 @@ private void transferPcmData(PaulaTimbre tim, FormProgress fp)
                                 fp.Percentage = 100;
                             Application.DoEvents();
 #if USE_PCM_LOOP
-                            Paula8364Write(UnitNumber, PAULA_CMD.PCM_LOOP, (uint)tim.Index, (ushort)(tim.LoopEnable ? tim.LoopPoint : 0xFFFF), true);
+                            Paula8364Write(UnitNumber, PAULA_CMD.SetPcmDataLoop, (uint)tim.Index, (ushort)(tim.LoopEnable ? tim.LoopPoint : 0xFFFF), true);
 #endif
                         }
                         break;
@@ -591,7 +591,7 @@ private void Paula8364Write(uint unitNumber, PAULA_CMD type, uint address, ushor
                         }
                     }
                     break;
-                case PAULA_CMD.PCM_LOOP:
+                case PAULA_CMD.SetPcmDataLoop:
                     lock (sndEnginePtrLock)
                     {
                         switch (CurrentSoundEngine)
@@ -644,16 +644,18 @@ private void Paula8364Keyon(uint unitNumber, byte ch, byte id, byte vol, ushort
             ch = chConvert[ch];
             if (loop >= length)
                 loop = 0xffff;
-#if !USE_PCM_LOOP
-            loop = 0;
-#endif
+//#if !USE_PCM_LOOP
+//            loop = 0;
+//#endif
 
             lock (sndEnginePtrLock)
             {
                 switch (CurrentSoundEngine)
                 {
                     case SoundEngineType.VSIF_AMIGA:
                         vsifClient.RawWriteData(new byte[] { (byte)((byte)PAULA_CMD.KeyOn | ch << 4), id, vol, (byte)(period >> 8), (byte)period }, null);
+                        if(loop > 0)
+                            vsifClient.RawWriteData(new byte[] { (byte)((byte)PAULA_CMD.SetLoop | ch << 4), id, (byte)(loop >> 8), (byte)loop, 0 }, null);
                         break;
                 }
             }
@@ -1170,7 +1172,11 @@ public override void KeyOn()
                 if (freq > 0xffff)
                     freq = 0xffff;
 
-                ushort loop = loopEn ? loopPoint : (ushort)0xffff;
+                //ushort loop = loopEn ? loopPoint : (ushort)0xffff;
+                ushort pcmLen = (ushort)timbre.PcmData.Length;
+                if(pcmLen < 2)
+                    pcmLen = 2; 
+                ushort loop = loopEn ? loopPoint : (ushort)(pcmLen - 2);
                 parentModule.Paula8364Keyon(parentModule.UnitNumber,
                     (byte)Slot, timbreIndex, (byte)vol, (ushort)freq, (ushort)timbre.PcmData.Length, loop);
             }
@@ -1275,11 +1281,12 @@ public uint SampleRate
 
             [DataMember]
             [Category("Sound")]
-            [Description("Loop point enable")]
+            [Description("Loop point enabled\r\n"+
+                "LIMITATION: Does not support too short/too early loop point.")]
             [EditorAttribute(typeof(SlideEditor), typeof(System.Drawing.Design.UITypeEditor))]
             [DefaultValue(false)]
 #if !USE_PCM_LOOP
-            [Browsable(false)]
+//            [Browsable(false)]
 #endif
             public bool LoopEnable
             {
@@ -1295,7 +1302,7 @@ public bool LoopEnable
                         if (Instrument != null)
                         {
                             ((PAULA_8364)Instrument).
-                                Paula8364Write(Instrument.UnitNumber, PAULA_CMD.PCM_LOOP, (uint)Index, (ushort)(f_LoopEnable ? f_LoopPoint : 0xFFFF), true);
+                                Paula8364Write(Instrument.UnitNumber, PAULA_CMD.SetPcmDataLoop, (uint)Index, (ushort)(f_LoopEnable ? f_LoopPoint : 0xFFFF), true);
                         }
                     }
                 }
@@ -1305,12 +1312,13 @@ public bool LoopEnable
 
             [DataMember]
             [Category("Sound")]
-            [Description("Set loop point (0 - 65534) (65535 is loop off)")]
+            [Description("Set loop point (0 - 65534) (65535 is loop off)\r\n"+
+                "LIMITATION: Does not support too short/too early loop point.")]
             [DefaultValue(typeof(ushort), "0")]
             [SlideParametersAttribute(0, 65534)]
             [EditorAttribute(typeof(SlideEditor), typeof(System.Drawing.Design.UITypeEditor))]
 #if !USE_PCM_LOOP
-            [Browsable(false)]
+//            [Browsable(false)]
 #endif
             public ushort LoopPoint
             {
@@ -1326,7 +1334,7 @@ public ushort LoopPoint
                         if (Instrument != null)
                         {
                             ((PAULA_8364)Instrument).
-                            Paula8364Write(Instrument.UnitNumber, PAULA_CMD.PCM_LOOP, (uint)Index, (ushort)(f_LoopEnable ? f_LoopPoint : 0xFFFF), true);
+                            Paula8364Write(Instrument.UnitNumber, PAULA_CMD.SetPcmDataLoop, (uint)Index, (ushort)(f_LoopEnable ? f_LoopPoint : 0xFFFF), true);
                         }
                     }
                 }
@@ -1339,7 +1347,8 @@ public ushort LoopPoint
             [DataMember]
             [Category("Sound")]
             [Description("Signed 8bit PCM Raw Data or WAV Data. (MAX 64K samples, 1ch)\r\n" +
-                "Need to increase the Gain value to sound 8bit PCM data.")]
+                "Need to increase the Gain value to sound 8bit PCM data.\r\n"+
+                "LIMITATION: The length of the PCM must be at least 2 bytes.")]
             [PcmFileLoaderEditor("Audio File(*.raw, *.wav)|*.raw;*.wav", 0, 8, 1, 65535)]
             public sbyte[] PcmData
             {
@@ -1908,8 +1917,9 @@ public enum PAULA_CMD
         KeyOn = 3,
         KeyOff = 4,
         Filter = 5,
-        PCM = 6,
-        PCM_LOOP = 7,
+        SetPcmData = 6,
+        SetPcmDataLoop = 7,
+        SetLoop = 8,
     }