diff --git a/CMakeLists.txt b/CMakeLists.txt index 11f42f0fee..f945524223 100644 --- a/CMakeLists.txt +++ b/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}") diff --git a/build.sh b/build.sh index 208601b1bb..265138c66b 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ # Hydrogen # Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] -# Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] +# Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] # # http://www.hydrogen-music.org # diff --git a/data/i18n/hydrogen_it.ts b/data/i18n/hydrogen_it.ts index d5653f6a40..d93617defc 100644 --- a/data/i18n/hydrogen_it.ts +++ b/data/i18n/hydrogen_it.ts @@ -4246,41 +4246,47 @@ Sei sicuro? It is not possible to delete the currently loaded drumkit: "%1". To delete this drumkit first load another drumkit. - + Non è possibile eliminare il drumkit correntemente caricato: + "%1". + Per eliminare questo drumkit è necessario caricarne un altro. Warning, the "%1" drumkit will be deleted from disk. Are you sure? - + Avvertimento, il drumkit "%1" sarà eliminato dal disco. Drumkit deletion failed. - + Eliminazione del drumkit fallita. Keep - + Mantieni 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? - + 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? Double click to expand the list - + Doppio clic per espandere la lista Drumkit registered in the current song can not be found on disk. Please load an existing drumkit first. Current kit: - + Il drumkit utilizzato nella canzone corrente non può essere trovato sul disco. + Per piacere, carica prima un drumkit esistente. + Kit corrente: is a system drumkit and can't be deleted. - + è un drumkit di sistema e non può essere eliminato. Not implemented yet. diff --git a/macos/build_dmg.sh b/macos/build_dmg.sh index 6f4ffeb1cf..29d42c6846 100755 --- a/macos/build_dmg.sh +++ b/macos/build_dmg.sh @@ -2,7 +2,7 @@ # Hydrogen # Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] -# Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] +# Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] # # http://www.hydrogen-music.org # diff --git a/macos/fixlibs.sh b/macos/fixlibs.sh index f076a1f19c..24db172471 100755 --- a/macos/fixlibs.sh +++ b/macos/fixlibs.sh @@ -5,7 +5,7 @@ # Hydrogen # Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] -# Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] +# Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] # # http://www.hydrogen-music.org # diff --git a/macos/hydrogen.sh b/macos/hydrogen.sh index bc39288bb2..022e65e729 100644 --- a/macos/hydrogen.sh +++ b/macos/hydrogen.sh @@ -3,7 +3,7 @@ # Hydrogen # Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] -# Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] +# Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] # # http://www.hydrogen-music.org # diff --git a/src/cli/main.cpp b/src/cli/main.cpp index 624190ef6a..8268411f3c 100644 --- a/src/cli/main.cpp +++ b/src/cli/main.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/AudioEngine/AudioEngine.cpp b/src/core/AudioEngine/AudioEngine.cpp index 5e02ceef86..bfb22a9293 100644 --- a/src/core/AudioEngine/AudioEngine.cpp +++ b/src/core/AudioEngine/AudioEngine.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -605,7 +605,16 @@ void AudioEngine::updateBpmAndTickSize( std::shared_ptr pPos AudioEngine::computeTickSize( static_cast(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(pAudioEngine->m_pAudioDriver) != nullptr ) { ___INFOLOG( "End of song." ); @@ -1498,7 +1512,8 @@ void AudioEngine::updateSongSize() { auto updatePatternSize = []( std::shared_ptr 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 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 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 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 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 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 diff --git a/src/core/AudioEngine/AudioEngine.h b/src/core/AudioEngine/AudioEngine.h index f03639e8f5..534152193c 100644 --- a/src/core/AudioEngine/AudioEngine.h +++ b/src/core/AudioEngine/AudioEngine.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/AudioEngine/AudioEngineTests.cpp b/src/core/AudioEngine/AudioEngineTests.cpp index 91a8ac2688..dcacf448df 100644 --- a/src/core/AudioEngine/AudioEngineTests.cpp +++ b/src/core/AudioEngine/AudioEngineTests.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/AudioEngine/AudioEngineTests.h b/src/core/AudioEngine/AudioEngineTests.h index b49cc7631b..2d8e6b8b76 100644 --- a/src/core/AudioEngine/AudioEngineTests.h +++ b/src/core/AudioEngine/AudioEngineTests.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/AudioEngine/TransportPosition.cpp b/src/core/AudioEngine/TransportPosition.cpp index 01ccd4cbb2..7d614fc227 100644 --- a/src/core/AudioEngine/TransportPosition.cpp +++ b/src/core/AudioEngine/TransportPosition.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/AudioEngine/TransportPosition.h b/src/core/AudioEngine/TransportPosition.h index 8a81d0fb01..9a95761287 100644 --- a/src/core/AudioEngine/TransportPosition.h +++ b/src/core/AudioEngine/TransportPosition.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -360,6 +360,10 @@ class TransportPosition : public H2Core::Object * 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; diff --git a/src/core/AutomationPathSerializer.cpp b/src/core/AutomationPathSerializer.cpp index 04271fb797..38424b7050 100644 --- a/src/core/AutomationPathSerializer.cpp +++ b/src/core/AutomationPathSerializer.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/AutomationPathSerializer.h b/src/core/AutomationPathSerializer.h index a72b41bc4d..94fdb2ffca 100644 --- a/src/core/AutomationPathSerializer.h +++ b/src/core/AutomationPathSerializer.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Basics/Adsr.h b/src/core/Basics/Adsr.h index 142f335b2e..4d3313da1f 100644 --- a/src/core/Basics/Adsr.h +++ b/src/core/Basics/Adsr.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Basics/AutomationPath.cpp b/src/core/Basics/AutomationPath.cpp index 930877828b..1be785692a 100644 --- a/src/core/Basics/AutomationPath.cpp +++ b/src/core/Basics/AutomationPath.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Basics/AutomationPath.h b/src/core/Basics/AutomationPath.h index 0abc66ed51..e87962b236 100644 --- a/src/core/Basics/AutomationPath.h +++ b/src/core/Basics/AutomationPath.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -83,7 +83,7 @@ class AutomationPath : public Object * 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; }; }; diff --git a/src/core/Basics/Drumkit.cpp b/src/core/Basics/Drumkit.cpp index eefa1c947f..895aa91c05 100644 --- a/src/core/Basics/Drumkit.cpp +++ b/src/core/Basics/Drumkit.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Basics/Drumkit.h b/src/core/Basics/Drumkit.h index 56471a3f22..24a9a80cf1 100644 --- a/src/core/Basics/Drumkit.h +++ b/src/core/Basics/Drumkit.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -256,7 +256,7 @@ class Drumkit : public H2Core::Object * 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 diff --git a/src/core/Basics/DrumkitComponent.cpp b/src/core/Basics/DrumkitComponent.cpp index e6997f8a2f..eab0707c20 100644 --- a/src/core/Basics/DrumkitComponent.cpp +++ b/src/core/Basics/DrumkitComponent.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Basics/DrumkitComponent.h b/src/core/Basics/DrumkitComponent.h index 0644e48678..8cf8567e7b 100644 --- a/src/core/Basics/DrumkitComponent.h +++ b/src/core/Basics/DrumkitComponent.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -82,7 +82,7 @@ class DrumkitComponent : public H2Core::Object * 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: int __id; /** Name of the DrumkitComponent. It is set by diff --git a/src/core/Basics/Instrument.cpp b/src/core/Basics/Instrument.cpp index ed9b79f6a7..bb7b831d4f 100644 --- a/src/core/Basics/Instrument.cpp +++ b/src/core/Basics/Instrument.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Basics/Instrument.h b/src/core/Basics/Instrument.h index bf16d34467..53c34f0fe0 100644 --- a/src/core/Basics/Instrument.h +++ b/src/core/Basics/Instrument.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -315,7 +315,7 @@ class Instrument : public H2Core::Object * 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: /** Identifier of an instrument, which should be diff --git a/src/core/Basics/InstrumentComponent.cpp b/src/core/Basics/InstrumentComponent.cpp index 6e5a92f2d7..5f605048f7 100644 --- a/src/core/Basics/InstrumentComponent.cpp +++ b/src/core/Basics/InstrumentComponent.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Basics/InstrumentComponent.h b/src/core/Basics/InstrumentComponent.h index e79951b7c2..b0ba81278d 100644 --- a/src/core/Basics/InstrumentComponent.h +++ b/src/core/Basics/InstrumentComponent.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -81,7 +81,7 @@ class InstrumentComponent : public H2Core::Object * 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: /** Component ID of the drumkit. It is set by diff --git a/src/core/Basics/InstrumentLayer.cpp b/src/core/Basics/InstrumentLayer.cpp index 20a5598dfe..7db0bf5996 100644 --- a/src/core/Basics/InstrumentLayer.cpp +++ b/src/core/Basics/InstrumentLayer.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Basics/InstrumentLayer.h b/src/core/Basics/InstrumentLayer.h index 0cadad55cf..15a2ad0315 100644 --- a/src/core/Basics/InstrumentLayer.h +++ b/src/core/Basics/InstrumentLayer.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -126,7 +126,7 @@ namespace H2Core * 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: float __gain; ///< ratio between the input sample and the output signal, 1.0 by default diff --git a/src/core/Basics/InstrumentList.cpp b/src/core/Basics/InstrumentList.cpp index 6f253272eb..98bf08a1c0 100644 --- a/src/core/Basics/InstrumentList.cpp +++ b/src/core/Basics/InstrumentList.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Basics/InstrumentList.h b/src/core/Basics/InstrumentList.h index 16baa9a2c4..eb4976b50c 100644 --- a/src/core/Basics/InstrumentList.h +++ b/src/core/Basics/InstrumentList.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -63,7 +63,7 @@ class InstrumentList : public H2Core::Object m_license( license ) { }; - QString toQString( const QString& sPrefix, bool bShort = true ) const; + QString toQString( const QString& sPrefix = "", bool bShort = true ) const; }; /** constructor */ @@ -241,7 +241,7 @@ class InstrumentList : public H2Core::Object * 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; /** Iteration */ std::vector>::iterator begin(); diff --git a/src/core/Basics/Note.cpp b/src/core/Basics/Note.cpp index c27d050d05..6c9b5c708f 100644 --- a/src/core/Basics/Note.cpp +++ b/src/core/Basics/Note.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Basics/Note.h b/src/core/Basics/Note.h index 6ce6c753de..0f53e94585 100644 --- a/src/core/Basics/Note.h +++ b/src/core/Basics/Note.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Basics/Pattern.cpp b/src/core/Basics/Pattern.cpp index 94d1a3d2a4..4f7960a8ba 100644 --- a/src/core/Basics/Pattern.cpp +++ b/src/core/Basics/Pattern.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -341,7 +341,7 @@ void Pattern::flattened_virtual_patterns_compute() void Pattern::addFlattenedVirtualPatterns( PatternList* pPatternList ) { for( virtual_patterns_cst_it_t it=__flattened_virtual_patterns.begin(); it!=__flattened_virtual_patterns.end(); ++it ) { - pPatternList->add( *it ); + pPatternList->add( *it, true ); } } diff --git a/src/core/Basics/Pattern.h b/src/core/Basics/Pattern.h index be48f80080..a4570b0467 100644 --- a/src/core/Basics/Pattern.h +++ b/src/core/Basics/Pattern.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -229,7 +229,7 @@ class Pattern : public H2Core::Object * 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: int __length; ///< the length of the pattern diff --git a/src/core/Basics/PatternList.cpp b/src/core/Basics/PatternList.cpp index 5c80d13200..4116f4f3fc 100644 --- a/src/core/Basics/PatternList.cpp +++ b/src/core/Basics/PatternList.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -94,26 +94,26 @@ void PatternList::save_to( XMLNode* pNode, const std::shared_ptr pIn } } -void PatternList::add( Pattern* pPattern ) +void PatternList::add( Pattern* pPattern, bool bAddVirtuals ) { assertAudioEngineLocked(); if ( pPattern == nullptr ) { ERRORLOG( "Provided pattern is invalid" ); return; } - + // do nothing if already in __patterns if ( index( pPattern ) != -1 ) { INFOLOG( "Provided pattern is already contained" ); return; } - else { + else if ( ! bAddVirtuals ) { // Check whether the pattern is contained as a virtual // pattern. for ( const auto& ppPattern : __patterns ) { auto pVirtualPatterns = ppPattern->get_virtual_patterns(); if ( pVirtualPatterns->find( pPattern ) != pVirtualPatterns->end() ) { - INFOLOG( "Provided pattern is already contained as virtual pattern" ); + // Provided pattern is already contained as virtual pattern return; } } @@ -132,6 +132,10 @@ void PatternList::add( Pattern* pPattern ) } __patterns.push_back( pPattern ); + + if ( bAddVirtuals ) { + pPattern->addFlattenedVirtualPatterns( this ); + } } void PatternList::insert( int nIdx, Pattern* pPattern ) @@ -321,10 +325,20 @@ QString PatternList::find_unused_pattern_name( QString sourceName, Pattern* igno return unusedPatternNameCandidate; } -int PatternList::longest_pattern_length() const { +int PatternList::longest_pattern_length( bool bIncludeVirtuals ) const { int nMax = -1; - for ( int i = 0; i < __patterns.size(); i++ ) { - nMax = std::max( nMax, __patterns[i]->get_length() ); + for ( const auto ppPattern : __patterns ) { + if ( ppPattern->get_length() > nMax ) { + nMax = ppPattern->get_length(); + } + + if ( bIncludeVirtuals ) { + for ( const auto ppVirtualPattern : *ppPattern->get_flattened_virtual_patterns() ) { + if ( ppVirtualPattern->get_length() > nMax ) { + nMax = ppVirtualPattern->get_length(); + } + } + } } return nMax; } diff --git a/src/core/Basics/PatternList.h b/src/core/Basics/PatternList.h index b322755806..cdc58e629e 100644 --- a/src/core/Basics/PatternList.h +++ b/src/core/Basics/PatternList.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -80,8 +80,10 @@ class XMLNode; /** * add a pattern to the list * \param pattern a pointer to the pattern to add + * \param bAddVirtuals Whether virtual patterns contained in + * @a pattern should be added too. */ - void add( Pattern* pattern ); + void add( Pattern* pattern, bool bAddVirtuals = false ); /** * insert a pattern into the list * \param idx the index to insert the pattern at @@ -169,9 +171,14 @@ class XMLNode; /** * Get the length of the longest pattern in the list + * + * \param bIncludeVirtuals In case there are virtual patterns + * present this argument specifies whether to include their + * contained patterns as well. + * * \return pattern length in ticks, -1 if list is empty */ - int longest_pattern_length() const; + int longest_pattern_length( bool bIncludeVirtuals = true ) const; /** Formatted string version for debugging purposes. * \param sPrefix String prefix which will be added in front of * every new line @@ -180,7 +187,7 @@ class XMLNode; * 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; /** Iteration */ std::vector::iterator begin(); diff --git a/src/core/Basics/Playlist.cpp b/src/core/Basics/Playlist.cpp index 92372e8b70..5739240c5d 100644 --- a/src/core/Basics/Playlist.cpp +++ b/src/core/Basics/Playlist.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Basics/Playlist.h b/src/core/Basics/Playlist.h index a12b4688c4..52fb2a11c3 100644 --- a/src/core/Basics/Playlist.h +++ b/src/core/Basics/Playlist.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -94,7 +94,7 @@ class Playlist : public H2Core::Object * 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: /** diff --git a/src/core/Basics/Sample.cpp b/src/core/Basics/Sample.cpp index d737e2d861..dacd5aa677 100644 --- a/src/core/Basics/Sample.cpp +++ b/src/core/Basics/Sample.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Basics/Sample.h b/src/core/Basics/Sample.h index 90d601cc44..d5d4e4596a 100644 --- a/src/core/Basics/Sample.h +++ b/src/core/Basics/Sample.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -102,7 +102,7 @@ class Sample : public H2Core::Object { return ( start_frame==b.start_frame && loop_frame==b.loop_frame && end_frame==b.end_frame && count==b.count && mode==b.mode ); } - QString toQString( const QString& sPrefix, bool bShort ) const; + QString toQString( const QString& sPrefix = "", bool bShort = true ) const; }; /** set of rubberband configuration flags */ @@ -126,7 +126,7 @@ class Sample : public H2Core::Object { return ( use==b.use && divider==b.divider && c_settings==b.c_settings && pitch==b.pitch ); } - QString toQString( const QString& sPrefix, bool bShort ) const; + QString toQString( const QString& sPrefix = "", bool bShort = true ) const; }; /** @@ -277,7 +277,7 @@ class Sample : public H2Core::Object * 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: /** * apply #__loops transformation to the sample diff --git a/src/core/Basics/Song.cpp b/src/core/Basics/Song.cpp index 00f39527bc..0149e01799 100644 --- a/src/core/Basics/Song.cpp +++ b/src/core/Basics/Song.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -1370,9 +1370,8 @@ std::vector> Song::getAllNotes() const { // end of the song). nColumnStartTick += MAX_NOTES; continue; - } else { - - pColumn->longest_pattern_length(); + } + else { for ( const auto& ppattern : *pColumn ) { if ( ppattern != nullptr ) { FOREACH_NOTE_CST_IT_BEGIN_END( ppattern->get_notes(), it ) { diff --git a/src/core/Basics/Song.h b/src/core/Basics/Song.h index 3e625afad1..6704def146 100644 --- a/src/core/Basics/Song.h +++ b/src/core/Basics/Song.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -295,7 +295,7 @@ class Song : public H2Core::Object, public std::enable_shared_from_thisComix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/CoreActionController.h b/src/core/CoreActionController.h index cc27eb07b4..67ce7f12fe 100644 --- a/src/core/CoreActionController.h +++ b/src/core/CoreActionController.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/EventQueue.cpp b/src/core/EventQueue.cpp index 131db23a28..e4f6ecdced 100644 --- a/src/core/EventQueue.cpp +++ b/src/core/EventQueue.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/EventQueue.h b/src/core/EventQueue.h index dbf8a6ce04..b864b3087a 100644 --- a/src/core/EventQueue.h +++ b/src/core/EventQueue.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -176,8 +176,9 @@ enum EventType { /** Locks the PatternEditor on the pattern currently played back.*/ EVENT_PATTERN_EDITOR_LOCKED, /** Triggered in case there is a relocation of the transport - * position due to an user interaction or an incoming - * MIDI/OSC/JACK command. + * position while trasnsport is not rolling. This can be either + * due to an user interaction or an incoming MIDI/OSC/JACK command + * or at the very end of the song in song mode. */ EVENT_RELOCATION, EVENT_SONG_SIZE_CHANGED, diff --git a/src/core/FX/Effects.cpp b/src/core/FX/Effects.cpp index dbe4a2a354..fa607ffd10 100644 --- a/src/core/FX/Effects.cpp +++ b/src/core/FX/Effects.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/FX/Effects.h b/src/core/FX/Effects.h index e411d2baa3..4681d821fe 100644 --- a/src/core/FX/Effects.h +++ b/src/core/FX/Effects.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/FX/LadspaFX.h b/src/core/FX/LadspaFX.h index 43105330ea..8e7a2e8ae7 100644 --- a/src/core/FX/LadspaFX.h +++ b/src/core/FX/LadspaFX.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/FX/LadspaFx.cpp b/src/core/FX/LadspaFx.cpp index f8d3d8baa7..266ba908e4 100644 --- a/src/core/FX/LadspaFx.cpp +++ b/src/core/FX/LadspaFx.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Globals.h b/src/core/Globals.h index edc4d86071..313fefa596 100644 --- a/src/core/Globals.h +++ b/src/core/Globals.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/H2Exception.h b/src/core/H2Exception.h index 0b0892f9e8..d5debc3d62 100644 --- a/src/core/H2Exception.h +++ b/src/core/H2Exception.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Helpers/Files.cpp b/src/core/Helpers/Files.cpp index c585b8c220..ccb22f6665 100644 --- a/src/core/Helpers/Files.cpp +++ b/src/core/Helpers/Files.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Helpers/Files.h b/src/core/Helpers/Files.h index 8c3b45688c..4d5d8eccf2 100644 --- a/src/core/Helpers/Files.h +++ b/src/core/Helpers/Files.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Helpers/Filesystem.cpp b/src/core/Helpers/Filesystem.cpp index 672fd5a519..6f10efb6a0 100644 --- a/src/core/Helpers/Filesystem.cpp +++ b/src/core/Helpers/Filesystem.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Helpers/Filesystem.h b/src/core/Helpers/Filesystem.h index 31c16bb378..904ecfbc0d 100644 --- a/src/core/Helpers/Filesystem.h +++ b/src/core/Helpers/Filesystem.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Helpers/Legacy.cpp b/src/core/Helpers/Legacy.cpp index cc0bffb12f..05dd512b92 100644 --- a/src/core/Helpers/Legacy.cpp +++ b/src/core/Helpers/Legacy.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Helpers/Legacy.h b/src/core/Helpers/Legacy.h index 4be1b42f87..025dd08ff1 100644 --- a/src/core/Helpers/Legacy.h +++ b/src/core/Helpers/Legacy.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Helpers/Random.cpp b/src/core/Helpers/Random.cpp index 90e329241c..0bd3623738 100644 --- a/src/core/Helpers/Random.cpp +++ b/src/core/Helpers/Random.cpp @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Helpers/Random.h b/src/core/Helpers/Random.h index 5fe5d61347..0feddb1e8b 100644 --- a/src/core/Helpers/Random.h +++ b/src/core/Helpers/Random.h @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Helpers/Translations.h b/src/core/Helpers/Translations.h index 1a7fc68ad0..76f2f6f925 100644 --- a/src/core/Helpers/Translations.h +++ b/src/core/Helpers/Translations.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Helpers/Xml.cpp b/src/core/Helpers/Xml.cpp index 73c93bc9ad..e6f2353555 100644 --- a/src/core/Helpers/Xml.cpp +++ b/src/core/Helpers/Xml.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Helpers/Xml.h b/src/core/Helpers/Xml.h index e090d7f5fa..2b14b24cfc 100644 --- a/src/core/Helpers/Xml.h +++ b/src/core/Helpers/Xml.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Hydrogen.cpp b/src/core/Hydrogen.cpp index 3fb277f357..dbc1064853 100644 --- a/src/core/Hydrogen.cpp +++ b/src/core/Hydrogen.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -1340,7 +1340,14 @@ void Hydrogen::setPatternMode( Song::PatternMode mode ) __song->setPatternMode( mode ); setIsModified( true ); - if ( m_pAudioEngine->getState() != AudioEngine::State::Playing ) { + if ( m_pAudioEngine->getState() != AudioEngine::State::Playing || + mode == Song::PatternMode::Selected ) { + // Only update the playing patterns in selected pattern + // mode or if transport is not rolling. In stacked pattern + // mode with transport rolling + // AudioEngine::updatePatternTransportPosition() will call + // the functions and activate the next patterns once the + // current ones are looped. m_pAudioEngine->updatePlayingPatterns(); m_pAudioEngine->clearNextPatterns(); } @@ -1630,37 +1637,6 @@ long Hydrogen::getTickForColumn( int nColumn ) const return totalTick; } -long Hydrogen::getPatternLength( int nPattern ) const -{ - std::shared_ptr pSong = getSong(); - - if ( pSong == nullptr ){ - return -1; - } - - std::vector< PatternList* > *pColumns = pSong->getPatternGroupVector(); - - int nPatternGroups = pColumns->size(); - if ( nPattern >= nPatternGroups ) { - if ( pSong->isLoopEnabled() ) { - nPattern = nPattern % nPatternGroups; - } else { - return MAX_NOTES; - } - } - - if ( nPattern < 1 ){ - return MAX_NOTES; - } - - PatternList* pPatternList = pColumns->at( nPattern - 1 ); - if ( pPatternList->size() > 0 ) { - return pPatternList->longest_pattern_length(); - } else { - return MAX_NOTES; - } -} - void Hydrogen::updateSongSize() { getAudioEngine()->updateSongSize(); } diff --git a/src/core/Hydrogen.h b/src/core/Hydrogen.h index 8fbd4d5b37..22f63a2fb9 100644 --- a/src/core/Hydrogen.h +++ b/src/core/Hydrogen.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -160,19 +160,6 @@ class Hydrogen : public H2Core::Object * - >= 0 : the total number of ticks passed. */ long getTickForColumn( int nColumn ) const; - /** - * Get the length (in ticks) of the @a nPattern th pattern. - * - * \param nPattern Position + 1 of the desired PatternList. - * \return - * - __-1__ : if not Song was initialized yet. - * - #MAX_NOTES : if @a nPattern was smaller than 1, larger - * than the length of the vector of the PatternList in - * Song::m_pPatternGroupSequence or no Pattern could be found - * in the PatternList at @a nPattern - 1. - * - __else__ : length of first Pattern found at @a nPattern. - */ - long getPatternLength( int nPattern ) const; Song::Mode getMode() const; /** Wrapper around Song::setMode() which also triggers @@ -474,7 +461,7 @@ void previewSample( Sample *pSample ); * 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: /** diff --git a/src/core/IO/AlsaAudioDriver.cpp b/src/core/IO/AlsaAudioDriver.cpp index 315fc49904..085cdfd20f 100644 --- a/src/core/IO/AlsaAudioDriver.cpp +++ b/src/core/IO/AlsaAudioDriver.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/AlsaAudioDriver.h b/src/core/IO/AlsaAudioDriver.h index bf395fce3c..22b50cde1b 100644 --- a/src/core/IO/AlsaAudioDriver.h +++ b/src/core/IO/AlsaAudioDriver.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/AlsaMidiDriver.cpp b/src/core/IO/AlsaMidiDriver.cpp index 40ada1b892..dbb981d3e5 100644 --- a/src/core/IO/AlsaMidiDriver.cpp +++ b/src/core/IO/AlsaMidiDriver.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/AlsaMidiDriver.h b/src/core/IO/AlsaMidiDriver.h index 2f2489bfbe..3a188ccd03 100644 --- a/src/core/IO/AlsaMidiDriver.h +++ b/src/core/IO/AlsaMidiDriver.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/AudioOutput.h b/src/core/IO/AudioOutput.h index e137d4886d..55904c372e 100644 --- a/src/core/IO/AudioOutput.h +++ b/src/core/IO/AudioOutput.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/CoreAudioDriver.cpp b/src/core/IO/CoreAudioDriver.cpp index 0c458be0bf..051dcd8ed6 100644 --- a/src/core/IO/CoreAudioDriver.cpp +++ b/src/core/IO/CoreAudioDriver.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://hydrogen.sourceforge.net * diff --git a/src/core/IO/CoreAudioDriver.h b/src/core/IO/CoreAudioDriver.h index 1bcef5b51d..8dcfd12a66 100644 --- a/src/core/IO/CoreAudioDriver.h +++ b/src/core/IO/CoreAudioDriver.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://hydrogen.sourceforge.net * diff --git a/src/core/IO/CoreMidiDriver.cpp b/src/core/IO/CoreMidiDriver.cpp index f861ca90bf..f7c5119730 100644 --- a/src/core/IO/CoreMidiDriver.cpp +++ b/src/core/IO/CoreMidiDriver.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/CoreMidiDriver.h b/src/core/IO/CoreMidiDriver.h index fa9f17de06..6069c546aa 100644 --- a/src/core/IO/CoreMidiDriver.h +++ b/src/core/IO/CoreMidiDriver.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/DiskWriterDriver.cpp b/src/core/IO/DiskWriterDriver.cpp index 672e79b09d..d7b0d993d6 100644 --- a/src/core/IO/DiskWriterDriver.cpp +++ b/src/core/IO/DiskWriterDriver.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -278,9 +278,16 @@ void* diskWriterDriver_thread( void* param ) } // this progress bar method is not exact but ok enough to give users a usable visible progress feedback - float fPercent = ( float )(patternPosition +1) / ( float )nColumns * 100.0; - EventQueue::get_instance()->push_event( EVENT_PROGRESS, ( int )fPercent ); + int nPercent = static_cast( ( float )(patternPosition +1) / + ( float )nColumns * 100.0 ); + if ( nPercent < 100 ) { + EventQueue::get_instance()->push_event( EVENT_PROGRESS, nPercent ); + } } + + // Explicitly mark export as finished. + EventQueue::get_instance()->push_event( EVENT_PROGRESS, 100 ); + delete[] pData; pData = nullptr; diff --git a/src/core/IO/DiskWriterDriver.h b/src/core/IO/DiskWriterDriver.h index 4b488d4f30..916fb6c67d 100644 --- a/src/core/IO/DiskWriterDriver.h +++ b/src/core/IO/DiskWriterDriver.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/FakeDriver.cpp b/src/core/IO/FakeDriver.cpp index d2cac1731b..d3455c4a8f 100644 --- a/src/core/IO/FakeDriver.cpp +++ b/src/core/IO/FakeDriver.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/FakeDriver.h b/src/core/IO/FakeDriver.h index 9d432cc4d1..69274d9c5f 100644 --- a/src/core/IO/FakeDriver.h +++ b/src/core/IO/FakeDriver.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/JackAudioDriver.cpp b/src/core/IO/JackAudioDriver.cpp index d78d28abb2..7e882279e3 100644 --- a/src/core/IO/JackAudioDriver.cpp +++ b/src/core/IO/JackAudioDriver.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/JackAudioDriver.h b/src/core/IO/JackAudioDriver.h index 894b43eaa8..74100a541b 100644 --- a/src/core/IO/JackAudioDriver.h +++ b/src/core/IO/JackAudioDriver.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/MidiCommon.h b/src/core/IO/MidiCommon.h index 995fdf590f..8f8df3012f 100644 --- a/src/core/IO/MidiCommon.h +++ b/src/core/IO/MidiCommon.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/MidiInput.cpp b/src/core/IO/MidiInput.cpp index ae275bcce1..ab7f02ed44 100644 --- a/src/core/IO/MidiInput.cpp +++ b/src/core/IO/MidiInput.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/MidiInput.h b/src/core/IO/MidiInput.h index 03609e59a1..fd80288c8a 100644 --- a/src/core/IO/MidiInput.h +++ b/src/core/IO/MidiInput.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/MidiOutput.cpp b/src/core/IO/MidiOutput.cpp index 5911872bbf..e3782c8bc0 100644 --- a/src/core/IO/MidiOutput.cpp +++ b/src/core/IO/MidiOutput.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/MidiOutput.h b/src/core/IO/MidiOutput.h index 78f36702fb..3ec4303986 100644 --- a/src/core/IO/MidiOutput.h +++ b/src/core/IO/MidiOutput.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/NullDriver.cpp b/src/core/IO/NullDriver.cpp index af32f68efd..71e402a2d2 100644 --- a/src/core/IO/NullDriver.cpp +++ b/src/core/IO/NullDriver.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/NullDriver.h b/src/core/IO/NullDriver.h index 84aad2adf6..4b5a0c094b 100644 --- a/src/core/IO/NullDriver.h +++ b/src/core/IO/NullDriver.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/OssDriver.cpp b/src/core/IO/OssDriver.cpp index 35a36d9abb..2e4e8ac3ca 100644 --- a/src/core/IO/OssDriver.cpp +++ b/src/core/IO/OssDriver.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/OssDriver.h b/src/core/IO/OssDriver.h index 3ab82bda20..1086ade518 100644 --- a/src/core/IO/OssDriver.h +++ b/src/core/IO/OssDriver.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/PortAudioDriver.cpp b/src/core/IO/PortAudioDriver.cpp index 20fcc05a70..c2821bbebf 100644 --- a/src/core/IO/PortAudioDriver.cpp +++ b/src/core/IO/PortAudioDriver.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/PortAudioDriver.h b/src/core/IO/PortAudioDriver.h index 54a1abd9b4..5bc6dd935a 100644 --- a/src/core/IO/PortAudioDriver.h +++ b/src/core/IO/PortAudioDriver.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/PortMidiDriver.cpp b/src/core/IO/PortMidiDriver.cpp index bfb4734d56..1e78b47bfb 100644 --- a/src/core/IO/PortMidiDriver.cpp +++ b/src/core/IO/PortMidiDriver.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/PortMidiDriver.h b/src/core/IO/PortMidiDriver.h index 4858483ae0..c410ddd637 100644 --- a/src/core/IO/PortMidiDriver.h +++ b/src/core/IO/PortMidiDriver.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/PulseAudioDriver.cpp b/src/core/IO/PulseAudioDriver.cpp index e2e42a038b..aebc864d76 100644 --- a/src/core/IO/PulseAudioDriver.cpp +++ b/src/core/IO/PulseAudioDriver.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/IO/PulseAudioDriver.h b/src/core/IO/PulseAudioDriver.h index 749590af60..ceb598eda6 100644 --- a/src/core/IO/PulseAudioDriver.h +++ b/src/core/IO/PulseAudioDriver.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Lash/LashClient.cpp b/src/core/Lash/LashClient.cpp index b0d758e4cb..b1aa67b755 100644 --- a/src/core/Lash/LashClient.cpp +++ b/src/core/Lash/LashClient.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Lash/LashClient.h b/src/core/Lash/LashClient.h index 83f6aa0d0b..f71f699571 100644 --- a/src/core/Lash/LashClient.h +++ b/src/core/Lash/LashClient.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/License.cpp b/src/core/License.cpp index a19ae675e7..3cbd65a746 100644 --- a/src/core/License.cpp +++ b/src/core/License.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/License.h b/src/core/License.h index aa5615d7ab..d807f541f0 100644 --- a/src/core/License.h +++ b/src/core/License.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Lilipond/Lilypond.cpp b/src/core/Lilipond/Lilypond.cpp index eb70afb6dc..c086c857b0 100644 --- a/src/core/Lilipond/Lilypond.cpp +++ b/src/core/Lilipond/Lilypond.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Lilipond/Lilypond.h b/src/core/Lilipond/Lilypond.h index 7e1adcc95d..7e57593f9b 100644 --- a/src/core/Lilipond/Lilypond.h +++ b/src/core/Lilipond/Lilypond.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Logger.cpp b/src/core/Logger.cpp index a27bf16c7e..0fef0a3d85 100644 --- a/src/core/Logger.cpp +++ b/src/core/Logger.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Logger.h b/src/core/Logger.h index 81c33d68bd..13032787fb 100644 --- a/src/core/Logger.h +++ b/src/core/Logger.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/MidiAction.cpp b/src/core/MidiAction.cpp index 9771d7b71c..0d0a169108 100644 --- a/src/core/MidiAction.cpp +++ b/src/core/MidiAction.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/MidiAction.h b/src/core/MidiAction.h index c2ccc056d1..fbc412db73 100644 --- a/src/core/MidiAction.h +++ b/src/core/MidiAction.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -77,7 +77,7 @@ class Action : public H2Core::Object { * 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 m_sType; diff --git a/src/core/MidiMap.cpp b/src/core/MidiMap.cpp index 19494ecf37..d000b0d2e4 100644 --- a/src/core/MidiMap.cpp +++ b/src/core/MidiMap.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/MidiMap.h b/src/core/MidiMap.h index 944ab1eae0..95c2fcad53 100644 --- a/src/core/MidiMap.h +++ b/src/core/MidiMap.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/NsmClient.cpp b/src/core/NsmClient.cpp index 845095e0c6..4cd064edfa 100644 --- a/src/core/NsmClient.cpp +++ b/src/core/NsmClient.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/NsmClient.h b/src/core/NsmClient.h index 07ed8e64d0..2334094298 100644 --- a/src/core/NsmClient.h +++ b/src/core/NsmClient.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Object.cpp b/src/core/Object.cpp index 22a467980a..5fd6eb46b3 100644 --- a/src/core/Object.cpp +++ b/src/core/Object.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Object.h b/src/core/Object.h index d62bd9fb16..49368ff3cc 100644 --- a/src/core/Object.h +++ b/src/core/Object.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/OscServer.cpp b/src/core/OscServer.cpp index 7a5d7f6726..bd8f35adc1 100644 --- a/src/core/OscServer.cpp +++ b/src/core/OscServer.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/OscServer.h b/src/core/OscServer.h index 57c3882290..8446f72f95 100644 --- a/src/core/OscServer.h +++ b/src/core/OscServer.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Preferences/Preferences.cpp b/src/core/Preferences/Preferences.cpp index 05cb4e27d8..d65debf3bc 100644 --- a/src/core/Preferences/Preferences.cpp +++ b/src/core/Preferences/Preferences.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Preferences/Preferences.h b/src/core/Preferences/Preferences.h index acab8786e5..8193013ae5 100644 --- a/src/core/Preferences/Preferences.h +++ b/src/core/Preferences/Preferences.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Preferences/Theme.cpp b/src/core/Preferences/Theme.cpp index a29737753d..d3211356fc 100644 --- a/src/core/Preferences/Theme.cpp +++ b/src/core/Preferences/Theme.cpp @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Preferences/Theme.h b/src/core/Preferences/Theme.h index f8ca7d6c44..977df90a10 100644 --- a/src/core/Preferences/Theme.h +++ b/src/core/Preferences/Theme.h @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Sampler/Interpolation.h b/src/core/Sampler/Interpolation.h index d5ecdf2cb5..56cc8cf83c 100644 --- a/src/core/Sampler/Interpolation.h +++ b/src/core/Sampler/Interpolation.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Sampler/Sampler.cpp b/src/core/Sampler/Sampler.cpp index cf7f9d9049..bee22e0ce2 100644 --- a/src/core/Sampler/Sampler.cpp +++ b/src/core/Sampler/Sampler.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Sampler/Sampler.h b/src/core/Sampler/Sampler.h index f3ef9e5d0a..f712f9ef76 100644 --- a/src/core/Sampler/Sampler.h +++ b/src/core/Sampler/Sampler.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Smf/SMF.h b/src/core/Smf/SMF.h index ee9c9edad9..41985aa31f 100644 --- a/src/core/Smf/SMF.h +++ b/src/core/Smf/SMF.h @@ -1,6 +1,7 @@ /* * Hydrogen - * Copyright(c) 2002-2004 by Alex >Comix< Cominu [comix@users.sourceforge.net] + * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Smf/SMFEvent.h b/src/core/Smf/SMFEvent.h index 5fc6c1d57e..e20810a90f 100644 --- a/src/core/Smf/SMFEvent.h +++ b/src/core/Smf/SMFEvent.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Smf/Smf.cpp b/src/core/Smf/Smf.cpp index f1182d9abb..908e23e41e 100644 --- a/src/core/Smf/Smf.cpp +++ b/src/core/Smf/Smf.cpp @@ -1,6 +1,7 @@ /* * Hydrogen - * Copyright(c) 2002-2004 by Alex >Comix< Cominu [comix@users.sourceforge.net] + * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Smf/SmfEvent.cpp b/src/core/Smf/SmfEvent.cpp index 3406ae617c..465b5b32b7 100644 --- a/src/core/Smf/SmfEvent.cpp +++ b/src/core/Smf/SmfEvent.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/SoundLibrary/SoundLibraryDatabase.cpp b/src/core/SoundLibrary/SoundLibraryDatabase.cpp index 1825b8f5cb..6d46266044 100644 --- a/src/core/SoundLibrary/SoundLibraryDatabase.cpp +++ b/src/core/SoundLibrary/SoundLibraryDatabase.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/SoundLibrary/SoundLibraryDatabase.h b/src/core/SoundLibrary/SoundLibraryDatabase.h index d87bb0c084..e8373deb7a 100644 --- a/src/core/SoundLibrary/SoundLibraryDatabase.h +++ b/src/core/SoundLibrary/SoundLibraryDatabase.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/SoundLibrary/SoundLibraryInfo.cpp b/src/core/SoundLibrary/SoundLibraryInfo.cpp index f3b37a06d7..b643422b8f 100644 --- a/src/core/SoundLibrary/SoundLibraryInfo.cpp +++ b/src/core/SoundLibrary/SoundLibraryInfo.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/SoundLibrary/SoundLibraryInfo.h b/src/core/SoundLibrary/SoundLibraryInfo.h index 3d1a8f63c2..0a007a9022 100644 --- a/src/core/SoundLibrary/SoundLibraryInfo.h +++ b/src/core/SoundLibrary/SoundLibraryInfo.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Synth/Synth.cpp b/src/core/Synth/Synth.cpp index 034613ebb5..d96b6f8c97 100644 --- a/src/core/Synth/Synth.cpp +++ b/src/core/Synth/Synth.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Synth/Synth.h b/src/core/Synth/Synth.h index b29bab8477..7258e4c2a6 100644 --- a/src/core/Synth/Synth.h +++ b/src/core/Synth/Synth.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Timehelper.cpp b/src/core/Timehelper.cpp index d3972ac0e2..4eb06ef51e 100644 --- a/src/core/Timehelper.cpp +++ b/src/core/Timehelper.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Timehelper.h b/src/core/Timehelper.h index afa61dfd3c..87908d3daa 100644 --- a/src/core/Timehelper.h +++ b/src/core/Timehelper.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Timeline.cpp b/src/core/Timeline.cpp index 703b70e866..613773d201 100644 --- a/src/core/Timeline.cpp +++ b/src/core/Timeline.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Timeline.h b/src/core/Timeline.h index 8b6aee584a..981817113b 100644 --- a/src/core/Timeline.h +++ b/src/core/Timeline.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -191,7 +191,7 @@ class Timeline : public H2Core::Object * 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: void sortTempoMarkers(); void sortTags(); diff --git a/src/core/Version.cpp b/src/core/Version.cpp index 284379d415..a26201d187 100644 --- a/src/core/Version.cpp +++ b/src/core/Version.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/Version.h b/src/core/Version.h index 1b6ab2f851..62c137fa5f 100644 --- a/src/core/Version.h +++ b/src/core/Version.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/core/rt_clock.h b/src/core/rt_clock.h index 0b1d4afe1c..15e2842676 100644 --- a/src/core/rt_clock.h +++ b/src/core/rt_clock.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/AboutDialog.cpp b/src/gui/src/AboutDialog.cpp index 1a35c4e4b1..4cd545358c 100644 --- a/src/gui/src/AboutDialog.cpp +++ b/src/gui/src/AboutDialog.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/AboutDialog.h b/src/gui/src/AboutDialog.h index 1e0f130f6e..6ce18aa1b3 100644 --- a/src/gui/src/AboutDialog.h +++ b/src/gui/src/AboutDialog.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/AboutDialogContributorList.cpp b/src/gui/src/AboutDialogContributorList.cpp index 441a58dee6..d3c298f014 100644 --- a/src/gui/src/AboutDialogContributorList.cpp +++ b/src/gui/src/AboutDialogContributorList.cpp @@ -3,6 +3,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -26,21 +27,18 @@ AboutDialogContributorList::AboutDialogContributorList() { std::vector v{ "theGreatWhiteShark" +,"phil" +,"Charbel Jacquin" ,"Colin McEwan" ,"Sebastian Moors" ,"oddtime" -,"Varik Valefor" -,"Olivier Humbert" -,"Clara Hobbs" -,"Przemysław Sitek" -,"Charbel Jacquin" -,"freddii" -,"daryl" -,"Jérémy Zurcher" -,"Guocheng" -,"David Runge" -,"Darío Hereñú" -,"Aaron" +,"Julien de Kozak" +,"luz paz" +,"Paul Vint" +,"Daniele Medri" +,"Raphael Graf" +,"Houston4444" +,"Dan Church" }; m_pContributorList = std::make_shared>(v); } diff --git a/src/gui/src/AboutDialogContributorList.h b/src/gui/src/AboutDialogContributorList.h index b2b7e5e823..d3b1a5d014 100644 --- a/src/gui/src/AboutDialogContributorList.h +++ b/src/gui/src/AboutDialogContributorList.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/AudioEngineInfoForm.cpp b/src/gui/src/AudioEngineInfoForm.cpp index a8d8910b57..fcc895c0c1 100644 --- a/src/gui/src/AudioEngineInfoForm.cpp +++ b/src/gui/src/AudioEngineInfoForm.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/AudioEngineInfoForm.h b/src/gui/src/AudioEngineInfoForm.h index 1f34880d48..cb3e8dde1e 100644 --- a/src/gui/src/AudioEngineInfoForm.h +++ b/src/gui/src/AudioEngineInfoForm.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/AudioFileBrowser/AudioFileBrowser.cpp b/src/gui/src/AudioFileBrowser/AudioFileBrowser.cpp index 98add8cca0..3cc50fafe5 100644 --- a/src/gui/src/AudioFileBrowser/AudioFileBrowser.cpp +++ b/src/gui/src/AudioFileBrowser/AudioFileBrowser.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/AudioFileBrowser/AudioFileBrowser.h b/src/gui/src/AudioFileBrowser/AudioFileBrowser.h index 1dc5a0143c..9d425c8005 100644 --- a/src/gui/src/AudioFileBrowser/AudioFileBrowser.h +++ b/src/gui/src/AudioFileBrowser/AudioFileBrowser.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/AudioFileBrowser/SampleWaveDisplay.cpp b/src/gui/src/AudioFileBrowser/SampleWaveDisplay.cpp index 7abab0c9e7..25a2908bb5 100644 --- a/src/gui/src/AudioFileBrowser/SampleWaveDisplay.cpp +++ b/src/gui/src/AudioFileBrowser/SampleWaveDisplay.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/AudioFileBrowser/SampleWaveDisplay.h b/src/gui/src/AudioFileBrowser/SampleWaveDisplay.h index e3eb6c3379..c5fb353ee5 100644 --- a/src/gui/src/AudioFileBrowser/SampleWaveDisplay.h +++ b/src/gui/src/AudioFileBrowser/SampleWaveDisplay.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/CommonStrings.cpp b/src/gui/src/CommonStrings.cpp index 35620d30a4..6f0afb3b42 100644 --- a/src/gui/src/CommonStrings.cpp +++ b/src/gui/src/CommonStrings.cpp @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright (C) 2021 The hydrogen development team + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Director.cpp b/src/gui/src/Director.cpp index 3ac174bcba..68533232d1 100644 --- a/src/gui/src/Director.cpp +++ b/src/gui/src/Director.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Director.h b/src/gui/src/Director.h index 25aac48c73..50b0de0617 100644 --- a/src/gui/src/Director.h +++ b/src/gui/src/Director.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/EventListener.h b/src/gui/src/EventListener.h index 214f9a04a3..89a91d58f3 100644 --- a/src/gui/src/EventListener.h +++ b/src/gui/src/EventListener.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/ExportMidiDialog.cpp b/src/gui/src/ExportMidiDialog.cpp index de4ae3f188..df0ee88cc5 100644 --- a/src/gui/src/ExportMidiDialog.cpp +++ b/src/gui/src/ExportMidiDialog.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/ExportMidiDialog.h b/src/gui/src/ExportMidiDialog.h index 1b06c77a58..d4d475433a 100644 --- a/src/gui/src/ExportMidiDialog.h +++ b/src/gui/src/ExportMidiDialog.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/ExportSongDialog.cpp b/src/gui/src/ExportSongDialog.cpp index c48246f3a7..670fb37504 100644 --- a/src/gui/src/ExportSongDialog.cpp +++ b/src/gui/src/ExportSongDialog.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/ExportSongDialog.h b/src/gui/src/ExportSongDialog.h index 87eaa1f2cd..ac782e0541 100644 --- a/src/gui/src/ExportSongDialog.h +++ b/src/gui/src/ExportSongDialog.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/FilesystemInfoForm.cpp b/src/gui/src/FilesystemInfoForm.cpp index 87030a0228..4a1d46eec7 100644 --- a/src/gui/src/FilesystemInfoForm.cpp +++ b/src/gui/src/FilesystemInfoForm.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/FilesystemInfoForm.h b/src/gui/src/FilesystemInfoForm.h index 8eeab092b5..ea7fcf92d8 100644 --- a/src/gui/src/FilesystemInfoForm.h +++ b/src/gui/src/FilesystemInfoForm.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/HydrogenApp.cpp b/src/gui/src/HydrogenApp.cpp index 6bce5e7852..6d807889dd 100644 --- a/src/gui/src/HydrogenApp.cpp +++ b/src/gui/src/HydrogenApp.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/HydrogenApp.h b/src/gui/src/HydrogenApp.h index 616515d98e..99a92d7504 100644 --- a/src/gui/src/HydrogenApp.h +++ b/src/gui/src/HydrogenApp.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/InstrumentEditor/InstrumentEditor.cpp b/src/gui/src/InstrumentEditor/InstrumentEditor.cpp index 927f8df328..d49656f66c 100644 --- a/src/gui/src/InstrumentEditor/InstrumentEditor.cpp +++ b/src/gui/src/InstrumentEditor/InstrumentEditor.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/InstrumentEditor/InstrumentEditor.h b/src/gui/src/InstrumentEditor/InstrumentEditor.h index 0d118c1b41..536a659e93 100644 --- a/src/gui/src/InstrumentEditor/InstrumentEditor.h +++ b/src/gui/src/InstrumentEditor/InstrumentEditor.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/InstrumentEditor/InstrumentEditorPanel.cpp b/src/gui/src/InstrumentEditor/InstrumentEditorPanel.cpp index 9497867d99..64e6ab702f 100644 --- a/src/gui/src/InstrumentEditor/InstrumentEditorPanel.cpp +++ b/src/gui/src/InstrumentEditor/InstrumentEditorPanel.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/InstrumentEditor/InstrumentEditorPanel.h b/src/gui/src/InstrumentEditor/InstrumentEditorPanel.h index 5186ed9d86..bf70fcf593 100644 --- a/src/gui/src/InstrumentEditor/InstrumentEditorPanel.h +++ b/src/gui/src/InstrumentEditor/InstrumentEditorPanel.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/InstrumentEditor/LayerPreview.cpp b/src/gui/src/InstrumentEditor/LayerPreview.cpp index 20d5172e27..c2adc75811 100644 --- a/src/gui/src/InstrumentEditor/LayerPreview.cpp +++ b/src/gui/src/InstrumentEditor/LayerPreview.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/InstrumentEditor/LayerPreview.h b/src/gui/src/InstrumentEditor/LayerPreview.h index 9955803512..315d8c9f73 100644 --- a/src/gui/src/InstrumentEditor/LayerPreview.h +++ b/src/gui/src/InstrumentEditor/LayerPreview.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/InstrumentEditor/WaveDisplay.cpp b/src/gui/src/InstrumentEditor/WaveDisplay.cpp index d457d45a18..6c1dcf4d22 100644 --- a/src/gui/src/InstrumentEditor/WaveDisplay.cpp +++ b/src/gui/src/InstrumentEditor/WaveDisplay.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/InstrumentEditor/WaveDisplay.h b/src/gui/src/InstrumentEditor/WaveDisplay.h index 5b49933ff6..f80c273185 100644 --- a/src/gui/src/InstrumentEditor/WaveDisplay.h +++ b/src/gui/src/InstrumentEditor/WaveDisplay.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/InstrumentRack.cpp b/src/gui/src/InstrumentRack.cpp index f5f46743ce..c16c5d4afb 100644 --- a/src/gui/src/InstrumentRack.cpp +++ b/src/gui/src/InstrumentRack.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/InstrumentRack.h b/src/gui/src/InstrumentRack.h index 0706ea24df..cef9b5a193 100644 --- a/src/gui/src/InstrumentRack.h +++ b/src/gui/src/InstrumentRack.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/LadspaFXProperties.cpp b/src/gui/src/LadspaFXProperties.cpp index 43f8fb8211..a6b45d54e4 100644 --- a/src/gui/src/LadspaFXProperties.cpp +++ b/src/gui/src/LadspaFXProperties.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/LadspaFXProperties.h b/src/gui/src/LadspaFXProperties.h index 04517b1857..6721543fd9 100644 --- a/src/gui/src/LadspaFXProperties.h +++ b/src/gui/src/LadspaFXProperties.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/LadspaFXSelector.cpp b/src/gui/src/LadspaFXSelector.cpp index f1c07c284d..4737777426 100644 --- a/src/gui/src/LadspaFXSelector.cpp +++ b/src/gui/src/LadspaFXSelector.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/LadspaFXSelector.h b/src/gui/src/LadspaFXSelector.h index 62ec70aff3..c515f98b55 100644 --- a/src/gui/src/LadspaFXSelector.h +++ b/src/gui/src/LadspaFXSelector.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/MainForm.cpp b/src/gui/src/MainForm.cpp index 34d80c2173..16a3c43326 100644 --- a/src/gui/src/MainForm.cpp +++ b/src/gui/src/MainForm.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/MainForm.h b/src/gui/src/MainForm.h index ed8071cd62..cfac4c4fb7 100644 --- a/src/gui/src/MainForm.h +++ b/src/gui/src/MainForm.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Mixer/Mixer.cpp b/src/gui/src/Mixer/Mixer.cpp index a6c7ce6681..37271ee8ef 100644 --- a/src/gui/src/Mixer/Mixer.cpp +++ b/src/gui/src/Mixer/Mixer.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Mixer/Mixer.h b/src/gui/src/Mixer/Mixer.h index 120a213340..ccf1767ac7 100644 --- a/src/gui/src/Mixer/Mixer.h +++ b/src/gui/src/Mixer/Mixer.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Mixer/MixerLine.cpp b/src/gui/src/Mixer/MixerLine.cpp index fd49228be8..610ce61eee 100644 --- a/src/gui/src/Mixer/MixerLine.cpp +++ b/src/gui/src/Mixer/MixerLine.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Mixer/MixerLine.h b/src/gui/src/Mixer/MixerLine.h index b7e123599c..c3b8328ace 100644 --- a/src/gui/src/Mixer/MixerLine.h +++ b/src/gui/src/Mixer/MixerLine.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Mixer/MixerSettingsDialog.cpp b/src/gui/src/Mixer/MixerSettingsDialog.cpp index d8afc2e8e2..166381a3c7 100644 --- a/src/gui/src/Mixer/MixerSettingsDialog.cpp +++ b/src/gui/src/Mixer/MixerSettingsDialog.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Mixer/MixerSettingsDialog.h b/src/gui/src/Mixer/MixerSettingsDialog.h index ede9b95158..bd12dd38fa 100644 --- a/src/gui/src/Mixer/MixerSettingsDialog.h +++ b/src/gui/src/Mixer/MixerSettingsDialog.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/PatternEditor/DrumPatternEditor.cpp b/src/gui/src/PatternEditor/DrumPatternEditor.cpp index 33b3e6edf8..cc8abbfcfd 100644 --- a/src/gui/src/PatternEditor/DrumPatternEditor.cpp +++ b/src/gui/src/PatternEditor/DrumPatternEditor.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -90,12 +90,18 @@ void DrumPatternEditor::updateEditor( bool bPatternOnly ) m_nActiveWidth = PatternEditor::nMargin + m_fGridWidth * m_pPattern->get_length(); - if ( pHydrogen->getPatternMode() == Song::PatternMode::Stacked ) { + if ( pHydrogen->getPatternMode() == Song::PatternMode::Stacked || + ( pHydrogen->getPatternMode() == Song::PatternMode::Selected && + m_pPattern->get_flattened_virtual_patterns()->size() > 0 ) ) { + // Virtual patterns are already expanded in the playing + // patterns and must not be considered when determining + // the longest one. m_nEditorWidth = std::max( PatternEditor::nMargin + m_fGridWidth * - pAudioEngine->getPlayingPatterns()->longest_pattern_length() + 1, + pAudioEngine->getPlayingPatterns()->longest_pattern_length( false ) + 1, static_cast(m_nActiveWidth) ); - } else { + } + else { m_nEditorWidth = m_nActiveWidth; } } @@ -1400,6 +1406,10 @@ void DrumPatternEditor::drumkitLoadedEvent() { updateEditor(); } +void DrumPatternEditor::songModeActivationEvent() { + updateEditor(); +} + ///NotePropertiesRuler undo redo action void DrumPatternEditor::undoRedoAction( int column, PatternEditor::Mode mode, diff --git a/src/gui/src/PatternEditor/DrumPatternEditor.h b/src/gui/src/PatternEditor/DrumPatternEditor.h index 0d3f92911f..0ec61e7c00 100644 --- a/src/gui/src/PatternEditor/DrumPatternEditor.h +++ b/src/gui/src/PatternEditor/DrumPatternEditor.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -56,6 +56,7 @@ class DrumPatternEditor : public PatternEditor, protected WidgetWithScalableFont virtual void selectedPatternChangedEvent() override; virtual void selectedInstrumentChangedEvent() override; virtual void drumkitLoadedEvent() override; + virtual void songModeActivationEvent() override; //~ Implements EventListener interface void addOrDeleteNoteAction( int nColumn, int row, diff --git a/src/gui/src/PatternEditor/NotePropertiesRuler.cpp b/src/gui/src/PatternEditor/NotePropertiesRuler.cpp index 319d9a1108..cabf2c8604 100644 --- a/src/gui/src/PatternEditor/NotePropertiesRuler.cpp +++ b/src/gui/src/PatternEditor/NotePropertiesRuler.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -1405,11 +1405,15 @@ void NotePropertiesRuler::updateEditor( bool ) m_nActiveWidth = PatternEditor::nMargin + m_fGridWidth * m_pPattern->get_length(); - if ( pHydrogen->getPatternMode() == - Song::PatternMode::Stacked ) { + if ( pHydrogen->getPatternMode() == Song::PatternMode::Stacked || + ( pHydrogen->getPatternMode() == Song::PatternMode::Selected && + m_pPattern->get_flattened_virtual_patterns()->size() > 0 ) ) { + // Virtual patterns are already expanded in the playing + // patterns and must not be considered when determining + // the longest one. m_nEditorWidth = std::max( PatternEditor::nMargin + m_fGridWidth * - pHydrogen->getAudioEngine()->getPlayingPatterns()->longest_pattern_length() + 1, + pHydrogen->getAudioEngine()->getPlayingPatterns()->longest_pattern_length( false ) + 1, static_cast(m_nActiveWidth) ); } else { m_nEditorWidth = m_nActiveWidth; @@ -1464,6 +1468,10 @@ void NotePropertiesRuler::selectedInstrumentChangedEvent() updateEditor(); } +void NotePropertiesRuler::songModeActivationEvent() { + updateEditor(); +} + std::vector NotePropertiesRuler::elementsIntersecting( QRect r ) { std::vector result; if ( m_pPattern == nullptr ) { diff --git a/src/gui/src/PatternEditor/NotePropertiesRuler.h b/src/gui/src/PatternEditor/NotePropertiesRuler.h index 847425a5a2..e04bc316f1 100644 --- a/src/gui/src/PatternEditor/NotePropertiesRuler.h +++ b/src/gui/src/PatternEditor/NotePropertiesRuler.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -123,6 +123,7 @@ class NotePropertiesRuler : public PatternEditor, protected WidgetWithScalableFo // Implements EventListener interface virtual void selectedPatternChangedEvent() override; virtual void selectedInstrumentChangedEvent() override; + virtual void songModeActivationEvent() override; //~ Implements EventListener interface int m_nSelectedPatternNumber; diff --git a/src/gui/src/PatternEditor/PatternEditor.cpp b/src/gui/src/PatternEditor/PatternEditor.cpp index 01b92aab35..377a341279 100644 --- a/src/gui/src/PatternEditor/PatternEditor.cpp +++ b/src/gui/src/PatternEditor/PatternEditor.cpp @@ -1,6 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by the Hydrogen Team + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -844,12 +845,22 @@ std::vector< Pattern *> PatternEditor::getPatternsToShow( void ) Hydrogen *pHydrogen = Hydrogen::get_instance(); std::vector patterns; - // Add stacked-mode patterns - if ( pHydrogen->getPatternMode() == Song::PatternMode::Stacked ) { + // Add stacked-mode patterns as well as virtual ones. + if ( pHydrogen->getPatternMode() == Song::PatternMode::Stacked || + ( m_pPattern != nullptr && + pHydrogen->getPatternMode() == Song::PatternMode::Selected && + m_pPattern->get_flattened_virtual_patterns()->size() > 0 ) ) { + m_pAudioEngine->lock( RIGHT_HERE ); std::set< Pattern *> patternSet; - for ( const PatternList *pPatternList : { m_pAudioEngine->getPlayingPatterns(), - m_pAudioEngine->getNextPatterns() } ) { + + std::vector patternLists; + patternLists.push_back( m_pAudioEngine->getPlayingPatterns() ); + if ( pHydrogen->getPatternMode() == Song::PatternMode::Stacked ) { + patternLists.push_back( m_pAudioEngine->getNextPatterns() ); + } + + for ( const PatternList *pPatternList : patternLists ) { for ( int i = 0; i < pPatternList->size(); i++) { Pattern *pPattern = pPatternList->get( i ); if ( pPattern != m_pPattern ) { diff --git a/src/gui/src/PatternEditor/PatternEditor.h b/src/gui/src/PatternEditor/PatternEditor.h index 60c891c5dc..917f8d4337 100644 --- a/src/gui/src/PatternEditor/PatternEditor.h +++ b/src/gui/src/PatternEditor/PatternEditor.h @@ -1,6 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2020 by the Hydrogen Team + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/PatternEditor/PatternEditorInstrumentList.cpp b/src/gui/src/PatternEditor/PatternEditorInstrumentList.cpp index 11ecc669ef..a03b0251c7 100644 --- a/src/gui/src/PatternEditor/PatternEditorInstrumentList.cpp +++ b/src/gui/src/PatternEditor/PatternEditorInstrumentList.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/PatternEditor/PatternEditorInstrumentList.h b/src/gui/src/PatternEditor/PatternEditorInstrumentList.h index 891a33e42c..eeae7e3bed 100644 --- a/src/gui/src/PatternEditor/PatternEditorInstrumentList.h +++ b/src/gui/src/PatternEditor/PatternEditorInstrumentList.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/PatternEditor/PatternEditorPanel.cpp b/src/gui/src/PatternEditor/PatternEditorPanel.cpp index 65a09d9c7b..e94bffa26c 100644 --- a/src/gui/src/PatternEditor/PatternEditorPanel.cpp +++ b/src/gui/src/PatternEditor/PatternEditorPanel.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/PatternEditor/PatternEditorPanel.h b/src/gui/src/PatternEditor/PatternEditorPanel.h index acf96544a8..3db746ece7 100644 --- a/src/gui/src/PatternEditor/PatternEditorPanel.h +++ b/src/gui/src/PatternEditor/PatternEditorPanel.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/PatternEditor/PatternEditorRuler.cpp b/src/gui/src/PatternEditor/PatternEditorRuler.cpp index 67c22000e5..5d729a071f 100644 --- a/src/gui/src/PatternEditor/PatternEditorRuler.cpp +++ b/src/gui/src/PatternEditor/PatternEditorRuler.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -515,11 +515,14 @@ void PatternEditorRuler::updateActiveRange() { auto pPlayingPatterns = pAudioEngine->getPlayingPatterns(); if ( pPlayingPatterns->size() != 0 ) { - nTicksInPattern = pPlayingPatterns->longest_pattern_length(); + // Virtual patterns are already expanded in the playing + // patterns and must not be considered when determining the + // longest one. + nTicksInPattern = pPlayingPatterns->longest_pattern_length( false ); } - - int nWidthActive = PatternEditor::nMargin + nTicksInPattern * m_fGridWidth; + int nWidthActive = PatternEditor::nMargin + nTicksInPattern * m_fGridWidth; + if ( m_nWidthActive != nWidthActive ) { m_nWidthActive = nWidthActive; @@ -566,7 +569,7 @@ void PatternEditorRuler::zoomOut() void PatternEditorRuler::songModeActivationEvent() { - updatePosition(); + updateEditor( true ); } void PatternEditorRuler::stateChangedEvent( H2Core::AudioEngine::State ) diff --git a/src/gui/src/PatternEditor/PatternEditorRuler.h b/src/gui/src/PatternEditor/PatternEditorRuler.h index aa4bca4ec5..42946a6fd5 100644 --- a/src/gui/src/PatternEditor/PatternEditorRuler.h +++ b/src/gui/src/PatternEditor/PatternEditorRuler.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/PatternEditor/PianoRollEditor.cpp b/src/gui/src/PatternEditor/PianoRollEditor.cpp index 63c3b82fe5..56a52141d2 100644 --- a/src/gui/src/PatternEditor/PianoRollEditor.cpp +++ b/src/gui/src/PatternEditor/PianoRollEditor.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -90,10 +90,15 @@ void PianoRollEditor::updateEditor( bool bPatternOnly ) m_nActiveWidth = PatternEditor::nMargin + m_fGridWidth * m_pPattern->get_length(); - if ( pHydrogen->getPatternMode() == Song::PatternMode::Stacked ) { + if ( pHydrogen->getPatternMode() == Song::PatternMode::Stacked || + ( pHydrogen->getPatternMode() == Song::PatternMode::Selected && + m_pPattern->get_flattened_virtual_patterns()->size() > 0 ) ) { + // Virtual patterns are already expanded in the playing + // patterns and must not be considered when determining + // the longest one. m_nEditorWidth = std::max( PatternEditor::nMargin + m_fGridWidth * - pHydrogen->getAudioEngine()->getPlayingPatterns()->longest_pattern_length() + 1, + pHydrogen->getAudioEngine()->getPlayingPatterns()->longest_pattern_length( false ) + 1, static_cast(m_nActiveWidth) ); } else { m_nEditorWidth = m_nActiveWidth; @@ -138,13 +143,14 @@ void PianoRollEditor::selectedInstrumentChangedEvent() updateEditor( true ); } - void PianoRollEditor::selectedPatternChangedEvent() { updateEditor(); } - +void PianoRollEditor::songModeActivationEvent() { + updateEditor(); +} void PianoRollEditor::paintEvent(QPaintEvent *ev) { diff --git a/src/gui/src/PatternEditor/PianoRollEditor.h b/src/gui/src/PatternEditor/PianoRollEditor.h index 809865bec0..37f24670fa 100644 --- a/src/gui/src/PatternEditor/PianoRollEditor.h +++ b/src/gui/src/PatternEditor/PianoRollEditor.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -49,6 +49,7 @@ class PianoRollEditor: public PatternEditor, protected WidgetWithScalableFont<7, // Implements EventListener interface virtual void selectedPatternChangedEvent() override; virtual void selectedInstrumentChangedEvent() override; + virtual void songModeActivationEvent() override; //~ Implements EventListener interface void addOrDeleteNoteAction( int nColumn, diff --git a/src/gui/src/PatternPropertiesDialog.cpp b/src/gui/src/PatternPropertiesDialog.cpp index 365eb93a71..97026a0d4b 100644 --- a/src/gui/src/PatternPropertiesDialog.cpp +++ b/src/gui/src/PatternPropertiesDialog.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/PatternPropertiesDialog.h b/src/gui/src/PatternPropertiesDialog.h index 2e268a75c8..7911db74ce 100644 --- a/src/gui/src/PatternPropertiesDialog.h +++ b/src/gui/src/PatternPropertiesDialog.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/PlayerControl.cpp b/src/gui/src/PlayerControl.cpp index 936093f4b8..d8f8a951c5 100644 --- a/src/gui/src/PlayerControl.cpp +++ b/src/gui/src/PlayerControl.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/PlayerControl.h b/src/gui/src/PlayerControl.h index a647b2a0fd..6b2cf00e50 100644 --- a/src/gui/src/PlayerControl.h +++ b/src/gui/src/PlayerControl.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/PlaylistEditor/PlaylistDialog.cpp b/src/gui/src/PlaylistEditor/PlaylistDialog.cpp index c388d07e0c..dd23e99ada 100644 --- a/src/gui/src/PlaylistEditor/PlaylistDialog.cpp +++ b/src/gui/src/PlaylistEditor/PlaylistDialog.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/PlaylistEditor/PlaylistDialog.h b/src/gui/src/PlaylistEditor/PlaylistDialog.h index 4fce0d01f8..d30b6f85ec 100644 --- a/src/gui/src/PlaylistEditor/PlaylistDialog.h +++ b/src/gui/src/PlaylistEditor/PlaylistDialog.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/PreferencesDialog/PreferencesDialog.cpp b/src/gui/src/PreferencesDialog/PreferencesDialog.cpp index 9ad2bc98ef..378c3260e4 100644 --- a/src/gui/src/PreferencesDialog/PreferencesDialog.cpp +++ b/src/gui/src/PreferencesDialog/PreferencesDialog.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/PreferencesDialog/PreferencesDialog.h b/src/gui/src/PreferencesDialog/PreferencesDialog.h index f6a803a306..e2f9a876be 100644 --- a/src/gui/src/PreferencesDialog/PreferencesDialog.h +++ b/src/gui/src/PreferencesDialog/PreferencesDialog.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Reporter.cpp b/src/gui/src/Reporter.cpp index 2886269f1b..851b2aa406 100644 --- a/src/gui/src/Reporter.cpp +++ b/src/gui/src/Reporter.cpp @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright(c) 2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Reporter.h b/src/gui/src/Reporter.h index b3415ee108..b5894d0cad 100644 --- a/src/gui/src/Reporter.h +++ b/src/gui/src/Reporter.h @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright(c) 2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SampleEditor/DetailWaveDisplay.cpp b/src/gui/src/SampleEditor/DetailWaveDisplay.cpp index f8ff8350b9..e3b18d864c 100644 --- a/src/gui/src/SampleEditor/DetailWaveDisplay.cpp +++ b/src/gui/src/SampleEditor/DetailWaveDisplay.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SampleEditor/DetailWaveDisplay.h b/src/gui/src/SampleEditor/DetailWaveDisplay.h index 40249bea33..270a122538 100644 --- a/src/gui/src/SampleEditor/DetailWaveDisplay.h +++ b/src/gui/src/SampleEditor/DetailWaveDisplay.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SampleEditor/MainSampleWaveDisplay.cpp b/src/gui/src/SampleEditor/MainSampleWaveDisplay.cpp index 03bf7b4d5a..b0d3d9c3ae 100644 --- a/src/gui/src/SampleEditor/MainSampleWaveDisplay.cpp +++ b/src/gui/src/SampleEditor/MainSampleWaveDisplay.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SampleEditor/MainSampleWaveDisplay.h b/src/gui/src/SampleEditor/MainSampleWaveDisplay.h index c2a841eac0..e326e66752 100644 --- a/src/gui/src/SampleEditor/MainSampleWaveDisplay.h +++ b/src/gui/src/SampleEditor/MainSampleWaveDisplay.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SampleEditor/SampleEditor.cpp b/src/gui/src/SampleEditor/SampleEditor.cpp index b23deeb55f..4918520954 100644 --- a/src/gui/src/SampleEditor/SampleEditor.cpp +++ b/src/gui/src/SampleEditor/SampleEditor.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SampleEditor/SampleEditor.h b/src/gui/src/SampleEditor/SampleEditor.h index f6d0a976fa..348c7f9759 100644 --- a/src/gui/src/SampleEditor/SampleEditor.h +++ b/src/gui/src/SampleEditor/SampleEditor.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SampleEditor/TargetWaveDisplay.cpp b/src/gui/src/SampleEditor/TargetWaveDisplay.cpp index 42f99c07a5..2e96232be2 100644 --- a/src/gui/src/SampleEditor/TargetWaveDisplay.cpp +++ b/src/gui/src/SampleEditor/TargetWaveDisplay.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SampleEditor/TargetWaveDisplay.h b/src/gui/src/SampleEditor/TargetWaveDisplay.h index c494e91b31..0dc5b1715e 100644 --- a/src/gui/src/SampleEditor/TargetWaveDisplay.h +++ b/src/gui/src/SampleEditor/TargetWaveDisplay.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Selection.h b/src/gui/src/Selection.h index 3c6900da21..b46d8e634a 100644 --- a/src/gui/src/Selection.h +++ b/src/gui/src/Selection.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/ShotList.cpp b/src/gui/src/ShotList.cpp index 0d38b525e3..4a949e500e 100644 --- a/src/gui/src/ShotList.cpp +++ b/src/gui/src/ShotList.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/ShotList.h b/src/gui/src/ShotList.h index 61f4cb8074..3084d35df3 100644 --- a/src/gui/src/ShotList.h +++ b/src/gui/src/ShotList.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Skin.cpp b/src/gui/src/Skin.cpp index 450fbd2273..3ac2d51a9e 100644 --- a/src/gui/src/Skin.cpp +++ b/src/gui/src/Skin.cpp @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Skin.h b/src/gui/src/Skin.h index 043321e125..aecdc14ae8 100644 --- a/src/gui/src/Skin.h +++ b/src/gui/src/Skin.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SongEditor/PatternFillDialog.cpp b/src/gui/src/SongEditor/PatternFillDialog.cpp index e9afab84ca..740028f55f 100644 --- a/src/gui/src/SongEditor/PatternFillDialog.cpp +++ b/src/gui/src/SongEditor/PatternFillDialog.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SongEditor/PatternFillDialog.h b/src/gui/src/SongEditor/PatternFillDialog.h index 9f03c4ba98..236460c5f4 100644 --- a/src/gui/src/SongEditor/PatternFillDialog.h +++ b/src/gui/src/SongEditor/PatternFillDialog.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SongEditor/PlaybackTrackWaveDisplay.cpp b/src/gui/src/SongEditor/PlaybackTrackWaveDisplay.cpp index e2ff346ea4..b7f4fba31f 100644 --- a/src/gui/src/SongEditor/PlaybackTrackWaveDisplay.cpp +++ b/src/gui/src/SongEditor/PlaybackTrackWaveDisplay.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SongEditor/PlaybackTrackWaveDisplay.h b/src/gui/src/SongEditor/PlaybackTrackWaveDisplay.h index d69983ade5..219f74f66a 100644 --- a/src/gui/src/SongEditor/PlaybackTrackWaveDisplay.h +++ b/src/gui/src/SongEditor/PlaybackTrackWaveDisplay.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SongEditor/SongEditor.cpp b/src/gui/src/SongEditor/SongEditor.cpp index fde8d6b367..eee3e3da1f 100644 --- a/src/gui/src/SongEditor/SongEditor.cpp +++ b/src/gui/src/SongEditor/SongEditor.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -990,6 +990,13 @@ void SongEditor::updatePosition( float fTick ) { } } +void SongEditor::patternModifiedEvent() { + // This can change the length of one pattern in a column + // containing multiple ones. + invalidateBackground(); + update(); +} + void SongEditor::paintEvent( QPaintEvent *ev ) { if ( m_bBackgroundInvalid ) { diff --git a/src/gui/src/SongEditor/SongEditor.h b/src/gui/src/SongEditor/SongEditor.h index 6c6d56463b..b0c65e06a9 100644 --- a/src/gui/src/SongEditor/SongEditor.h +++ b/src/gui/src/SongEditor/SongEditor.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -213,6 +213,8 @@ class SongEditor : public QWidget std::map< QPoint, GridCell > m_gridCells; void updateGridCells(); bool m_bEntered; + + virtual void patternModifiedEvent() override; /** Cached position of the playhead.*/ float m_fTick; diff --git a/src/gui/src/SongEditor/SongEditorPanel.cpp b/src/gui/src/SongEditor/SongEditorPanel.cpp index e95359cff0..ed6a7b6d3a 100644 --- a/src/gui/src/SongEditor/SongEditorPanel.cpp +++ b/src/gui/src/SongEditor/SongEditorPanel.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -175,7 +175,7 @@ SongEditorPanel::SongEditorPanel(QWidget *pParent) m_pPlaySelectedSingleBtn = new Button( pBackPanel, QSize( 25, 21 ), Button::Type::Push, "single_layer.svg", "", false, QSize( 17, 13 ), - tr( "single pattern mode"), + tr( "selected pattern mode"), false, true ); m_pPlaySelectedSingleBtn->move( 168, 25 ); connect( m_pPlaySelectedSingleBtn, &QPushButton::clicked, [=]() { diff --git a/src/gui/src/SongEditor/SongEditorPanel.h b/src/gui/src/SongEditor/SongEditorPanel.h index d150eef463..972316c085 100644 --- a/src/gui/src/SongEditor/SongEditorPanel.h +++ b/src/gui/src/SongEditor/SongEditorPanel.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SongEditor/SongEditorPanelBpmWidget.cpp b/src/gui/src/SongEditor/SongEditorPanelBpmWidget.cpp index 37a25865d8..466821e617 100644 --- a/src/gui/src/SongEditor/SongEditorPanelBpmWidget.cpp +++ b/src/gui/src/SongEditor/SongEditorPanelBpmWidget.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SongEditor/SongEditorPanelBpmWidget.h b/src/gui/src/SongEditor/SongEditorPanelBpmWidget.h index 52fd1d57dd..a14ef93491 100644 --- a/src/gui/src/SongEditor/SongEditorPanelBpmWidget.h +++ b/src/gui/src/SongEditor/SongEditorPanelBpmWidget.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SongEditor/SongEditorPanelTagWidget.cpp b/src/gui/src/SongEditor/SongEditorPanelTagWidget.cpp index ff7aa36cad..cc3208e1cd 100644 --- a/src/gui/src/SongEditor/SongEditorPanelTagWidget.cpp +++ b/src/gui/src/SongEditor/SongEditorPanelTagWidget.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SongEditor/SongEditorPanelTagWidget.h b/src/gui/src/SongEditor/SongEditorPanelTagWidget.h index 1e67185bf6..1dc2a8461d 100644 --- a/src/gui/src/SongEditor/SongEditorPanelTagWidget.h +++ b/src/gui/src/SongEditor/SongEditorPanelTagWidget.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SongEditor/VirtualPatternDialog.cpp b/src/gui/src/SongEditor/VirtualPatternDialog.cpp index 035e9d4fd9..9f374b3a00 100644 --- a/src/gui/src/SongEditor/VirtualPatternDialog.cpp +++ b/src/gui/src/SongEditor/VirtualPatternDialog.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SongEditor/VirtualPatternDialog.h b/src/gui/src/SongEditor/VirtualPatternDialog.h index d1335f73b2..a84f8616e5 100644 --- a/src/gui/src/SongEditor/VirtualPatternDialog.h +++ b/src/gui/src/SongEditor/VirtualPatternDialog.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SongPropertiesDialog.cpp b/src/gui/src/SongPropertiesDialog.cpp index 7e4ea1e4c4..6a838a8e9c 100644 --- a/src/gui/src/SongPropertiesDialog.cpp +++ b/src/gui/src/SongPropertiesDialog.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SongPropertiesDialog.h b/src/gui/src/SongPropertiesDialog.h index ffc35dcda2..ce68d5edb9 100644 --- a/src/gui/src/SongPropertiesDialog.h +++ b/src/gui/src/SongPropertiesDialog.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SoundLibrary/FileBrowser.cpp b/src/gui/src/SoundLibrary/FileBrowser.cpp index 5afe78952b..3bc26f743d 100644 --- a/src/gui/src/SoundLibrary/FileBrowser.cpp +++ b/src/gui/src/SoundLibrary/FileBrowser.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SoundLibrary/FileBrowser.h b/src/gui/src/SoundLibrary/FileBrowser.h index d4a3a5d85e..77b3384737 100644 --- a/src/gui/src/SoundLibrary/FileBrowser.h +++ b/src/gui/src/SoundLibrary/FileBrowser.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SoundLibrary/SoundLibraryExportDialog.cpp b/src/gui/src/SoundLibrary/SoundLibraryExportDialog.cpp index b0f2fccec7..fcb71d51ef 100644 --- a/src/gui/src/SoundLibrary/SoundLibraryExportDialog.cpp +++ b/src/gui/src/SoundLibrary/SoundLibraryExportDialog.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SoundLibrary/SoundLibraryExportDialog.h b/src/gui/src/SoundLibrary/SoundLibraryExportDialog.h index ffd2f8d39b..3096c533c4 100644 --- a/src/gui/src/SoundLibrary/SoundLibraryExportDialog.h +++ b/src/gui/src/SoundLibrary/SoundLibraryExportDialog.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SoundLibrary/SoundLibraryImportDialog.cpp b/src/gui/src/SoundLibrary/SoundLibraryImportDialog.cpp index 198b988294..2727b2a836 100644 --- a/src/gui/src/SoundLibrary/SoundLibraryImportDialog.cpp +++ b/src/gui/src/SoundLibrary/SoundLibraryImportDialog.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SoundLibrary/SoundLibraryImportDialog.h b/src/gui/src/SoundLibrary/SoundLibraryImportDialog.h index a72fc3eb2d..e3293544b3 100644 --- a/src/gui/src/SoundLibrary/SoundLibraryImportDialog.h +++ b/src/gui/src/SoundLibrary/SoundLibraryImportDialog.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SoundLibrary/SoundLibraryOpenDialog.cpp b/src/gui/src/SoundLibrary/SoundLibraryOpenDialog.cpp index 7fbcdc4b24..aef09aaa09 100644 --- a/src/gui/src/SoundLibrary/SoundLibraryOpenDialog.cpp +++ b/src/gui/src/SoundLibrary/SoundLibraryOpenDialog.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SoundLibrary/SoundLibraryOpenDialog.h b/src/gui/src/SoundLibrary/SoundLibraryOpenDialog.h index 657a2a1eae..2416b6ac20 100644 --- a/src/gui/src/SoundLibrary/SoundLibraryOpenDialog.h +++ b/src/gui/src/SoundLibrary/SoundLibraryOpenDialog.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp b/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp index c388cd79ca..100f465259 100644 --- a/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp +++ b/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SoundLibrary/SoundLibraryPanel.h b/src/gui/src/SoundLibrary/SoundLibraryPanel.h index 6b0855749c..1ab3c7e5f3 100644 --- a/src/gui/src/SoundLibrary/SoundLibraryPanel.h +++ b/src/gui/src/SoundLibrary/SoundLibraryPanel.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SoundLibrary/SoundLibraryPropertiesDialog.cpp b/src/gui/src/SoundLibrary/SoundLibraryPropertiesDialog.cpp index 4b3206329b..118038bb2f 100644 --- a/src/gui/src/SoundLibrary/SoundLibraryPropertiesDialog.cpp +++ b/src/gui/src/SoundLibrary/SoundLibraryPropertiesDialog.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SoundLibrary/SoundLibraryPropertiesDialog.h b/src/gui/src/SoundLibrary/SoundLibraryPropertiesDialog.h index 4752cdb043..45df86cb0b 100644 --- a/src/gui/src/SoundLibrary/SoundLibraryPropertiesDialog.h +++ b/src/gui/src/SoundLibrary/SoundLibraryPropertiesDialog.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SoundLibrary/SoundLibraryRepositoryDialog.cpp b/src/gui/src/SoundLibrary/SoundLibraryRepositoryDialog.cpp index 86550d700f..b6af8b0a60 100644 --- a/src/gui/src/SoundLibrary/SoundLibraryRepositoryDialog.cpp +++ b/src/gui/src/SoundLibrary/SoundLibraryRepositoryDialog.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SoundLibrary/SoundLibraryRepositoryDialog.h b/src/gui/src/SoundLibrary/SoundLibraryRepositoryDialog.h index 1d940e5d1c..050fa4adc9 100644 --- a/src/gui/src/SoundLibrary/SoundLibraryRepositoryDialog.h +++ b/src/gui/src/SoundLibrary/SoundLibraryRepositoryDialog.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SoundLibrary/SoundLibraryTree.cpp b/src/gui/src/SoundLibrary/SoundLibraryTree.cpp index 1cda2d5760..ad396b7609 100644 --- a/src/gui/src/SoundLibrary/SoundLibraryTree.cpp +++ b/src/gui/src/SoundLibrary/SoundLibraryTree.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SoundLibrary/SoundLibraryTree.h b/src/gui/src/SoundLibrary/SoundLibraryTree.h index 1fbcc095b7..e04b2a913a 100644 --- a/src/gui/src/SoundLibrary/SoundLibraryTree.h +++ b/src/gui/src/SoundLibrary/SoundLibraryTree.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SplashScreen.cpp b/src/gui/src/SplashScreen.cpp index 9a8c91f77c..1d4328be87 100644 --- a/src/gui/src/SplashScreen.cpp +++ b/src/gui/src/SplashScreen.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/SplashScreen.h b/src/gui/src/SplashScreen.h index 9c95f2d072..ec38bc0f44 100644 --- a/src/gui/src/SplashScreen.h +++ b/src/gui/src/SplashScreen.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/UndoActions.h b/src/gui/src/UndoActions.h index 2a755ee246..60f6af58b9 100644 --- a/src/gui/src/UndoActions.h +++ b/src/gui/src/UndoActions.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/WidgetScrollArea.h b/src/gui/src/WidgetScrollArea.h index 6458d79adc..c7b4364142 100644 --- a/src/gui/src/WidgetScrollArea.h +++ b/src/gui/src/WidgetScrollArea.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/AutomationPathView.h b/src/gui/src/Widgets/AutomationPathView.h index cd2048718c..b3b04e26ac 100644 --- a/src/gui/src/Widgets/AutomationPathView.h +++ b/src/gui/src/Widgets/AutomationPathView.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/Button.cpp b/src/gui/src/Widgets/Button.cpp index 510936398c..a4eb37f43a 100644 --- a/src/gui/src/Widgets/Button.cpp +++ b/src/gui/src/Widgets/Button.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/Button.h b/src/gui/src/Widgets/Button.h index 21212d0286..83ca97af78 100644 --- a/src/gui/src/Widgets/Button.h +++ b/src/gui/src/Widgets/Button.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/ClickableLabel.cpp b/src/gui/src/Widgets/ClickableLabel.cpp index 646a35fc02..36f1c59611 100644 --- a/src/gui/src/Widgets/ClickableLabel.cpp +++ b/src/gui/src/Widgets/ClickableLabel.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/ClickableLabel.h b/src/gui/src/Widgets/ClickableLabel.h index e3b6aa7ae8..9f53e662b7 100644 --- a/src/gui/src/Widgets/ClickableLabel.h +++ b/src/gui/src/Widgets/ClickableLabel.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/ColorSelectionButton.cpp b/src/gui/src/Widgets/ColorSelectionButton.cpp index 2def0ff3fd..12d6905144 100644 --- a/src/gui/src/Widgets/ColorSelectionButton.cpp +++ b/src/gui/src/Widgets/ColorSelectionButton.cpp @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright (C) 2021 The hydrogen development team + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/ColorSelectionButton.h b/src/gui/src/Widgets/ColorSelectionButton.h index 58b70809a7..e2568403e9 100644 --- a/src/gui/src/Widgets/ColorSelectionButton.h +++ b/src/gui/src/Widgets/ColorSelectionButton.h @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright (C) 2021 The hydrogen development team + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/CpuLoadWidget.cpp b/src/gui/src/Widgets/CpuLoadWidget.cpp index de8a5be0e1..ef4b7cc117 100644 --- a/src/gui/src/Widgets/CpuLoadWidget.cpp +++ b/src/gui/src/Widgets/CpuLoadWidget.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/CpuLoadWidget.h b/src/gui/src/Widgets/CpuLoadWidget.h index a807790d7a..567ca777fc 100644 --- a/src/gui/src/Widgets/CpuLoadWidget.h +++ b/src/gui/src/Widgets/CpuLoadWidget.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/DownloadWidget.cpp b/src/gui/src/Widgets/DownloadWidget.cpp index a8b2c4050a..5ef389b3da 100644 --- a/src/gui/src/Widgets/DownloadWidget.cpp +++ b/src/gui/src/Widgets/DownloadWidget.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/DownloadWidget.h b/src/gui/src/Widgets/DownloadWidget.h index 7d2355db36..566aac9b9d 100644 --- a/src/gui/src/Widgets/DownloadWidget.h +++ b/src/gui/src/Widgets/DownloadWidget.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/Fader.cpp b/src/gui/src/Widgets/Fader.cpp index b1b3ecbddf..4731c45b44 100644 --- a/src/gui/src/Widgets/Fader.cpp +++ b/src/gui/src/Widgets/Fader.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/Fader.h b/src/gui/src/Widgets/Fader.h index b6396509bf..c19f3a5d94 100644 --- a/src/gui/src/Widgets/Fader.h +++ b/src/gui/src/Widgets/Fader.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/InfoBar.cpp b/src/gui/src/Widgets/InfoBar.cpp index a31775c36f..73c4a326d1 100644 --- a/src/gui/src/Widgets/InfoBar.cpp +++ b/src/gui/src/Widgets/InfoBar.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/InfoBar.h b/src/gui/src/Widgets/InfoBar.h index 03a03d4214..a0d0533a5a 100644 --- a/src/gui/src/Widgets/InfoBar.h +++ b/src/gui/src/Widgets/InfoBar.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/LCDCombo.cpp b/src/gui/src/Widgets/LCDCombo.cpp index a3a4be6194..e354234382 100644 --- a/src/gui/src/Widgets/LCDCombo.cpp +++ b/src/gui/src/Widgets/LCDCombo.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/LCDCombo.h b/src/gui/src/Widgets/LCDCombo.h index ed13b079e9..cddb31e8fe 100644 --- a/src/gui/src/Widgets/LCDCombo.h +++ b/src/gui/src/Widgets/LCDCombo.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/LCDDisplay.cpp b/src/gui/src/Widgets/LCDDisplay.cpp index cdb21c7a66..7fdd2405c4 100644 --- a/src/gui/src/Widgets/LCDDisplay.cpp +++ b/src/gui/src/Widgets/LCDDisplay.cpp @@ -1,6 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/LCDDisplay.h b/src/gui/src/Widgets/LCDDisplay.h index 80477eafbd..609644748f 100644 --- a/src/gui/src/Widgets/LCDDisplay.h +++ b/src/gui/src/Widgets/LCDDisplay.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/LCDSpinBox.cpp b/src/gui/src/Widgets/LCDSpinBox.cpp index 5fe7f9c3ba..4d9496b9da 100644 --- a/src/gui/src/Widgets/LCDSpinBox.cpp +++ b/src/gui/src/Widgets/LCDSpinBox.cpp @@ -1,6 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/LCDSpinBox.h b/src/gui/src/Widgets/LCDSpinBox.h index 09317042d0..6a04f13814 100644 --- a/src/gui/src/Widgets/LCDSpinBox.h +++ b/src/gui/src/Widgets/LCDSpinBox.h @@ -1,6 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/LED.cpp b/src/gui/src/Widgets/LED.cpp index 6b1b50dd36..7bb3799f14 100644 --- a/src/gui/src/Widgets/LED.cpp +++ b/src/gui/src/Widgets/LED.cpp @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright (C) 2021 The hydrogen development team + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/LED.h b/src/gui/src/Widgets/LED.h index 7e3b26cc85..6f1bb4668d 100644 --- a/src/gui/src/Widgets/LED.h +++ b/src/gui/src/Widgets/LED.h @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright (C) 2021 The hydrogen development team + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/MidiLearnable.h b/src/gui/src/Widgets/MidiLearnable.h index 034412d3c5..9a1c1f6bca 100644 --- a/src/gui/src/Widgets/MidiLearnable.h +++ b/src/gui/src/Widgets/MidiLearnable.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/MidiSenseWidget.cpp b/src/gui/src/Widgets/MidiSenseWidget.cpp index a32c8a72ea..215cf412b0 100644 --- a/src/gui/src/Widgets/MidiSenseWidget.cpp +++ b/src/gui/src/Widgets/MidiSenseWidget.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/MidiSenseWidget.h b/src/gui/src/Widgets/MidiSenseWidget.h index d528da2a65..9ebd0177cf 100644 --- a/src/gui/src/Widgets/MidiSenseWidget.h +++ b/src/gui/src/Widgets/MidiSenseWidget.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/MidiTable.cpp b/src/gui/src/Widgets/MidiTable.cpp index 8f803ec8f4..8e8b10845c 100644 --- a/src/gui/src/Widgets/MidiTable.cpp +++ b/src/gui/src/Widgets/MidiTable.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/MidiTable.h b/src/gui/src/Widgets/MidiTable.h index 7744e46ba0..527c0e829e 100644 --- a/src/gui/src/Widgets/MidiTable.h +++ b/src/gui/src/Widgets/MidiTable.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/PixmapWidget.cpp b/src/gui/src/Widgets/PixmapWidget.cpp index 5f5304f25d..c2f9c1b182 100644 --- a/src/gui/src/Widgets/PixmapWidget.cpp +++ b/src/gui/src/Widgets/PixmapWidget.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/PixmapWidget.h b/src/gui/src/Widgets/PixmapWidget.h index a412e37620..18eb61624e 100644 --- a/src/gui/src/Widgets/PixmapWidget.h +++ b/src/gui/src/Widgets/PixmapWidget.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/Rotary.cpp b/src/gui/src/Widgets/Rotary.cpp index 1d62704487..5d9a8830cd 100644 --- a/src/gui/src/Widgets/Rotary.cpp +++ b/src/gui/src/Widgets/Rotary.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/Rotary.h b/src/gui/src/Widgets/Rotary.h index 4bf11eb7e3..cfe2e58e43 100644 --- a/src/gui/src/Widgets/Rotary.h +++ b/src/gui/src/Widgets/Rotary.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/StatusMessageDisplay.cpp b/src/gui/src/Widgets/StatusMessageDisplay.cpp index dd2320d1ec..28753cf26d 100644 --- a/src/gui/src/Widgets/StatusMessageDisplay.cpp +++ b/src/gui/src/Widgets/StatusMessageDisplay.cpp @@ -1,6 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/StatusMessageDisplay.h b/src/gui/src/Widgets/StatusMessageDisplay.h index 16687b743c..0defae5946 100644 --- a/src/gui/src/Widgets/StatusMessageDisplay.h +++ b/src/gui/src/Widgets/StatusMessageDisplay.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/WidgetWithHighlightedList.h b/src/gui/src/Widgets/WidgetWithHighlightedList.h index d85b632ee4..660bd95afd 100644 --- a/src/gui/src/Widgets/WidgetWithHighlightedList.h +++ b/src/gui/src/Widgets/WidgetWithHighlightedList.h @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright (C) 2021 The hydrogen development team + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/WidgetWithInput.cpp b/src/gui/src/Widgets/WidgetWithInput.cpp index 15242cd45a..dfd0e515f9 100644 --- a/src/gui/src/Widgets/WidgetWithInput.cpp +++ b/src/gui/src/Widgets/WidgetWithInput.cpp @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright (C) 2021 The hydrogen development team + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/WidgetWithInput.h b/src/gui/src/Widgets/WidgetWithInput.h index 9001cfde5e..b6af9705b3 100644 --- a/src/gui/src/Widgets/WidgetWithInput.h +++ b/src/gui/src/Widgets/WidgetWithInput.h @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright (C) 2021 The hydrogen development team + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/WidgetWithLicenseProperty.h b/src/gui/src/Widgets/WidgetWithLicenseProperty.h index 4d531cb161..846b02d221 100644 --- a/src/gui/src/Widgets/WidgetWithLicenseProperty.h +++ b/src/gui/src/Widgets/WidgetWithLicenseProperty.h @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright (C) 2008-2021 The hydrogen development team + * Copyright(c) 2008-2022 The hydrogen development team * * http://www.hydrogen-music.org * diff --git a/src/gui/src/Widgets/WidgetWithScalableFont.h b/src/gui/src/Widgets/WidgetWithScalableFont.h index 5201888645..659b546f29 100644 --- a/src/gui/src/Widgets/WidgetWithScalableFont.h +++ b/src/gui/src/Widgets/WidgetWithScalableFont.h @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright (C) 2021 The hydrogen development team + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/gui/src/about_dialog_contributor_list_update.sh b/src/gui/src/about_dialog_contributor_list_update.sh index 572423b83f..8f9be80556 100755 --- a/src/gui/src/about_dialog_contributor_list_update.sh +++ b/src/gui/src/about_dialog_contributor_list_update.sh @@ -5,7 +5,7 @@ # Hydrogen # Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] -# Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] +# Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] # # http://www.hydrogen-music.org # @@ -52,6 +52,7 @@ cat > AboutDialogContributorList.cpp <<"EOF" /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * @@ -71,7 +72,7 @@ cat > AboutDialogContributorList.cpp <<"EOF" */ #include "AboutDialogContributorList.h" -AboutDialogContributorList::AboutDialogContributorList() : H2Core::Object() { +AboutDialogContributorList::AboutDialogContributorList() { std::vector v{ EOF diff --git a/src/player/main.cpp b/src/player/main.cpp index 600a6d711b..fd5c4348ec 100644 --- a/src/player/main.cpp +++ b/src/player/main.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/AdsrTest.cpp b/src/tests/AdsrTest.cpp index c3ca8cee5d..5fa5c75760 100644 --- a/src/tests/AdsrTest.cpp +++ b/src/tests/AdsrTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/AdsrTest.h b/src/tests/AdsrTest.h index d37efb7554..988c55eb89 100644 --- a/src/tests/AdsrTest.h +++ b/src/tests/AdsrTest.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/AudioBenchmark.cpp b/src/tests/AudioBenchmark.cpp index 84ecbeca9b..6eb733fb32 100644 --- a/src/tests/AudioBenchmark.cpp +++ b/src/tests/AudioBenchmark.cpp @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright(c) 2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/AudioBenchmark.h b/src/tests/AudioBenchmark.h index 96b85b4e61..fc9672c806 100644 --- a/src/tests/AudioBenchmark.h +++ b/src/tests/AudioBenchmark.h @@ -1,3 +1,24 @@ +/* + * Hydrogen + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * + * http://www.hydrogen-music.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY, without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see https://www.gnu.org/licenses + * + */ + #ifndef AUDIO_BENCHMARK_H #define AUDIO_BENCHMARK_H diff --git a/src/tests/AutomationPathSerializerTest.cpp b/src/tests/AutomationPathSerializerTest.cpp index 3dd64bffb6..1be04c6ae3 100644 --- a/src/tests/AutomationPathSerializerTest.cpp +++ b/src/tests/AutomationPathSerializerTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/AutomationPathTest.cpp b/src/tests/AutomationPathTest.cpp index b61d96c056..f7a1add844 100644 --- a/src/tests/AutomationPathTest.cpp +++ b/src/tests/AutomationPathTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/CoreActionControllerTest.cpp b/src/tests/CoreActionControllerTest.cpp index 994863a980..6a78056bcb 100644 --- a/src/tests/CoreActionControllerTest.cpp +++ b/src/tests/CoreActionControllerTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/CoreActionControllerTest.h b/src/tests/CoreActionControllerTest.h index ab62ff67b4..21658a3832 100644 --- a/src/tests/CoreActionControllerTest.h +++ b/src/tests/CoreActionControllerTest.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/EventQueueTest.cpp b/src/tests/EventQueueTest.cpp index 38c7f95204..e28241c31d 100644 --- a/src/tests/EventQueueTest.cpp +++ b/src/tests/EventQueueTest.cpp @@ -1,6 +1,6 @@ /* * Hydrogen - * Copyright(c) 2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/FilesystemTest.cpp b/src/tests/FilesystemTest.cpp index 7ff8fffd11..9a65e7492a 100644 --- a/src/tests/FilesystemTest.cpp +++ b/src/tests/FilesystemTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/FilesystemTest.h b/src/tests/FilesystemTest.h index 0ca8d4854b..eb6088ddf3 100644 --- a/src/tests/FilesystemTest.h +++ b/src/tests/FilesystemTest.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/FunctionalTests.cpp b/src/tests/FunctionalTests.cpp index 271869ffde..4a1232a549 100644 --- a/src/tests/FunctionalTests.cpp +++ b/src/tests/FunctionalTests.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/InstrumentListTest.cpp b/src/tests/InstrumentListTest.cpp index 618d834105..ceaaa8257a 100644 --- a/src/tests/InstrumentListTest.cpp +++ b/src/tests/InstrumentListTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/LicenseTest.cpp b/src/tests/LicenseTest.cpp index 410b08fccf..b1575c8236 100644 --- a/src/tests/LicenseTest.cpp +++ b/src/tests/LicenseTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/LicenseTest.h b/src/tests/LicenseTest.h index 69e320a8cc..c65692d429 100644 --- a/src/tests/LicenseTest.h +++ b/src/tests/LicenseTest.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/MemoryLeakageTest.cpp b/src/tests/MemoryLeakageTest.cpp index 5419747099..e599298cc7 100644 --- a/src/tests/MemoryLeakageTest.cpp +++ b/src/tests/MemoryLeakageTest.cpp @@ -1,3 +1,24 @@ +/* + * Hydrogen + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * + * http://www.hydrogen-music.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY, without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see https://www.gnu.org/licenses + * + */ + #include "MemoryLeakageTest.h" #include diff --git a/src/tests/MemoryLeakageTest.h b/src/tests/MemoryLeakageTest.h index 8e6a0f2ea7..30e76cb4c3 100644 --- a/src/tests/MemoryLeakageTest.h +++ b/src/tests/MemoryLeakageTest.h @@ -1,3 +1,24 @@ +/* + * Hydrogen + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * + * http://www.hydrogen-music.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY, without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see https://www.gnu.org/licenses + * + */ + #ifndef MEMORY_LEAKAGE_TEST_H #define MEMORY_LEAKAGE_TEST_H diff --git a/src/tests/MidiNoteTest.cpp b/src/tests/MidiNoteTest.cpp index c1c04f237a..faa594dc65 100644 --- a/src/tests/MidiNoteTest.cpp +++ b/src/tests/MidiNoteTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/NetworkTest.cpp b/src/tests/NetworkTest.cpp index 99df630f92..7ef14bbc6e 100644 --- a/src/tests/NetworkTest.cpp +++ b/src/tests/NetworkTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/NetworkTest.h b/src/tests/NetworkTest.h index 8e2b3334f3..131ed9127b 100644 --- a/src/tests/NetworkTest.h +++ b/src/tests/NetworkTest.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/NoteTest.cpp b/src/tests/NoteTest.cpp index c636809a9a..9a1db5356e 100644 --- a/src/tests/NoteTest.cpp +++ b/src/tests/NoteTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/OscServerTest.cpp b/src/tests/OscServerTest.cpp index 0525d083c0..8cbdbd7b06 100644 --- a/src/tests/OscServerTest.cpp +++ b/src/tests/OscServerTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/OscServerTest.h b/src/tests/OscServerTest.h index 942e901b56..511268098f 100644 --- a/src/tests/OscServerTest.h +++ b/src/tests/OscServerTest.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/PatternTest.cpp b/src/tests/PatternTest.cpp index 68cc7202c9..f3a8f26214 100644 --- a/src/tests/PatternTest.cpp +++ b/src/tests/PatternTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/PatternTest.h b/src/tests/PatternTest.h index e8e6896248..c0d203704e 100644 --- a/src/tests/PatternTest.h +++ b/src/tests/PatternTest.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/RubberbandTest.cpp b/src/tests/RubberbandTest.cpp index 0602cf3037..9e314e7008 100644 --- a/src/tests/RubberbandTest.cpp +++ b/src/tests/RubberbandTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/SampleTest.cpp b/src/tests/SampleTest.cpp index 7802447248..ea191a5b4a 100644 --- a/src/tests/SampleTest.cpp +++ b/src/tests/SampleTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/TestHelper.cpp b/src/tests/TestHelper.cpp index 11de948560..eb5d999b9d 100644 --- a/src/tests/TestHelper.cpp +++ b/src/tests/TestHelper.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/TestHelper.h b/src/tests/TestHelper.h index 2f1964d7e9..c8948fb80f 100644 --- a/src/tests/TestHelper.h +++ b/src/tests/TestHelper.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/TimeTest.cpp b/src/tests/TimeTest.cpp index e00593f802..2da43c839e 100644 --- a/src/tests/TimeTest.cpp +++ b/src/tests/TimeTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/TimeTest.h b/src/tests/TimeTest.h index 2671148eeb..3b7dc39cbe 100644 --- a/src/tests/TimeTest.h +++ b/src/tests/TimeTest.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/Translations.cpp b/src/tests/Translations.cpp index 1e79d36fd4..d7e1e37b42 100644 --- a/src/tests/Translations.cpp +++ b/src/tests/Translations.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/TransportTest.cpp b/src/tests/TransportTest.cpp index c627ecb986..b86991ef7b 100644 --- a/src/tests/TransportTest.cpp +++ b/src/tests/TransportTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/TransportTest.h b/src/tests/TransportTest.h index 88a3378501..fa37583131 100644 --- a/src/tests/TransportTest.h +++ b/src/tests/TransportTest.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/XmlTest.cpp b/src/tests/XmlTest.cpp index cdd48aa934..10b6c0d8b8 100644 --- a/src/tests/XmlTest.cpp +++ b/src/tests/XmlTest.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/XmlTest.h b/src/tests/XmlTest.h index 8e377ba272..ebc97eeaeb 100644 --- a/src/tests/XmlTest.h +++ b/src/tests/XmlTest.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/assertions/AudioFile.cpp b/src/tests/assertions/AudioFile.cpp index 8aa876010c..05c347c382 100644 --- a/src/tests/assertions/AudioFile.cpp +++ b/src/tests/assertions/AudioFile.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/assertions/AudioFile.h b/src/tests/assertions/AudioFile.h index f601d79fed..5097b36cc0 100644 --- a/src/tests/assertions/AudioFile.h +++ b/src/tests/assertions/AudioFile.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/assertions/File.cpp b/src/tests/assertions/File.cpp index 562595d6d5..afb21c4974 100644 --- a/src/tests/assertions/File.cpp +++ b/src/tests/assertions/File.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/assertions/File.h b/src/tests/assertions/File.h index a40bed9684..37a06f8e0a 100644 --- a/src/tests/assertions/File.h +++ b/src/tests/assertions/File.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/main.cpp b/src/tests/main.cpp index d2a1b22fd4..b4ce4722be 100644 --- a/src/tests/main.cpp +++ b/src/tests/main.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/registeredTests.h b/src/tests/registeredTests.h index 38c56fd917..7ed7d53b6a 100644 --- a/src/tests/registeredTests.h +++ b/src/tests/registeredTests.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/utils/AppveyorRestClient.cpp b/src/tests/utils/AppveyorRestClient.cpp index 226f4cf9e3..1e2bfc0f3e 100644 --- a/src/tests/utils/AppveyorRestClient.cpp +++ b/src/tests/utils/AppveyorRestClient.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/utils/AppveyorRestClient.h b/src/tests/utils/AppveyorRestClient.h index 5f998d47b6..fca795dfd2 100644 --- a/src/tests/utils/AppveyorRestClient.h +++ b/src/tests/utils/AppveyorRestClient.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/utils/AppveyorTestListener.cpp b/src/tests/utils/AppveyorTestListener.cpp index f599e07073..5c101aef72 100644 --- a/src/tests/utils/AppveyorTestListener.cpp +++ b/src/tests/utils/AppveyorTestListener.cpp @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/tests/utils/AppveyorTestListener.h b/src/tests/utils/AppveyorTestListener.h index c21ee672ac..04256ef6e5 100644 --- a/src/tests/utils/AppveyorTestListener.h +++ b/src/tests/utils/AppveyorTestListener.h @@ -1,7 +1,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org * diff --git a/src/www/hydrogen.php b/src/www/hydrogen.php index 64f25c04e8..711757e8e7 100644 --- a/src/www/hydrogen.php +++ b/src/www/hydrogen.php @@ -2,7 +2,7 @@ /* * Hydrogen * Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net] - * Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] + * Copyright(c) 2008-2022 The hydrogen development team [hydrogen-devel@lists.sourceforge.net] * * http://www.hydrogen-music.org *