Merge branch 'master' into releases/1.2

CMakeLists.txt

@@ -18,8 +18,7 @@ PROJECT(hydrogen)
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "2")
 SET(VERSION_PATCH "0")
-SET(VERSION_SUFFIX "beta")
-
+SET(VERSION_SUFFIX "beta1")
 
 SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 

build.sh

@@ -2,7 +2,7 @@
 
 # Hydrogen
 # Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
-# Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+# Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
 #
 # http://www.hydrogen-music.org
 #

data/i18n/hydrogen_it.ts

@@ -4246,41 +4246,47 @@ Sei sicuro?</translation>
         <source>It is not possible to delete the currently loaded drumkit: 
   &quot;%1&quot;.
 To delete this drumkit first load another drumkit.</source>
-        <translation type="unfinished"></translation>
+        <translation>Non è possibile eliminare il drumkit correntemente caricato:
+        &quot;%1&quot;.
+        Per eliminare questo drumkit è necessario caricarne un altro.</translation>
     </message>
     <message>
         <source>Warning, the &quot;%1&quot; drumkit will be deleted from disk.
 Are you sure?</source>
-        <translation type="unfinished"></translation>
+        <translation>Avvertimento, il drumkit &quot;%1&quot; sarà eliminato dal disco.</translation>
     </message>
     <message>
         <source>Drumkit deletion failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminazione del drumkit fallita.</translation>
     </message>
     <message>
         <source>Keep</source>
-        <translation type="unfinished"></translation>
+        <translation>Mantieni</translation>
     </message>
     <message>
         <source>The existing kit has %1 instruments but the new one only has %2.
 The first %2 instruments will be replaced with the new instruments and will keep their notes, but some of the remaining instruments have notes.
 Would you like to keep or discard the remaining instruments and notes?
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Il kit esistente ha %1 strumenti ma il nuovo ne ha solamente %2.
+        I primi %2 strumenti saranno sostituiti con i nuovi strumenti e saranno mantenute le note, ma alcuni dei restanti
+        strumenti hanno note. Vuoi mantenenere o eliminare i restanti strumenti e note?</translation>
     </message>
     <message>
         <source>Double click to expand the list</source>
-        <translation type="unfinished"></translation>
+        <translation>Doppio clic per espandere la lista</translation>
     </message>
     <message>
         <source>Drumkit registered in the current song can not be found on disk.
 Please load an existing drumkit first.
 Current kit:</source>
-        <translation type="unfinished"></translation>
+        <translation>Il drumkit utilizzato nella canzone corrente non può essere trovato sul disco.
+        Per piacere, carica prima un drumkit esistente.
+        Kit corrente:</translation>
     </message>
     <message>
         <source>is a system drumkit and can&apos;t be deleted.</source>
-        <translation type="unfinished"></translation>
+        <translation>è un drumkit di sistema e non può essere eliminato.</translation>
     </message>
     <message>
         <source>Not implemented yet.</source>

macos/build_dmg.sh

@@ -2,7 +2,7 @@
 
 # Hydrogen
 # Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
-# Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+# Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
 #
 # http://www.hydrogen-music.org
 #

macos/fixlibs.sh

@@ -5,7 +5,7 @@
 
 # Hydrogen
 # Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
-# Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+# Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
 #
 # http://www.hydrogen-music.org
 #

macos/hydrogen.sh

@@ -3,7 +3,7 @@
 
 # Hydrogen
 # Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
-# Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+# Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
 #
 # http://www.hydrogen-music.org
 #

src/cli/main.cpp

@@ -1,7 +1,7 @@
 /*
  * Hydrogen
  * Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
- * Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+ * Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
  *
  * http://www.hydrogen-music.org
  *

src/core/AudioEngine/AudioEngine.cpp

@@ -1,7 +1,7 @@
 /*
  * Hydrogen
  * Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
- * Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+ * Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
  *
  * http://www.hydrogen-music.org
  *
@@ -605,7 +605,16 @@ void AudioEngine::updateBpmAndTickSize( std::shared_ptr<TransportPosition> pPos
 		AudioEngine::computeTickSize( static_cast<float>(m_pAudioDriver->getSampleRate()),
 									  fNewBpm, pSong->getResolution() );
 	// Nothing changed - avoid recomputing
+#ifndef WIN32
 	if ( fNewTickSize == fOldTickSize ) {
+#else
+	// For some reason two identical numbers (according to their
+	// values when printing them) are not equal to each other in 32bit
+	// Windows. Course graining the tick change in here will do no
+	// harm except of for preventing tiny tempo changes. Integer value
+	// changes should not be affected.
+	if ( std::abs( fNewTickSize - fOldTickSize ) < 1e-2 ) {
+#endif
 		return;
 	}
 
@@ -1273,6 +1282,11 @@ int AudioEngine::audioEngine_process( uint32_t nframes, void* /*arg*/ )
 		pAudioEngine->stopPlayback();
 		pAudioEngine->locate( 0 );
 
