Changeset 2261 for trunk/src/core/src/basics/pattern.cpp

Timestamp:

07/12/11 14:36:32 (23 months ago)

Author:

jeremyz

Message:

start cleaning Pattern class

Files:

• trunk/src/core/src/basics/pattern.cpp (modified) (3 diffs)

trunk/src/core/src/basics/pattern.cpp

@@ -22 +22 @@
 
 #include <hydrogen/basics/pattern.h>
-#include <hydrogen/basics/song.h>
+
+#include <cassert>
+
 #include <hydrogen/basics/note.h>
 #include <hydrogen/audio_engine.h>
 
-#include <vector>
-#include <cassert>
 namespace H2Core
 {
@@ -33 +33 @@
 const char* Pattern::__class_name = "Pattern";
 
-Pattern::Pattern( const QString& name, const QString& category, unsigned length )
+Pattern::Pattern( const QString& name, const QString& category, int length )
     : Object( __class_name )
+    , __length( length )
+    , __name( name )
+    , __category( category )
 {
-//      INFOLOG( "INIT: " + m_sName );
-    set_name( name );
-    set_category( category );
-    set_length( length );
 }
 
 Pattern::Pattern( Pattern* other)
     : Object( __class_name )
+    , __length( other->get_length() )
+    , __name( other->get_name() )
+    , __category( other->get_category() )
 {
-    // TODO
+    std::multimap <int, Note*>::const_iterator pos;
+    for ( pos = note_map.begin(); pos != note_map.end(); pos++ ) {
+        note_map.insert( std::make_pair( pos->first, new Note( pos->second ) ) );
+    }
 }
-
 
 Pattern::~Pattern()
 {
-//      INFOLOG( "DESTROY: " + m_sName );
-
-    // delete all Notes
-    std::multimap <int, Note*>::iterator pos;
-    for ( pos = note_map.begin(); pos != note_map.end(); ++pos ) {
-        Note* pNote = pos->second;
-        delete pNote;
+    std::multimap <int, Note*>::const_iterator pos;
+    for ( pos = note_map.begin(); pos != note_map.end(); pos++ ) {
+        delete pos->second;
     }
 }
 
+bool Pattern::references( Instrument* instr )
+{
+    std::multimap <int, Note*>::const_iterator pos;
+    for ( pos = note_map.begin(); pos != note_map.end(); pos++ ) {
+        Note *note = pos->second;
+        assert( note );
+        if ( note->get_instrument() == instr ) {
+            return true;
+        }
+    }
+    return false;
+}
 
-void Pattern::purge_instrument( Instrument* I )
+void Pattern::purge_instrument( Instrument* instr )
 {
     bool locked = false;
     std::list< Note* > slate;
-
-    std::multimap <int, Note*>::iterator pos = note_map.begin();
-    while ( pos != note_map.end() ) {
-        Note* pNote = pos->second;
-        assert( pNote );
-
-        if ( pNote->get_instrument() == I ) {
+    std::multimap <int, Note*>::iterator pos;
+    for ( pos = note_map.begin(); pos != note_map.end(); pos++ ) {
+        Note* note = pos->second;
+        assert( note );
+        if ( note->get_instrument() == instr ) {
             if ( !locked ) {
                 H2Core::AudioEngine::get_instance()->lock( RIGHT_HERE );
                 locked = true;
             }
-            slate.push_back( pNote );
-
-            note_map.erase( pos++ );
-        } else {
-            ++pos;
+            slate.push_back( note );
+            note_map.erase( pos );
         }
     }
-
     if ( locked ) {
         H2Core::AudioEngine::get_instance()->unlock();
@@ -94 +100 @@
 }
 
-
-bool Pattern::references_instrument( Instrument* I )
-{
+void Pattern::set_to_old() {
     std::multimap <int, Note*>::const_iterator pos;
-    for ( pos = note_map.begin(); pos != note_map.end(); ++pos ) {
-        Note* pNote = pos->second;
-        assert( pNote );
-        if ( pNote->get_instrument() == I ) {
-            return true;
-        }
-    }
-    return false;
-}
-
-
-void Pattern::set_to_old()
-{
-    std::multimap <int, Note*>::const_iterator pos;
-    for ( pos = note_map.begin(); pos != note_map.end(); ++pos ) {
-        Note* pNote = pos->second;
-        assert( pNote );
-        pNote->set_just_recorded( false );
+    for ( pos = note_map.begin(); pos != note_map.end(); pos++ ) {
+        Note *note = pos->second;
+        assert( note );
+        note->set_just_recorded( false );
     }
 }
 
+};
 
-/// Returns an empty Pattern
-Pattern* Pattern::get_empty_pattern()
-{
-    Pattern* pat = new Pattern( "Pattern", "not_categorized" );
-    return pat;
-}
-
-
-
-Pattern* Pattern::copy()
-{
-//      ERRORLOG( "not implemented yet!!!" );
-
-    Pattern* newPat = new Pattern( __name, __category );
-    newPat->set_length( get_length() );
-
-    std::multimap <int, Note*>::iterator pos;
-    for ( pos = note_map.begin(); pos != note_map.end(); ++pos ) {
-        Note* pNote = new Note( pos->second );
-        newPat->note_map.insert( std::make_pair( pos->first, pNote ) );
-    }
-
-    return newPat;
-}
-
-
-
-void Pattern::debug_dump()
-{
-    INFOLOG( "Pattern dump" );
-    INFOLOG( "Pattern name: " + __name );
-    INFOLOG( "Pattern category: " + __category );
-    INFOLOG( QString( "Pattern length: %1" ).arg( get_length() ) );
-}
-
-};
+/* vim: set softtabstop=4 expandtab: */