Merge pull request #85 from chinenual/develop

v2.6.2

VERSION

@@ -1,2 +1,2 @@
-VERSION=2.6.1
+VERSION=2.6.2
 

data/crt.go

@@ -34,7 +34,7 @@ type CRT struct {
 }
 
 func ReadCrtFile(filename string) (crt CRT, err error) {
-	// A CRT file is a long header containing filter info, followed by a list of CCE fragments (each voice missing the filter params since they are concatenated elsewhere in the file).
+	// A CRT file is a long header containing filter info, followed by a list of VCE fragments (each voice missing the filter params since they are concatenated elsewhere in the file).
 
 	var b []byte
 
@@ -50,7 +50,7 @@ func ReadCrtFile(filename string) (crt CRT, err error) {
 }
 
 func ReadCrt(buf io.ReadSeeker) (crt CRT, err error) {
-	// A CRT file is a long header containing filter info, followed by a list of CCE fragments (each voice missing the filter params since they are concatenated elsewhere in the file).
+	// A CRT file is a long header containing filter info, followed by a list of VCE fragments (each voice missing the filter params since they are concatenated elsewhere in the file).
 
 	if err = binary.Read(buf, binary.LittleEndian, &crt.Head); err != nil {
 		logger.Error("binary.Read failed:", err)
@@ -259,8 +259,18 @@ type crtCursor struct {
 	VoiceOffset   int64
 }
 
+func countVoices(vces []*VCE) (result int) {
+     	result = 0
+	for _, vce := range vces {
+		if vce != nil {
+			result += 1
+		}
+	}
+	return result
+}
+
 func WriteCrt(buf io.WriteSeeker, vces []*VCE) (err error) {
-	if len(vces) < 1 || len(vces) > 24 {
+	if countVoices(vces) < 1 || countVoices(vces) > 24 {
 		err = errors.Errorf("Must have at least 1 and no more than 24 voices")
 		return
 	}

message.go

@@ -115,7 +115,13 @@ func handleMessages(_ *astilectron.Window, m bootstrap.MessageIn) (payload inter
 			return
 		} else {
 			logger.Infof("Add vce %s to CRT at slot %d\n", args.VcePath, args.Slot)
-			args.Crt.Voices[args.Slot-1] = &vce
+			if len(args.Crt.Voices) < args.Slot {
+ 				// grow the slice
+				newVoices := make([]*data.VCE, args.Slot)
+				copy(newVoices, args.Crt.Voices)
+				args.Crt.Voices = newVoices
+			}
+ 			args.Crt.Voices[args.Slot-1] = &vce
 			payload = args.Crt
 		}
 

resources/app/static/js/index.js

@@ -95,7 +95,11 @@ let index = {
 		}
 		console.log("INFO NOTIFICATION: " + message)
 		document.getElementById("alertTitle").innerHTML = "Info";
-		document.getElementById("alertText").innerHTML = message;
+	    	document.getElementById("alertText").innerHTML = message;
+	    	// Make alert messages hide themselves after 3s - no need to click
+	        setTimeout(function(){
+		    $('#alertModal').modal('hide');
+		}, 3000);
 		$('#alertModal').modal();
 	},
 

version.go

@@ -1,3 +1,3 @@
 package main
 
-const Version = "2.6.1"
+const Version = "2.6.2"