IO interface improvements; optimization of the NOTE TUNE submodule and virtual piano visualization

Author: GSoftwareDevelopment

SFXMM.pas

@@ -95,38 +95,39 @@ procedure init();
 
 	getTheme(0,PFCOLS); // set default theme color
 
-	fillchar(@screen[0],20,$40);
-
 	Init_UI(RESOURCES_ADDR);
 	chars_alphaNum:=resptr[scan_to_scr];
 	keys_alphaNum:=resptr[scan_key_codes];
 	note_names:=resptr[str_NoteNames];
 	keys_notes:=resptr[scan_piano_codes];
 	themesNames:=resptr[themes_names_list];
+	octShift:=resptr[octaveShifts];
 
-	fillchar(@listBuf,LIST_BUFFER_SIZE,0);
-
-	currentMenu:=0;
-
+	clearListBuf();
 	IO_clearAllData();
 
 	reset_pianoVis();
 	updatePiano();
 	SFX_Start();
 
 // load defaults
-	IOLoadTheme(defaultThemeFile);
+	setFilename(defaultThemeFile,otherFile);
+	IOLoadTheme();
 	IOLoadDefaultNoteTable();
 
 // set defaults files
+	clearFilename(otherFile);
 	setFilename(defaultFileName,currentFile);
 	setFilename(defaultSearchPath,searchPath);
+
+	currentMenu:=0;
+
 end;
 
 begin
 	init();
 	repeat
-		fillchar(@screen,20,$40);
+		clearTopMenu();
 		if optionsList(menu_top,width_menuTop,5,currentMenu,key_Left,key_Right) then
 			case currentMenu of
 				0: GSDModule();

modules/io/io.pas

@@ -5,10 +5,11 @@
 procedure IOModule();
 begin
 	section:=1;
-	fillchar(@screen,20,$40);
+	clearTopMenu();
 	if optionsList(menu_IO,width_menuTop,5,section,key_Left,key_Right) then
 	begin
 		case section of
+			0: exit;
 			1: IOLoad();
 			2: IOSave();
 			4: IOQuit();

modules/io/io_dir.inc

@@ -10,7 +10,7 @@ var
 
 begin
 	SFX_End();
-	fillchar(@listBuf,LIST_BUFFER_SIZE,0);
+	clearListBuf();
 	listOfs:=0; filesCount:=0;
 	fillchar(@f.Name,16,0);
 	FindFirst(path, faAnyFile, f);
@@ -63,7 +63,6 @@ begin
 
 			findNext(f);
 		end;
-		clearModuleBar();
 		if (IOResult=1) then
 		begin
 			if (filesCount=IO_pageLimit) then
@@ -98,15 +97,13 @@ var
 begin
 	listStart:=0; listPage:=0;
 	repeat
-		clearModule(); // fillchar(@moduleBar[20],180,$40);
 		filesCount:=IOReadDir(searchPath,listStart);
 		if filesCount>0 then
 		begin
 			clearModuleBar();
 			putMultiText(msg_IO_DirPrompt,0);
 			selFile:=0;
 			selFile:=listChoice(0,2,width_fileList,9,selFile,listBuf,filesCount,false);
-			clearModuleBar();
 			if (selFile=-1) then
 			begin
 				result:=false; break;
@@ -143,11 +140,12 @@ begin
 		end
 		else
 		begin
-			putMultiText(msg_IO_noFiles,1);
+			putMultiText(msg_IO_noFiles,0);
 			result:=false;
 			break;
 		end;
 	until false;
+	clearModuleBar();
 end;
 
 function IOPrompt(var promptFile:string):boolean;

modules/io/io_error.inc

@@ -15,21 +15,24 @@ begin
 			screen2video();
 		end;
 	until kbcode<>255; kbcode:=255;
-	fillchar(@statusBar,20,0);
-	screen2video();
+	clearStatusBar();
 end;
 
-procedure showError(msg:byte);
+procedure drawError(msg:byte);
 begin
-	fillchar(@statusBar,20,0);
+	clearStatusBar();
 	putMultiText(msg,0);
+end;
+
+procedure showError(msg:byte);
+begin
+	drawError(msg);
 	flashError();
 end;
 
 procedure IOError(err:byte);
 begin
-	fillchar(@statusBar,20,0);
-	putMultiText(msg_IO_Error,0);
+	drawError(msg_IO_Error);
 	putValue(14,11,err,3,0);
 	flashError();
 end;

modules/io/io_load.inc

@@ -124,7 +124,7 @@ var
 	end;
 
 begin
-	fillchar(@statusBar,20,0);
+	clearStatusBar();
 
 	err:=openFile(filename,file_read);
 	while (err=IO_OK) and (IOResult<>3) do

modules/io/io_manage.inc

@@ -1,12 +1,17 @@
-procedure setFilename(var fn,dest:string);
+procedure clearFilename(var dest:string);
 begin
 	fillchar(@dest,FILEPATHMaxLength+1,0);
