LogWindow sometimes obscured. Some samples added to .organ file with incorrect path. Wave tremulant addition tweak.

.github/workflows/TestFreebsd.yml

@@ -0,0 +1,32 @@
+name: Test
+
+on: [workflow_dispatch]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: A job to run test in FreeBSD
+    env:
+      MYTOKEN : ${{ secrets.MYTOKEN }}
+      MYTOKEN2: "value2"
+    steps:
+    - uses: actions/checkout@v4
+    - name: Test in FreeBSD
+      id: test
+      uses: vmactions/freebsd-vm@v1
+      with:
+        envs: 'MYTOKEN MYTOKEN2'
+        usesh: true
+        prepare: |
+          pkg install -y curl
+
+        run: |
+          pwd
+          ls -lah
+          whoami
+          env
+          freebsd-version
+          sysctl hw.model
+          sysctl hw.ncpu
+          sysctl hw.physmem
+          sysctl hw.usermem

.github/workflows/release.yml

@@ -1,6 +1,6 @@
 name: Release
 
-on: [push]
+on: [workflow_dispatch]
 
 permissions:
   contents: write
@@ -10,7 +10,7 @@ env:
 
 jobs:
   build-linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v4
@@ -34,7 +34,7 @@ jobs:
         path: ${{github.workspace}}/build/GoOdf*.tar.gz
 
   build-appimage:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v4
@@ -77,7 +77,7 @@ jobs:
 
 
   build-cross-windows:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v4

src/GOODF.cpp

@@ -561,6 +561,17 @@ bool GOODF::OnInit() {
 	// Show the frame
 	m_frame->Show(true);
 
+	// if a <file.organ> command line argument exists, try opening it as an organ file
+	if (wxApp::argc > 1) {
+		wxFileName f_name(wxApp::argv[1]);
+		if (f_name.Exists() && f_name.GetExt().IsSameAs("organ", false)) { // ignore case
+			// might like to use GetAbsolutePath() here, but it's only available in wx 3.1.6 or above
+			if (f_name.MakeAbsolute()) {
+				m_frame->DoOpenOrgan(f_name.GetFullPath());
+			}
+		}
+	}
+
 	// Start the event loop
 	return true;
 }

src/GOODFFrame.cpp

