diff --git a/CMakeLists.txt b/CMakeLists.txt index ba10686cc..917b38180 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ SET(PROJECT_DESCRIPTION "${PROJECT_NAME_UCASE} - Free music production software" SET(PROJECT_COPYRIGHT "2008-${PROJECT_YEAR} ${PROJECT_AUTHOR}") SET(VERSION_MAJOR "1") SET(VERSION_MINOR "1") -SET(VERSION_PATCH "90") +SET(VERSION_PATCH "91") #SET(VERSION_SUFFIX "") SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") IF(VERSION_SUFFIX) diff --git a/data/samples/bassloopes/briff01.ogg b/data/samples/bassloops/briff01.ogg similarity index 100% rename from data/samples/bassloopes/briff01.ogg rename to data/samples/bassloops/briff01.ogg diff --git a/data/samples/bassloopes/rave_bass01.ogg b/data/samples/bassloops/rave_bass01.ogg similarity index 100% rename from data/samples/bassloopes/rave_bass01.ogg rename to data/samples/bassloops/rave_bass01.ogg diff --git a/data/samples/bassloopes/rave_bass02.ogg b/data/samples/bassloops/rave_bass02.ogg similarity index 100% rename from data/samples/bassloopes/rave_bass02.ogg rename to data/samples/bassloops/rave_bass02.ogg diff --git a/data/samples/bassloopes/tb303_01.ogg b/data/samples/bassloops/tb303_01.ogg similarity index 100% rename from data/samples/bassloopes/tb303_01.ogg rename to data/samples/bassloops/tb303_01.ogg diff --git a/data/samples/bassloopes/techno_bass01.ogg b/data/samples/bassloops/techno_bass01.ogg similarity index 100% rename from data/samples/bassloopes/techno_bass01.ogg rename to data/samples/bassloops/techno_bass01.ogg diff --git a/data/samples/bassloopes/techno_bass02.ogg b/data/samples/bassloops/techno_bass02.ogg similarity index 100% rename from data/samples/bassloopes/techno_bass02.ogg rename to data/samples/bassloops/techno_bass02.ogg diff --git a/data/samples/bassloopes/techno_synth01.ogg b/data/samples/bassloops/techno_synth01.ogg similarity index 100% rename from data/samples/bassloopes/techno_synth01.ogg rename to data/samples/bassloops/techno_synth01.ogg diff --git a/data/samples/bassloopes/techno_synth02.ogg b/data/samples/bassloops/techno_synth02.ogg similarity index 100% rename from data/samples/bassloopes/techno_synth02.ogg rename to data/samples/bassloops/techno_synth02.ogg diff --git a/data/samples/bassloopes/techno_synth03.ogg b/data/samples/bassloops/techno_synth03.ogg similarity index 100% rename from data/samples/bassloopes/techno_synth03.ogg rename to data/samples/bassloops/techno_synth03.ogg diff --git a/data/samples/bassloopes/techno_synth04.ogg b/data/samples/bassloops/techno_synth04.ogg similarity index 100% rename from data/samples/bassloopes/techno_synth04.ogg rename to data/samples/bassloops/techno_synth04.ogg diff --git a/include/DataFile.h b/include/DataFile.h index 0bc06be8d..e25a5ce4f 100644 --- a/include/DataFile.h +++ b/include/DataFile.h @@ -122,6 +122,7 @@ private: void upgrade_0_4_0_20080622(); void upgrade_0_4_0_beta1(); void upgrade_0_4_0_rc2(); + void upgrade_1_1_91(); void upgrade(); diff --git a/src/core/DataFile.cpp b/src/core/DataFile.cpp index 7cc3c1bb2..2d6ff8219 100644 --- a/src/core/DataFile.cpp +++ b/src/core/DataFile.cpp @@ -792,6 +792,20 @@ void DataFile::upgrade_0_4_0_rc2() } +void DataFile::upgrade_1_1_91() +{ + // Upgrade to version 1.1.91 from some version less than 1.1.91 + QDomNodeList list = elementsByTagName( "audiofileprocessor" ); + for( int i = 0; !list.item( i ).isNull(); ++i ) + { + QDomElement el = list.item( i ).toElement(); + QString s = el.attribute( "src" ); + s.replace( QRegExp("/samples/bassloopes/"), "/samples/bassloops/" ); + el.setAttribute( "src", s ); + } +} + + void DataFile::upgrade() { ProjectVersion version = @@ -856,6 +870,10 @@ void DataFile::upgrade() { upgrade_0_4_0_rc2(); } + if( version < ProjectVersion("1.1.91", CompareType::Release) ) + { + upgrade_1_1_91(); + } // update document meta data documentElement().setAttribute( "version", LDF_VERSION_STRING );