+		// Tell GUI to move the playhead position to the beginning of
+		// the song again since it only updates it in case transport
+		// is rolling.
+		EventQueue::get_instance()->push_event( EVENT_RELOCATION, 0 );
+
 		if ( dynamic_cast<FakeDriver*>(pAudioEngine->m_pAudioDriver) != nullptr ) {
 			___INFOLOG( "End of song." );
 
@@ -1498,7 +1512,8 @@ void AudioEngine::updateSongSize() {
 
 	auto updatePatternSize = []( std::shared_ptr<TransportPosition> pPos ) {
 		if ( pPos->getPlayingPatterns()->size() > 0 ) {
-			pPos->setPatternSize( pPos->getPlayingPatterns()->longest_pattern_length() );
+			// No virtual pattern resolution in here
+			pPos->setPatternSize( pPos->getPlayingPatterns()->longest_pattern_length( false ) );
 		} else {
 			pPos->setPatternSize( MAX_NOTES );
 		}
@@ -1666,7 +1681,16 @@ void AudioEngine::updateSongSize() {
 	// Ensure the tick offset is calculated as well (we do not expect
 	// the tempo to change hence the following call is most likely not
 	// executed during updateTransportPosition()).
+#ifndef WIN32
 	if ( fOldTickSize == m_pTransportPosition->getTickSize() ) {
+#else
+	// For some reason two identical numbers (according to their
+	// values when printing them) are not equal to each other in 32bit
+	// Windows. Course graining the tick change in here will do no
+	// harm except of for preventing tiny tempo changes. Integer value
+	// changes should not be affected.
+	if ( std::abs( m_pTransportPosition->getTickSize() - fOldTickSize ) < 1e-2 ) {
+#endif
 		calculateTransportOffsetOnBpmChange( m_pTransportPosition );
 	}
 
@@ -1761,8 +1785,7 @@ void AudioEngine::updatePlayingPatternsPos( std::shared_ptr<TransportPosition> p
 
 		for ( const auto& ppattern : *( *( pSong->getPatternGroupVector() ) )[ nColumn ] ) {
 			if ( ppattern != nullptr ) {
-				pPlayingPatterns->add( ppattern );
-				ppattern->addFlattenedVirtualPatterns( pPlayingPatterns );
+				pPlayingPatterns->add( ppattern, true );
 			}
 		}
 
@@ -1771,7 +1794,7 @@ void AudioEngine::updatePlayingPatternsPos( std::shared_ptr<TransportPosition> p
 		// We omit the event when passing from one empty column to the
 		// next.
 		if ( pPos == m_pTransportPosition &&
-			 ( nPrevPatternNumber != 0 && pPlayingPatterns->size() != 0 ) ) {
+			 ( nPrevPatternNumber != 0 || pPlayingPatterns->size() != 0 ) ) {
 			EventQueue::get_instance()->push_event( EVENT_PLAYING_PATTERNS_CHANGED, 0 );
 		}
 	}
@@ -1784,8 +1807,7 @@ void AudioEngine::updatePlayingPatternsPos( std::shared_ptr<TransportPosition> p
 			 ! ( pPlayingPatterns->size() == 1 &&
 				 pPlayingPatterns->get( 0 ) == pSelectedPattern ) ) {
 			pPlayingPatterns->clear();
-			pPlayingPatterns->add( pSelectedPattern );
-			pSelectedPattern->addFlattenedVirtualPatterns( pPlayingPatterns );
+			pPlayingPatterns->add( pSelectedPattern, true );
 
 			// GUI does not care about the internals of the audio
 			// engine and just moves along the transport position.
@@ -1806,9 +1828,8 @@ void AudioEngine::updatePlayingPatternsPos( std::shared_ptr<TransportPosition> p
 
 				if ( ( pPlayingPatterns->del( ppattern ) ) == nullptr ) {
 					// pPattern was not present yet. It will
-					// be added.
-					pPlayingPatterns->add( ppattern );
-					ppattern->addFlattenedVirtualPatterns( pPlayingPatterns );
+					// be added
+					pPlayingPatterns->add( ppattern, true );
 				} else {
 					// pPattern was already present. It will
 					// be deleted.
@@ -1826,7 +1847,8 @@ void AudioEngine::updatePlayingPatternsPos( std::shared_ptr<TransportPosition> p
 	}
 
 	if ( pPlayingPatterns->size() > 0 ) {
-		pPos->setPatternSize( pPlayingPatterns->longest_pattern_length() );
+		// No virtual pattern resolution in here
+		pPos->setPatternSize( pPlayingPatterns->longest_pattern_length( false ) );
 	} else {
 		pPos->setPatternSize( MAX_NOTES );
 	}
@@ -1905,8 +1927,17 @@ void AudioEngine::handleTimelineChange() {
 	const auto fOldTickSize = m_pTransportPosition->getTickSize();
 	updateBpmAndTickSize( m_pTransportPosition );
 	updateBpmAndTickSize( m_pQueuingPosition );
-
+
+#ifndef WIN32
 	if ( fOldTickSize == m_pTransportPosition->getTickSize() ) {
+#else
+	// For some reason two identical numbers (according to their
+	// values when printing them) are not equal to each other in 32bit
+	// Windows. Course graining the tick change in here will do no
+	// harm except of for preventing tiny tempo changes. Integer value
+	// changes should not be affected.
+	if ( std::abs( m_pTransportPosition->getTickSize() - fOldTickSize ) < 1e-2 ) {
+#endif
 		// As tempo did not change during the Timeline activation, no
 		// update of the offsets took place. This, however, is not
 		// good, as it makes a significant difference to be located at

src/core/AudioEngine/AudioEngine.h

@@ -1,7 +1,7 @@
 /*
  * Hydrogen
  * Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
- * Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+ * Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
  *
  * http://www.hydrogen-music.org
  *

src/core/AudioEngine/AudioEngineTests.cpp

@@ -1,7 +1,7 @@
 /*
  * Hydrogen
  * Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
- * Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+ * Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
  *
  * http://www.hydrogen-music.org
  *

src/core/AudioEngine/AudioEngineTests.h

@@ -1,7 +1,7 @@
 /*
  * Hydrogen
  * Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
- * Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+ * Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
  *
  * http://www.hydrogen-music.org
  *

src/core/AudioEngine/TransportPosition.cpp

@@ -1,7 +1,7 @@
 /*
  * Hydrogen
  * Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
- * Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+ * Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
  *
  * http://www.hydrogen-music.org
  *

src/core/AudioEngine/TransportPosition.h

@@ -1,7 +1,7 @@
 /*
  * Hydrogen
  * Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
- * Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+ * Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
  *
  * http://www.hydrogen-music.org
  *
@@ -360,6 +360,10 @@ class TransportPosition : public H2Core::Object<TransportPosition>
 	 * If transport is in #H2Core::Song::Mode::Song, it corresponds
 	 * to the patterns present in column #m_nColumn.
 	 *
+	 * Due to performance reasons no virtual patterns will be checked
+	 * and expanded in this list. Instead, all contained patterns have
+	 * to be added explicitly.
+	 *
 	 * See AudioEngine::updatePlayingPatterns() for details.
 	 */
 	PatternList*		m_pPlayingPatterns;

src/core/AutomationPathSerializer.cpp

@@ -1,7 +1,7 @@
 /*
  * Hydrogen
  * Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
- * Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+ * Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
  *
  * http://www.hydrogen-music.org
  *

src/core/AutomationPathSerializer.h

@@ -1,7 +1,7 @@
 /*
  * Hydrogen
  * Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
- * Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+ * Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
  *
  * http://www.hydrogen-music.org
  *

src/core/Basics/Adsr.h

@@ -1,7 +1,7 @@
 /*
  * Hydrogen
  * Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
- * Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+ * Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
  *
  * http://www.hydrogen-music.org
  *

src/core/Basics/AutomationPath.cpp

@@ -1,7 +1,7 @@
 /*
  * Hydrogen
  * Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
- * Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+ * Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
  *
  * http://www.hydrogen-music.org
  *

src/core/Basics/AutomationPath.h

@@ -1,7 +1,7 @@
 /*
  * Hydrogen
  * Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
- * Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+ * Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
  *
  * http://www.hydrogen-music.org
  *
@@ -83,7 +83,7 @@ class AutomationPath : public Object<AutomationPath>
 	 * displayed without line breaks.
 	 *
 	 * \return String presentation of current object.*/
-	QString toQString( const QString& sPrefix, bool bShort = true ) const override;
+	QString toQString( const QString& sPrefix = "", bool bShort = true ) const override;
 };
 };
 

src/core/Basics/Drumkit.cpp

@@ -1,7 +1,7 @@
 /*
  * Hydrogen
  * Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
- * Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+ * Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
  *
  * http://www.hydrogen-music.org
  *

src/core/Basics/Drumkit.h

@@ -1,7 +1,7 @@
 /*
  * Hydrogen
  * Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
- * Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+ * Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
  *
  * http://www.hydrogen-music.org
  *
@@ -256,7 +256,7 @@ class Drumkit : public H2Core::Object<Drumkit>
 		 * displayed without line breaks.
 		 *
 		 * \return String presentation of current object.*/
-		QString toQString( const QString& sPrefix, bool bShort = true ) const override;
+		QString toQString( const QString& sPrefix = "", bool bShort = true ) const override;
 
 	private:
 		QString __path;					///< absolute drumkit path

src/core/Basics/DrumkitComponent.cpp

@@ -1,7 +1,7 @@
 /*
  * Hydrogen
  * Copyright(c) 2002-2008 by Alex >Comix< Cominu [[email protected]]
- * Copyright(c) 2008-2021 The hydrogen development team [[email protected]]
+ * Copyright(c) 2008-2022 The hydrogen development team [[email protected]]
  *
  * http://www.hydrogen-music.org
  *