Corrected: Restored border color when displaying load bar; Changed function of SPACE key in SFX edit mode - deletes MOD/VAL value only; Added channel volume bars when playing a song

Author: GSoftwareDevelopment

SFXMM.pas

@@ -4,7 +4,7 @@
 
 {$DEFINE ROMOFF}
 
-uses SFX_API, sysutils, strings, gr2, ui, pmgraph,cio;
+uses SFX_API, sysutils, strings, gr2, ui, pmgraph, cio;
 {$I-}
 {$i types.inc}
 

modules/sfx/sfx_edit.inc

@@ -3,13 +3,18 @@ procedure SFXSectionEditLoop(var tab:byteArray; nibble:byte);
 var i,v,cSFX:byte;
    at:byte;
 
-	procedure SFXputBlank();
+	procedure SFXputNOP();
 	begin
-		SFX_vol_dist[at]:=0;
 		SFX_modulate[at]:=0;
 		modified:=true;
 	end;
 
+	procedure SFXputBlank();
+	begin
+		SFX_vol_dist[at]:=0;
+		SFXputNOP();
+	end;
+
 	procedure dblMove(ofsSrc,ofsDest:byte);
 	var len:byte;
 
@@ -89,16 +94,16 @@ begin
 
          case key of
             key_RETURN: if SFXEntryEdit then break;
-            key_SPACE: SFXputBlank();
+            key_SPACE: SFXputNOP();
 				key_CTRL_INSERT: begin			// insert column in SFX
 //					at:=cursorShift+cursorPos;
 					dblMove(0,1);
 					SFXputBlank();
 				end;
 				key_CTRL_DELETE: begin			// delete column in SFX
-//					at:=cursorShift+cursorPos;
 					dblMove(1,0);
 					at:=127; SFXputBlank();
+					at:=cursorShift+cursorPos;
 				end;
             key_CTRL_X: Cut2Clipboard(true,SFXLen);
             key_CTRL_C: Copy2Clipboard(true,SFXLen);

modules/song/song_play.inc

@@ -1,22 +1,46 @@
 procedure SONG_Play(startPos:byte);
-var _SONGRow,oSONGOfs:byte;
+var _SONGRow,oSONGOfs,__chnOfs,i,v:byte;
+
+	procedure _putChar(ch:byte); register;
+	begin
+		screen[__scrOfs]:=ch; inc(__scrOfs,20);
+	end;
+
+	procedure VolumeBar();
+	var ch:byte;
+	begin
+   // volume bar
+      ch:=$00;
+      if (v>12) then ch:=$3e-v+13;
+      _putChar(ch);
+      if (v>8) then
+         if (v>12) then ch:=$3b else ch:=$3e-v+9;
+      _putChar(ch);
+      if (v>4) then
+         if (v>8) then ch:=$3b else ch:=$3e-v+5;
+      _putChar(ch);
+      if (v>4) then ch:=$3b else ch:=$3f-v;
+      _putChar(ch);
+	end;
+
+	procedure updateVolumeBars();
+	begin
+		__chnOfs:=0;
+		for i:=0 to 3 do
+		begin
+			__scrOfs:=150+i*3;
+			v:=channels[__chnOfs+_chnCtrl] and $0f;
+			VolumeBar();
+			inc(__chnOfs,$10);
+		end;
+	end;
 
 begin
    SFX_PlaySONG(startPos);
    clearStatusBar();
    reset_pianoVis(); keyClick:=false;
    PLYtm:=timer; PLYstate:=2; oSongOfs:=255;
    repeat
-      updatePianoVis();
-      PlayFlash();
-      if oSONGOfs<>SONG_Ofs then
-      begin
-			oSONGOfs:=SONG_Ofs;
-			_SONGRow:=SONG_Ofs shr 2;
-			SONGShift:=(_SONGRow div 9)*9;
-			updateSong(true);
-		end;
-
       if keyPressed then
       begin
 			controlSelectionKeys(key_CTRL_LEFT,key_CTRL_RIGHT,SONGChn,0,3);
@@ -27,12 +51,23 @@ begin
 
       if (timer-ScreenTm)>0 then
       begin
+			updateVolumeBars();
+			updatePianoVis();
+			PlayFlash();
+			if oSONGOfs<>SONG_Ofs then
+			begin
+				oSONGOfs:=SONG_Ofs;
+				_SONGRow:=SONG_Ofs shr 2;
+				SONGShift:=(_SONGRow div 9)*9;
+				updateSong(true);
+			end;
 			updateSongStatus();
          ScreenTm:=timer;
          move(@screen,@video,240);
       end;
    until (SONG_Tick>$80) or checkEscape;
    SFX_Off(); keyClick:=true; key:=TKeys($ff);
    reset_pianoVis();
+	updateSong(true);
    clearStatusBar();
 end;

sfx_engine/sfx_api.pas

@@ -70,13 +70,13 @@ procedure SFX_tick(); Assembler; Interrupt;
 .endif
 .endif
 
-			lda #$06
+			lda 709
 			sta wsync
 			sta $D01a
 
          jsr INIT_SFXEngine.SFX_MAIN_TICK
 
-			lda #$00
+			lda 712
 			sta $D01a
 
 .ifdef MAIN.@DEFINES.SFX_SWITCH_ROM