@@ -813,6 +813,8 @@ void GOODFFrame::DoOpenOrgan(wxString filePath) {
 	m_organTreeCtrl->SelectItem(tree_organ);
 	SetImportXfadeMenuItemState();
 	this->Raise();
+	if (m_logWindow->GetFrame()->IsShown())
+		m_logWindow->GetFrame()->Raise();
 }
 
 void GOODFFrame::OrganTreeChildItemLabelChanged(wxString label) {

src/GOODFFunctions.h

@@ -81,14 +81,16 @@ namespace GOODF_functions {
 	}
 
 	inline wxString checkIfFileExist(wxString relativePath, Organ *currentOrgan) {
-		if (relativePath != wxEmptyString) {
+		if (relativePath != wxEmptyString && !relativePath.IsSameAs("DUMMY") && !relativePath.StartsWith("REF:")) {  // don't need to check special "DUMMY" or "REF:" filenames
 			if (relativePath.StartsWith(wxT("./")) || relativePath.StartsWith(wxT(".\\")))
 				relativePath.erase(0, 2);
 			wxString fullFilePath = currentOrgan->getOdfRoot() + wxFILE_SEP_PATH + relativePath;
 			wxFileName theFile = wxFileName(fullFilePath, wxPATH_DOS);
 			if (theFile.FileExists()) {
 				return theFile.GetFullPath();
 			}
+			wxLogWarning("%s does not exist. Removed from .organ file", relativePath);
+			::wxGetApp().m_frame->GetLogWindow()->Show(true);
 		}
 		return wxEmptyString;
 	}

src/Rank.cpp

@@ -23,6 +23,12 @@
 #include "GOODFFunctions.h"
 #include <wx/unichar.h>
 
+#define TREMULANT_MESSAGE do { \
+		wxMessageDialog msg(::wxGetApp().m_frame, wxT("Warning: A mix of tremulant and non-tremulant pipes in a rank."), wxT("Pipe Tremulants Warning"), wxOK|wxCENTRE|wxICON_EXCLAMATION); \
+                msg.ShowModal(); \
+		} while(0)
+#define MIXED_TREMULANTS(a, b) (((a) && (b) == -1) || (!(a) && (b) != -1))
+
 Rank::Rank() {
 	name = wxT("New Rank");
 	firstMidiNoteNumber = 36;
@@ -725,6 +731,7 @@ void Rank::addToPipes(
 	int totalNbrOfPipes
 ) {
 	bool organRootPathIsSet = false;
+	bool hadIgnoreTremulant = false;
 
 	if (::wxGetApp().m_frame->m_organ->getOdfRoot() != wxEmptyString)
 		organRootPathIsSet = true;
@@ -797,6 +804,17 @@ void Rank::addToPipes(
 
 		// if there are any matching attacks we add them
 		if (!pipeAttacksToAdd.IsEmpty()) {
+
+			// set the warning flag if any previous attack is different than (hasTremulantFolders || loadPipesAsTremOff)
+			if (p->m_attacks.size() > 0) {
+				for (std::list<Attack>::iterator attack = p->m_attacks.begin(); attack != p->m_attacks.end(); attack++) {
+					if (MIXED_TREMULANTS(hasTremulantFolders || loadPipesAsTremOff, attack->isTremulant)) {
+						hadIgnoreTremulant = true;
+						break;
+					}
+				}
+			}
+
 			for (unsigned j = 0; j < pipeAttacksToAdd.GetCount(); j++) {
 				wxString relativeFileName;
 				if (organRootPathIsSet)
@@ -846,6 +864,16 @@ void Rank::addToPipes(
 				// if there are any matching releases we add them
 				if (!pipeReleasesToAdd.IsEmpty()) {
 
+					// set the warning flag if any previous release is different than (hasTremulantFolders || loadPipesAsTremOff)
+					if (p->m_releases.size() > 0) {
+						for (std::list<Release>::iterator release = p->m_releases.begin(); release != p->m_releases.end(); release++) {
+							if (MIXED_TREMULANTS(hasTremulantFolders || loadPipesAsTremOff, release->isTremulant)) {
+								hadIgnoreTremulant = true;
+								break;
+							}
+						}
+					}
+
 					for (unsigned k = 0; k < pipeReleasesToAdd.GetCount(); k++) {
 						wxString relativeFileName;
 						if (organRootPathIsSet)
@@ -975,6 +1003,17 @@ void Rank::addToPipes(
 
 					// if there are any matching releases we add them
 					if (!pipeReleasesToAdd.IsEmpty()) {
+
+						// set the warning flag if any previous release is different than (hasTremulantFolders || loadPipesAsTremOff)
+						if (p->m_releases.size() > 0) {
+							for (std::list<Release>::iterator release = p->m_releases.begin(); release != p->m_releases.end(); release++) {
+								if (MIXED_TREMULANTS(true, release->isTremulant)) {
+									hadIgnoreTremulant = true;
+									break;
+								}
+							}
+						}
+
 						for (unsigned k = 0; k < pipeReleasesToAdd.GetCount(); k++) {
 							wxString relativeFileName;
 							if (organRootPathIsSet)
@@ -1020,6 +1059,9 @@ void Rank::addToPipes(
 		}
 		count++;
 	}
+	if (hadIgnoreTremulant) {
+		TREMULANT_MESSAGE;
+	}
 }
 
 void Rank::addTremulantToPipes(
@@ -1034,6 +1076,7 @@ void Rank::addTremulantToPipes(
 ) {
 	// This method is for adding additional attacks/releases as (wave) tremulants only
 	bool organRootPathIsSet = false;
+	bool hadIgnoreTremulant = false;
 
 	if (::wxGetApp().m_frame->m_organ->getOdfRoot() != wxEmptyString)
 		organRootPathIsSet = true;
@@ -1100,6 +1143,17 @@ void Rank::addTremulantToPipes(
 
 		// if there are any matching attacks we add them
 		if (!pipeAttacksToAdd.IsEmpty()) {
+
+			// set the warning flag if any previous attack ignores wave tremulant
+			if (p->m_attacks.size() > 0) {
+				for (std::list<Attack>::iterator attack = p->m_attacks.begin(); attack != p->m_attacks.end(); attack++) {
+					if (MIXED_TREMULANTS(true, attack->isTremulant)) {
+						hadIgnoreTremulant = true;
+						break;
+					}
+				}
+			}
+
 			for (unsigned j = 0; j < pipeAttacksToAdd.GetCount(); j++) {
 				wxString relativeFileName;
 				if (organRootPathIsSet)
@@ -1155,6 +1209,16 @@ void Rank::addTremulantToPipes(
 						else
 							relativeFileName = pipeReleasesToAdd.Item(k);
 
+						// set the warning flag if any previous release ignores wave tremulant
+						if (p->m_releases.size() > 0) {
+							for (std::list<Release>::iterator release = p->m_releases.begin(); release != p->m_releases.end(); release++) {
+								if (MIXED_TREMULANTS(true, release->isTremulant)) {
+									hadIgnoreTremulant = true;
+									break;
+								}
+							}
+						}
+
 						// create and add the release to the pipe
 						Release rel;
 						rel.fileName = relativeFileName;
@@ -1197,6 +1261,10 @@ void Rank::addTremulantToPipes(
 		}
 		count++;
 	}
+
+	if (hadIgnoreTremulant) {
+		TREMULANT_MESSAGE;
+	}
 }
 
 void Rank::addReleasesToPipes(
@@ -1207,6 +1275,7 @@ void Rank::addReleasesToPipes(
 ) {
 	// This method is for adding releases only from a single folder
 	bool organRootPathIsSet = false;
+	bool hadIgnoreTremulant = false;
 
 	if (::wxGetApp().m_frame->m_organ->getOdfRoot() != wxEmptyString)
 		organRootPathIsSet = true;
@@ -1241,6 +1310,17 @@ void Rank::addReleasesToPipes(
 
 		// if there are any matching attacks we add them
 		if (!pipeReleasesToAdd.IsEmpty()) {
+
+			// set the warning flag if any previous release is different than loadPipeAsTremOff
+			if (p->m_releases.size() > 0) {
+				for (std::list<Release>::iterator release = p->m_releases.begin(); release != p->m_releases.end(); release++) {
+					if (MIXED_TREMULANTS(loadPipesAsTremOff, release->isTremulant)) {
+						hadIgnoreTremulant = true;
+						break;
+					}
+				}
+			}
+
 			for (unsigned j = 0; j < pipeReleasesToAdd.GetCount(); j++) {
 				wxString relativeFileName;
 				if (organRootPathIsSet)
@@ -1264,6 +1344,9 @@ void Rank::addReleasesToPipes(
 		pipeReleasesToAdd.Empty();
 		count++;
 	}
+	if (hadIgnoreTremulant) {
+		TREMULANT_MESSAGE;
+	}
 }
 
 void Rank::clearAllPipes() {