+end;
+
+procedure setFilename(var fn,dest:string);
+begin
+	clearFilename(dest);
 	move(@fn,@dest,byte(fn[0])+1);
 end;
 
 procedure closeFile();
 begin
-	fillchar(@statusBar,20,0);
+	clearStatusBar();
 	close(f);
 	SFX_Start();
 end;
@@ -21,19 +26,17 @@ begin
 	assign(f,fn);
 	case mode of
 		file_read: begin
-			reset(f,1);
-			msgPtr:=msg_IO_reading;
-		end;
+							reset(f,1);
+							msgPtr:=msg_IO_reading;
+						end;
 		file_write: begin
-			rewrite(f,1);
-			msgPtr:=msg_IO_writing;
-		end;
+							rewrite(f,1);
+							msgPtr:=msg_IO_writing;
+						end;
 	end;
 	result:=IOResult;
 	if (IOResult<>1) then
-	begin
-		closeFile();
-	end
+		closeFile()
 	else
 	begin
 		result:=IO_OK;

modules/io/io_quit.inc

@@ -5,5 +5,4 @@ var
 begin
 	answer:=messageBox(msg_IO_Quit,color_choice,but_IO_Quit,16,2,1,key_Up,key_Down);
 	if answer=0 then halt(1);
-	move(@tmpbuf[40],@screen[40],60)
 end;

modules/io/io_save.inc

@@ -58,7 +58,7 @@ var
 	dataSize:word;
 
 begin
-	IOofs:=0;
+	IOOfs:=0;
 	push2IOBuf(@section_SONG,5);
 	dataSize:=$100;
 	push2IOBuf(@dataSize,2);
@@ -74,12 +74,13 @@ var
 	i:byte;
 
 begin
+	IOOfs:=0;
 	// prepare main section data
-	move(@section_main,@IOBuf,5);
-	IOBuf[5]:=SFXMM_VER1_1;
-	IOBuf[6]:=SONGNameLength;
-	move(@SONGTitle[1],@IOBuf[7],SONGNameLength);
-	BlockWrite(f,IOBuf,5+1+1+SONGNameLength);
+	push2IOBuf(@section_main,5); // move(@section_main,@IOBuf,5);
+	i:=SFXMM_VER1_1; push2IOBuf(@i,1); // IOBuf[5]:=SFXMM_VER1_1;
+	i:=SONGNameLength; push2IOBuf(@i,1); // IOBuf[6]:=SONGNameLength;
+	push2IOBuf(@SONGTitle[1],SONGNameLength); // move(@SONGTitle[1],@IOBuf[7],SONGNameLength);
+	BlockWrite(f,IOBuf,IOOfs);
 
 	if IOResult<>1 then exit(false);
 

modules/sfx/notetune_edit.inc

@@ -1,14 +1,14 @@
 procedure NoteTuneLoop();
 var
-	_pos,notePos,noteShift,noteVal,noteKey:byte;
+	_pos,notePos,noteShift,noteVal,noteKey,noteOct:byte;
 
 begin
 	notePos:=0; _pos:=0;
-	noteShift:=currentOct*12;
+	noteOct:=currentOct;
 	definedNoteTune:=pointer(NOTE_TABLE_ADDR+currentNoteTableOfs);
 
 	reset_pianoVis();
-	updateNoteTune(noteShift);
+	updateNoteTune(noteOct);
 	colorVLine(tuneBarsPos+notePos,0,5,3);
 	screen2video();
 	repeat
@@ -18,33 +18,28 @@ begin
 				key_ESC: break;
 			end;
 
-			if controlSelectionKeys(key,key_Left,key_Right,_pos,0,63) then
-			begin
-				noteShift:=(_pos div 12)*12;
-				notePos:=_pos mod 12;
-			end
-			else
+			if not controlSelectionKeys(key,key_Left,key_Right,_pos,0,63) then
 			begin
 				noteKey:=pianoKeyScan(0);
 				if noteKey<>255 then
-				begin
 					_pos:=noteKey;
-					noteShift:=(_pos div 12)*12;
-					notePos:=_pos mod 12;
-				end;
 			end;
 
+			noteOct:=_pos div 12;
+			noteShift:=octShift[noteOct];
+			notePos:=_pos mod 12;
+
 			noteVal:=definedNoteTune[_pos];
 			if controlSelectionKeys(key,key_Up,key_Down,noteVal,0,255) then
 				definedNoteTune[_pos]:=noteVal;
 
-			updateNoteTune(noteShift);
+			updateNoteTune(noteOct);
 			colorVLine(tuneBarsPos+notePos,0,5,3);
 			screen2video();
 		end;
 		updatePianoVis();
 	until false;
-	updateNoteTune(noteShift);
+	updateNoteTune(noteOct);
 	SFX_Off();
 	reset_pianoVis();
 end;

modules/sfx/notetune_io.inc

@@ -24,3 +24,11 @@ begin
 			IOError(IOResult);
 	end;
 end;
+
+procedure NoteTune_IO_Options();
+begin
+	case IO_Options of
+		0:NoteTune_load();
+		1:NoteTune_save();
+	end;
+end;