Fixed file modified notifications. Added option to copy (replace) odf loops to other attacks in rank coming from same directory.

larspalo · larspalo · commit 59a1faad1fee · 2024-01-01T12:02:29.000+01:00
diff --git a/src/AttackDialog.cpp b/src/AttackDialog.cpp
@@ -43,6 +43,7 @@ BEGIN_EVENT_TABLE(AttackDialog, wxDialog)
 	EVT_BUTTON(ID_ATK_DIALOG_DELETE_LOOP_BTN, AttackDialog::OnRemoveLoopBtn)
 	EVT_SPINCTRL(ID_ATK_DIALOG_LOOP_START_SPIN, AttackDialog::OnLoopStartSpin)
 	EVT_SPINCTRL(ID_ATK_DIALOG_LOOP_END_SPIN, AttackDialog::OnLoopEndSpin)
+	EVT_CHECKBOX(ID_RANK_COPY_REPLACE_ODF_LOOPS, AttackDialog::OnCopyReplaceLoopCheck)
 END_EVENT_TABLE()
 
 AttackDialog::AttackDialog(std::list<Attack>& attack_list, unsigned selected_attack) : m_attacklist(attack_list) {
@@ -395,12 +396,13 @@ void AttackDialog::CreateControls() {
 		wxT("A loop must be selected in the listbox to the left to enable.")
 	);
 	loopPropertiesContainer->Add(commentText1, 0, wxGROW|wxALL, 5);
-	wxStaticText *commentText2 = new wxStaticText (
+	m_copyReplaceLoopsCheck = new wxCheckBox(
 		loopPropertiesContainer->GetStaticBox(),
-		wxID_STATIC,
-		wxT("Also please note that no loops will be copied to other attacks!")
+		ID_RANK_COPY_REPLACE_ODF_LOOPS,
+		wxT("Copy/replace loops to other attacks too!")
 	);
-	loopPropertiesContainer->Add(commentText2, 0, wxGROW|wxALL, 5);
+	m_copyReplaceLoopsCheck->SetValue(false);
+	loopPropertiesContainer->Add(m_copyReplaceLoopsCheck, 0, wxGROW|wxALL, 5);
 	sixthRow->Add(loopPropertiesContainer, 1, wxEXPAND|wxALL, 5);
 	mainSizer->Add(sixthRow, 1, wxGROW);
 
@@ -436,6 +438,10 @@ unsigned AttackDialog::GetSelectedAttackIndex() {
 	return m_selectedAttackIndex;
 }
 
+bool AttackDialog::GetCopyReplaceLoops() {
+	return m_copyReplaceLoopsCheck->IsChecked();
+}
+
 std::list<Attack>::iterator AttackDialog::GetAttackIterator(unsigned index) {
 	auto iterator = std::next(m_attacklist.begin(), index);
 	return iterator;
@@ -473,44 +479,52 @@ void AttackDialog::OnLoadReleaseSelection(wxCommandEvent& event) {
 		m_currentAttack->loadRelease = false;
 	}
 	m_copyPropertiesBtn->Enable();
+	::wxGetApp().m_frame->m_organ->setModified(true);
 }
 
 void AttackDialog::OnAttackVelocitySpin(wxSpinEvent& WXUNUSED(event)) {
 	m_currentAttack->attackVelocity = m_attackVelocitySpin->GetValue();
 	m_copyPropertiesBtn->Enable();
+	::wxGetApp().m_frame->m_organ->setModified(true);
 }
 
 void AttackDialog::OnMaxTimeSinceLastSpin(wxSpinEvent& WXUNUSED(event)) {
 	m_currentAttack->maxTimeSinceLastRelease = m_maxTimeSinceLastSpin->GetValue();
 	m_copyPropertiesBtn->Enable();
+	::wxGetApp().m_frame->m_organ->setModified(true);
 }
 
 void AttackDialog::OnTremulantChoice(wxCommandEvent& WXUNUSED(event)) {
 	if (m_isTremulantChoice->GetSelection() != wxNOT_FOUND) {
 		int tremChoice = m_isTremulantChoice->GetSelection() - 1;
 		m_currentAttack->isTremulant = tremChoice;
 		m_copyPropertiesBtn->Enable();
+		::wxGetApp().m_frame->m_organ->setModified(true);
 	}
 }
 
 void AttackDialog::OnMaxKeyPressTimeSpin(wxSpinEvent& WXUNUSED(event)) {
 	m_currentAttack->maxKeyPressTime = m_maxKeyPressTime->GetValue();
 	m_copyPropertiesBtn->Enable();
+	::wxGetApp().m_frame->m_organ->setModified(true);
 }
 
 void AttackDialog::OnAttackStartSpin(wxSpinEvent& WXUNUSED(event)) {
 	m_currentAttack->attackStart = m_attackStartSpin->GetValue();
 	m_copyPropertiesBtn->Enable();
+	::wxGetApp().m_frame->m_organ->setModified(true);
 }
 
 void AttackDialog::OnCuePointSpin(wxSpinEvent& WXUNUSED(event)) {
 	m_currentAttack->cuePoint = m_cuePointSpin->GetValue();
 	m_copyPropertiesBtn->Enable();
+	::wxGetApp().m_frame->m_organ->setModified(true);
 }
 
 void AttackDialog::OnReleaseEndSpin(wxSpinEvent& WXUNUSED(event)) {
 	m_currentAttack->releaseEnd = m_releaseEndSpin->GetValue();
 	m_copyPropertiesBtn->Enable();
+	::wxGetApp().m_frame->m_organ->setModified(true);
 }
 
 void AttackDialog::OnLoopListSelection(wxCommandEvent& WXUNUSED(event)) {
@@ -538,6 +552,8 @@ void AttackDialog::OnAddLoopBtn(wxCommandEvent& WXUNUSED(event)) {
 	m_loopsList->SetSelection(lastLoopIndex);
 	m_selectedLoop = m_currentAttack->getLoopAt(lastLoopIndex);
 	LoopInListSelected();
+	if (GetCopyReplaceLoops())
+		m_copyPropertiesBtn->Enable();
 }
 
 void AttackDialog::OnRemoveLoopBtn(wxCommandEvent& WXUNUSED(event)) {
@@ -556,6 +572,8 @@ void AttackDialog::OnRemoveLoopBtn(wxCommandEvent& WXUNUSED(event)) {
 			m_selectedLoop = m_currentAttack->getLoopAt(lastLoopIndex);
 			LoopInListSelected();
 		}
+		if (GetCopyReplaceLoops())
+			m_copyPropertiesBtn->Enable();
 	}
 }
 
@@ -567,6 +585,9 @@ void AttackDialog::OnLoopStartSpin(wxSpinEvent& WXUNUSED(event)) {
 	}
 	m_selectedLoop->start = value;
 	SetLoopStartAndEndRanges();
+	::wxGetApp().m_frame->m_organ->setModified(true);
+	if (GetCopyReplaceLoops())
+		m_copyPropertiesBtn->Enable();
 }
 
 void AttackDialog::OnLoopEndSpin(wxSpinEvent& WXUNUSED(event)) {
@@ -577,6 +598,14 @@ void AttackDialog::OnLoopEndSpin(wxSpinEvent& WXUNUSED(event)) {
 	}
 	m_selectedLoop->end = value;
 	SetLoopStartAndEndRanges();
+	::wxGetApp().m_frame->m_organ->setModified(true);
+	if (GetCopyReplaceLoops())
+		m_copyPropertiesBtn->Enable();
+}
+
+void AttackDialog::OnCopyReplaceLoopCheck(wxCommandEvent& WXUNUSED(event)) {
+	if (GetCopyReplaceLoops())
+		m_copyPropertiesBtn->Enable();
 }
 
 void AttackDialog::SetButtonState() {
@@ -598,7 +627,7 @@ void AttackDialog::TransferAttackValuesToWindow() {
 	m_attackName->SetLabel(m_currentAttack->fileName);
 	m_attackPath->SetLabel(m_currentAttack->fullPath);
 	if (m_currentAttack->fullPath.IsSameAs(wxT("DUMMY"))) {
-		// almoast everything should be set to default and disabled
+		// almost everything should be set to default and disabled
 		m_loadReleaseYes->SetValue(true);
 		m_loadReleaseNo->SetValue(false);
 		m_attackVelocitySpin->SetValue(m_currentAttack->attackVelocity);
diff --git a/src/AttackDialog.h b/src/AttackDialog.h
@@ -23,6 +23,7 @@
 
 #include <wx/wx.h>
 #include <wx/spinctrl.h>
+#include <wx/checkbox.h>
 #include "GOODFDef.h"
 #include "Attack.h"
 
@@ -66,6 +67,7 @@ class AttackDialog : public wxDialog {
 
 	// Accessor
 	unsigned GetSelectedAttackIndex();
+	bool GetCopyReplaceLoops();
 
 private:
 	unsigned m_firstSelectedAttack;
@@ -95,6 +97,7 @@ class AttackDialog : public wxDialog {
 	wxSpinCtrl *m_loopStartSpin;
 	wxSpinCtrl *m_loopEndSpin;
 	wxButton *m_copyPropertiesBtn;
+	wxCheckBox *m_copyReplaceLoopsCheck;
 
 	// Event methods
 	void OnPrevAttackBtn(wxCommandEvent& event);
@@ -112,7 +115,8 @@ class AttackDialog : public wxDialog {
 	void OnRemoveLoopBtn(wxCommandEvent& event);
 	void OnLoopStartSpin(wxSpinEvent& event);
 	void OnLoopEndSpin(wxSpinEvent& event);
-	void OnCopyProperties(wxCommandEvent& event);
+	// void OnCopyProperties(wxCommandEvent& event);
+	void OnCopyReplaceLoopCheck(wxCommandEvent& event);
 
 	std::list<Attack>::iterator GetAttackIterator(unsigned index);
 	void SetButtonState();
diff --git a/src/GOODFDef.h.in b/src/GOODFDef.h.in
@@ -613,6 +613,7 @@ enum {
 	ID_GLOBAL_SHOW_TOOLTIPS_OPTION = wxID_HIGHEST + 588,
 	ID_CLEAR_HISTORY = wxID_HIGHEST + 589,
 	ID_ENCLOSURE_MIDI_INPUT_NBR_SPIN = wxID_HIGHEST + 590,
+	ID_RANK_COPY_REPLACE_ODF_LOOPS = wxID_HIGHEST + 591,
 };
 
 // Get version number from cmake
diff --git a/src/OrganPanel.cpp b/src/OrganPanel.cpp
@@ -619,14 +619,16 @@ void OrganPanel::getDataFromOrgan() {
 }
 
 void OrganPanel::OnBrowseForOrganPath(wxCommandEvent& WXUNUSED(event)) {
+	wxString oldOdfPath = m_odfPath;
 	m_odfPath = GetDirectoryPath();
 	m_odfPathField->SetValue(m_odfPath);
 	m_currentOrgan->setOdfRoot(m_odfPath);
 	m_currentOrgan->updateRelativePipePaths();
 	if (!m_infoPathField->IsEmpty()) {
 		m_infoPathField->SetValue(GOODF_functions::removeBaseOdfPath(m_currentOrgan->getInfoFilename()));
 	}
-	::wxGetApp().m_frame->m_organ->setModified(true);
+	if (!m_odfPath.IsSameAs(oldOdfPath))
+		::wxGetApp().m_frame->m_organ->setModified(true);
 }
 
 wxString OrganPanel::GetDirectoryPath() {
@@ -639,7 +641,7 @@ wxString OrganPanel::GetDirectoryPath() {
 
 	wxDirDialog dirDialog(
 		this,
-		wxT("Pick a directory"),
+		wxT("Pick a directory (Cancel will empty the field!)"),
 		defaultPath,
 		wxDD_DIR_MUST_EXIST
 	);
diff --git a/src/RankPanel.cpp b/src/RankPanel.cpp
@@ -34,6 +34,7 @@
 #include "PipeCopyOffsetDialog.h"
 #include "PipeLoadingDialog.h"
 #include <algorithm>
+#include "WAVfileParser.h"
 
 // Event table
 BEGIN_EVENT_TABLE(RankPanel, wxPanel)
@@ -1313,6 +1314,23 @@ void RankPanel::OnEditAttack() {
 					atk->maxKeyPressTime = sourceAttack->maxKeyPressTime;
 					atk->maxTimeSinceLastRelease = sourceAttack->maxTimeSinceLastRelease;
 					atk->releaseEnd = sourceAttack->releaseEnd;
+
+					if (atk_dlg.GetCopyReplaceLoops()) {
+						atk->m_loops.clear();
+
+						// need a way to check that loop end point won't be larger than actual attack samples
+						unsigned maxSampleFrames = 0;
+						WAVfileParser sample(atk->fullPath);
+						if (sample.isWavOk()) {
+							maxSampleFrames = sample.getNumberOfFrames();
+						}
+						if (sourceAttack->m_loops.size()) {
+							for (Loop l: sourceAttack->m_loops) {
+								if ((unsigned) l.end < maxSampleFrames)
+									atk->m_loops.push_back(l);
+							}
+						}
+					}
 				}
 			}
 		}
