From 0849e35097e1934310e40a7c8ca9faf907329141 Mon Sep 17 00:00:00 2001
From: necrashter <iiilker99@gmail.com>
Date: Tue, 1 Oct 2019 15:12:37 +0300
Subject: [PATCH] Add option to fill with syncopated notes

---
 .../PatternEditorInstrumentList.cpp           | 19 ++++++++++++++++---
 .../PatternEditorInstrumentList.h             |  8 +++++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/gui/src/PatternEditor/PatternEditorInstrumentList.cpp b/src/gui/src/PatternEditor/PatternEditorInstrumentList.cpp
index ff07ae4f3..c8c6c719f 100644
--- a/src/gui/src/PatternEditor/PatternEditorInstrumentList.cpp
+++ b/src/gui/src/PatternEditor/PatternEditorInstrumentList.cpp
@@ -109,6 +109,12 @@ InstrumentLine::InstrumentLine(QWidget* pParent)
 	m_pFunctionPopupSub->addAction( tr( "Fill 1/8 notes" ), this, SLOT( functionFillEveryEightNotes() ) );
 	m_pFunctionPopupSub->addAction( tr( "Fill 1/12 notes" ), this, SLOT( functionFillEveryTwelveNotes() ) );
 	m_pFunctionPopupSub->addAction( tr( "Fill 1/16 notes" ), this, SLOT( functionFillEverySixteenNotes() ) );
+	m_pFunctionPopupSub->addAction( tr( "Fill 1/2 notes (syncopated)" ), this, SLOT( functionFillEveryTwoNotesSyncopated() ) );
+	m_pFunctionPopupSub->addAction( tr( "Fill 1/4 notes (syncopated)" ), this, SLOT( functionFillEveryFourNotesSyncopated() ) );
+	m_pFunctionPopupSub->addAction( tr( "Fill 1/6 notes (syncopated)" ), this, SLOT( functionFillEverySixNotesSyncopated() ) );
+	m_pFunctionPopupSub->addAction( tr( "Fill 1/8 notes (syncopated)" ), this, SLOT( functionFillEveryEightNotesSyncopated() ) );
+	m_pFunctionPopupSub->addAction( tr( "Fill 1/12 notes (syncopated)" ), this, SLOT( functionFillEveryTwelveNotesSyncopated() ) );
+	m_pFunctionPopupSub->addAction( tr( "Fill 1/16 notes (syncopated)" ), this, SLOT( functionFillEverySixteenNotesSyncopated() ) );
 	m_pFunctionPopup->addMenu( m_pFunctionPopupSub );
 
 	m_pFunctionPopup->addAction( tr( "Randomize velocity" ), this, SLOT( functionRandomizeVelocity() ) );
@@ -337,7 +343,14 @@ void InstrumentLine::functionFillEveryEightNotes(){ functionFillNotes(8); }
 void InstrumentLine::functionFillEveryTwelveNotes(){ functionFillNotes(12); }
 void InstrumentLine::functionFillEverySixteenNotes(){ functionFillNotes(16); }
 
-void InstrumentLine::functionFillNotes( int every )
+void InstrumentLine::functionFillEveryTwoNotesSyncopated(){ functionFillNotes(2,true); }
+void InstrumentLine::functionFillEveryFourNotesSyncopated(){ functionFillNotes(4,true); }
+void InstrumentLine::functionFillEverySixNotesSyncopated(){ functionFillNotes(6,true); }
+void InstrumentLine::functionFillEveryEightNotesSyncopated(){ functionFillNotes(8,true); }
+void InstrumentLine::functionFillEveryTwelveNotesSyncopated(){ functionFillNotes(12,true); }
+void InstrumentLine::functionFillEverySixteenNotesSyncopated(){ functionFillNotes(16,true); }
+
+void InstrumentLine::functionFillNotes( int every, bool syncopated )
 {
 	Hydrogen *pEngine = Hydrogen::get_instance();
 
@@ -351,7 +364,7 @@ void InstrumentLine::functionFillNotes( int every )
 		nBase = 4;
 	}
 	int nResolution = 4 * MAX_NOTES * every / ( nBase * pPatternEditor->getResolution() );
-
+	int startPos = syncopated ? nResolution/2 : 0;
 
 	Song *pSong = pEngine->getSong();
 
@@ -365,7 +378,7 @@ void InstrumentLine::functionFillNotes( int every )
 		if (nSelectedInstrument != -1) {
 			Instrument *instrRef = (pSong->get_instrument_list())->get( nSelectedInstrument );
 
-			for (int i = 0; i < nPatternSize; i += nResolution) {
+			for (int i = startPos; i < nPatternSize; i += nResolution) {
 				bool noteAlreadyPresent = false;
 				const Pattern::notes_t* notes = pCurrentPattern->get_notes();
 				FOREACH_NOTE_CST_IT_BOUND(notes,it,i) {
diff --git a/src/gui/src/PatternEditor/PatternEditorInstrumentList.h b/src/gui/src/PatternEditor/PatternEditorInstrumentList.h
index 03e2eb29f..29e4ab1e8 100644
--- a/src/gui/src/PatternEditor/PatternEditorInstrumentList.h
+++ b/src/gui/src/PatternEditor/PatternEditorInstrumentList.h
@@ -68,7 +68,13 @@ class InstrumentLine : public PixmapWidget
 		void functionFillEveryEightNotes();
 		void functionFillEveryTwelveNotes();
 		void functionFillEverySixteenNotes();
-		void functionFillNotes( int every );
+		void functionFillEveryTwoNotesSyncopated();
+		void functionFillEveryFourNotesSyncopated();
+		void functionFillEverySixNotesSyncopated();
+		void functionFillEveryEightNotesSyncopated();
+		void functionFillEveryTwelveNotesSyncopated();
+		void functionFillEverySixteenNotesSyncopated();
+		void functionFillNotes( int every,  bool syncopated=false);
 		void functionCopyInstrumentPattern();
 		void functionCopyAllInstrumentPatterns();
 		void functionPasteInstrumentPattern();