Changeset 764

Timestamp:

02/03/09 09:45:33 (4 years ago)

Author:

mauser

Message:

restructured some code ( creating a default song)

Location:

trunk/libs/hydrogen

Files:

• include/hydrogen/Song.h (modified) (1 diff)
• src/song.cpp (modified) (2 diffs)

trunk/libs/hydrogen/include/hydrogen/Song.h

@@ -75 +75 @@
 
         static Song* get_empty_song();
-
+        static Song* get_default_song();
 
         Song( const QString& name, const QString& author, float bpm, float volume );

trunk/libs/hydrogen/src/song.cpp

@@ -128 +128 @@
 
 
-
-/// Return an empty song
-Song* Song::get_empty_song()
-{
-        QString dataDir = DataPath::get_data_path();
-        QString filename = dataDir + "/DefaultSong.h2song";
-        Song *song = Song::load( filename );
-        
-        /* if file DefaultSong.h2song not accessible
-         * create a simple default song.
-         */
-        if(!song){
-                song = new Song( "empty", "hydrogen", 120, 0.5 );
+/// Create default song
+Song* Song::get_default_song(){
+                Song *song = new Song( "empty", "hydrogen", 120, 0.5 );
+
                 song->set_metronome_volume( 0.5 );
                 song->set_notes( "..." );
@@ -172 +163 @@
                 song->__is_modified = false;
                 song->set_filename( "empty_song" );
+                
+                return song;
+}
+
+/// Return an empty song
+Song* Song::get_empty_song()
+{
+        QString dataDir = DataPath::get_data_path();    
+        QString filename = dataDir + "/DefaultSong.h2song";
+
+        if( ! QFile::exists( filename ) ){
+                _ERRORLOG("File " + filename + " exists not. Failed to load default song.");
+                filename = dataDir + "/DefaultSong.h2song";
+        }
+        
+        Song *song = Song::load( filename );
+        
+        /* if file DefaultSong.h2song not accessible
+         * create a simple default song.
+         */
+        if(!song){
+                song = Song::get_default_song();
         }