Changeset 2253

Timestamp:

07/06/11 07:25:22 (23 months ago)

Author:

jeremyz

Message:

Filesystem: drumkit_path=>drumkit_path_search, drumkit_location=>drumkit_dir_search + fix comments

Location:

trunk/src

Files:

• cli/main.cpp (modified) (1 diff)
• core/include/hydrogen/helpers/filesystem.h (modified) (1 diff)
• core/src/basics/drumkit.cpp (modified) (1 diff)
• core/src/basics/instrument.cpp (modified) (1 diff)
• core/src/basics/song.cpp (modified) (1 diff)
• core/src/helpers/filesystem.cpp (modified) (2 diffs)
• core/src/hydrogen.cpp (modified) (1 diff)
• gui/src/SoundLibrary/SoundLibraryExportDialog.cpp (modified) (1 diff)

trunk/src/cli/main.cpp

@@ -262 +262 @@
 
                 if( ! drumkitToLoad.isEmpty() ){
-                    H2Core::Drumkit* drumkitInfo = H2Core::Drumkit::load( H2Core::Filesystem::drumkit_path( drumkitToLoad ), true );
+                    H2Core::Drumkit* drumkitInfo = H2Core::Drumkit::load( H2Core::Filesystem::drumkit_path_search( drumkitToLoad ), true );
                     H2Core::Hydrogen::get_instance()->loadDrumkit( drumkitInfo );
                 }

trunk/src/core/include/hydrogen/helpers/filesystem.h

@@ -87 +87 @@
         static bool drumkit_exists( const QString& dk_name );
         /**
-         * returns path for a drumkit searching within usable system then user drumkits
+         * returns path for a drumkit searching within user then system drumkits
          * \param dk_name the drumkit name
          */
-        static QString drumkit_path( const QString& dk_name );
-        /**
-         * returns the directory holding the named drumkit
+        static QString drumkit_path_search( const QString& dk_name );
+        /**
+         * returns the directory holding the named drumkit searching within user then system drumkits
          * \param dk_name the drumkit name
          */
-        static QString drumkit_location( const QString& dk_name );
+        static QString drumkit_dir_search( const QString& dk_name );
         /**
          * returns true if the path contains a usable drumkit

trunk/src/core/src/basics/drumkit.cpp

@@ -228 +228 @@
 
 bool Drumkit::remove( const QString& dk_name ) {
-    QString dk_dir = Filesystem::drumkit_path( dk_name );
+    QString dk_dir = Filesystem::drumkit_path_search( dk_name );
     if( !Filesystem::drumkit_valid( dk_dir ) ) {
         ERRORLOG( QString( "%1 is not valid drumkit" ).arg( dk_dir ) );

trunk/src/core/src/basics/instrument.cpp

@@ -168 +168 @@
 
 void Instrument::load_from( const QString& drumkit_name, const QString& instrument_name, bool is_live ) {
-    QString dir = Filesystem::drumkit_path( drumkit_name );
+    QString dir = Filesystem::drumkit_path_search( drumkit_name );
     if ( dir.isEmpty() ) return;
     Drumkit* drumkit = Drumkit::load( dir );

trunk/src/core/src/basics/song.cpp

@@ -542 +542 @@
                         QString drumkitPath;
                         if ( ( !sDrumkit.isEmpty() ) && ( sDrumkit != "-" ) ) {
-                                drumkitPath = Filesystem::drumkit_path( sDrumkit );
+                                drumkitPath = Filesystem::drumkit_path_search( sDrumkit );
                         }
                         

trunk/src/core/src/helpers/filesystem.cpp

@@ -346 +346 @@
     return sys_drumkits_list().contains( dk_name );
 }
-QString Filesystem::drumkit_path( const QString& dk_name ) {
+QString Filesystem::drumkit_path_search( const QString& dk_name ) {
     if( usr_drumkits_list().contains( dk_name ) ) return usr_drumkits_dir() + "/" + dk_name;
     if( sys_drumkits_list().contains( dk_name ) ) return sys_drumkits_dir() + "/" + dk_name;
@@ -352 +352 @@
     return "";
 }
-QString Filesystem::drumkit_location( const QString& dk_name ) {
+QString Filesystem::drumkit_dir_search( const QString& dk_name ) {
     if( usr_drumkits_list().contains( dk_name ) ) return usr_drumkits_dir();
     if( sys_drumkits_list().contains( dk_name ) ) return sys_drumkits_dir();

trunk/src/core/src/hydrogen.cpp

@@ -2561 +2561 @@
         m_currentDrumkit = drumkitInfo->get_name();
         LocalFileMng fileMng;
-        QString sDrumkitPath = Filesystem::drumkit_path( drumkitInfo->get_name() );
+        QString sDrumkitPath = Filesystem::drumkit_path_search( drumkitInfo->get_name() );
 
 

trunk/src/gui/src/SoundLibrary/SoundLibraryExportDialog.cpp

@@ -72 +72 @@
 
         QString drumkitName = drumkitList->currentText();
-        QString drumkitDir = Filesystem::drumkit_location( drumkitName );
+        QString drumkitDir = Filesystem::drumkit_dir_search( drumkitName );
         QString saveDir = drumkitPathTxt->text();
         QString cmd = QString( "cd " ) + drumkitDir + "; tar czf \"" + saveDir + "/" + drumkitName + ".h2drumkit\" \"" + drumkitName + "\"";