Changeset 2229

Timestamp:

06/25/11 14:07:58 (23 months ago)

Author:

wolke

Message:

fix save sound library par save soundlibrary dialogue.
fix save sound library par soundlibrary properties dialogue.

Location:

branches/undo/src

Files:

• cli/main.cpp (modified) (1 diff)
• core/src/basics/drumkit.cpp (modified) (5 diffs)
• gui/src/SoundLibrary/SoundLibrarySaveDialog.cpp (modified) (1 diff)

branches/undo/src/cli/main.cpp

@@ -164 +164 @@
                 ___INFOLOG( QString("Using QT version ") + QString( qVersion() ) );
                 ___INFOLOG( "Using data path: " + H2Core::Filesystem::sys_data_path() );
+
 
                 H2Core::Preferences *pPref = H2Core::Preferences::get_instance();

branches/undo/src/core/src/basics/drumkit.cpp

@@ -22 +22 @@
 
 #include <hydrogen/basics/drumkit.h>
-
+#include <hydrogen/hydrogen.h>
 #include <hydrogen/config.h>
 #ifdef H2CORE_HAVE_LIBARCHIVE
@@ -145 +145 @@
 
 bool Drumkit::save( const QString& name, const QString& author, const QString& info, const QString& license, InstrumentList* instruments, bool overwrite ) {
+
     Drumkit* drumkit = new Drumkit();
     drumkit->set_name( name );
@@ -152 +153 @@
     drumkit->set_instruments( instruments );
     bool ret = drumkit->save( overwrite );
-    drumkit->set_instruments( 0 );
-    delete drumkit;
+    drumkit->~Object();
     return ret;
 }
 
 bool Drumkit::save( bool overwrite ) {
-    return  save( Filesystem::drumkit_path( __name ), overwrite );
+    INFOLOG( QString( "New drumkit dir " + Filesystem::usr_drumkits_dir() + "/" + __name ) );
+    return  save( QString( Filesystem::usr_drumkits_dir() + "/" + __name ), overwrite );
 }
 
 bool Drumkit::save( const QString& dk_dir, bool overwrite ) {
-    INFOLOG( QString( "Saving drumkit %1 into %2" ).arg( __name ).arg( dk_dir ) );
     if( !Filesystem::mkdir( dk_dir ) ) {
-        ERRORLOG( QString( "unable to create %1" ).arg( dk_dir ) );
         return false;
     }
@@ -201 +200 @@
 
 bool Drumkit::save_samples( const QString& dk_dir, bool overwrite ) {
-    INFOLOG( QString( "Saving drumkit %1 samples into %2" ).arg( __path ).arg( dk_dir ) );
+    qDebug()<< QString( "Saving drumkit %1 samples into %2" ).arg( __name ).arg( dk_dir ) ;
     if( !Filesystem::mkdir( dk_dir ) ) {
-        ERRORLOG( QString( "unable to create %1" ).arg( dk_dir ) );
-        return false;
-    }
+        qDebug()<<( QString( "unable to create %1" ).arg( dk_dir ) );
+        return false;
+    }
+
     InstrumentList* instruments = get_instruments();
     for( int i=0; i<instruments->size(); i++ ) {
@@ -212 +212 @@
             InstrumentLayer* layer = instrument->get_layer( n );
             if( layer ) {
-                QString src = __path + "/" + layer->get_sample()->get_filename();
+                QString src =  layer->get_sample()->get_filepath();
                 QString dst = dk_dir + "/" + layer->get_sample()->get_filename();
                 if( !Filesystem::file_copy( src, dst ) ) {

branches/undo/src/gui/src/SoundLibrary/SoundLibrarySaveDialog.cpp

@@ -56 +56 @@
                         QMessageBox::information( this, "Hydrogen", trUtf8 ( "Please supply at least a valid name"));
                         return;
-        }
-    if( !H2Core::Drumkit::save( nameTxt->text(), authorTxt->text(), infoTxt->toHtml(), licenseTxt->text(), H2Core::Hydrogen::get_instance()->getSong()->get_instrument_list() ) ) {
+        }
+    if( !H2Core::Drumkit::save( nameTxt->text(), authorTxt->text(), infoTxt->toHtml(), licenseTxt->text(), H2Core::Hydrogen::get_instance()->getSong()->get_instrument_list(), false ) ) {
         QMessageBox::information( this, "Hydrogen", trUtf8 ( "Saving of this drumkit failed."));
         return;