Changeset 747

Timestamp:

01/28/09 20:47:12 (4 years ago)

Author:

mauser

Message:

just copy layer files to the root of the drumkit directory when they are *not* already in a subdirectory
of the drumkit-dir. This allows us to have drumkits with samples which are organized in subdirectories.

Files:

• trunk/libs/hydrogen/src/local_file_mgr.cpp (modified) (2 diffs)

trunk/libs/hydrogen/src/local_file_mgr.cpp

@@ -804 +804 @@
 
                                 QString sDestFilename = sOrigFilename;
-
-                                int nPos = sDestFilename.lastIndexOf( '/' );
-                                sDestFilename = sDestFilename.mid( nPos + 1, sDestFilename.size() - nPos - 1 );
-                                sDestFilename = sDrumkitDir + "/" + sDestFilename;
-
-                                fileCopy( sOrigFilename, sDestFilename );
+                
+                                /*
+                                        Till rev. 743, the samples got copied into the
+                                        root of the drumkit folder.
+                                        
+                                        Now the sample gets only copied to the folder
+                                        if it doesn't reside in a subfolder of the drumkit dir.
+                                */
+                        
+                                if( sOrigFilename.startsWith( sDrumkitDir ) ){
+                                        INFOLOG("sample is already in drumkit dir");
+                                } else {
+                                        int nPos = sDestFilename.lastIndexOf( '/' );
+                                        sDestFilename = sDestFilename.mid( nPos + 1, sDestFilename.size() - nPos - 1 );
+                                        sDestFilename = sDrumkitDir + "/" + sDestFilename;
+
+                                        fileCopy( sOrigFilename, sDestFilename );
+                                }
                         }
                 }
@@ -842 +854 @@
                         QString sFilename = pSample->get_filename();
 
-                        //if (instr->getDrumkitName() != "") {
-                        // se e' specificato un drumkit, considero solo il nome del file senza il path
-                        int nPos = sFilename.lastIndexOf( "/" );
-                        sFilename = sFilename.mid( nPos + 1, sFilename.length() );
-                        //}
+                        sFilename = sFilename.remove( sDrumkitDir + "/" );
 
                         TiXmlElement layerNode( "layer" );