Merge pull request #2712 from T-boneG/2617

FIXED: Rename "bassloopes" folder to "bassloops". #2617

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)

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();
 

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 );