Changeset 2265

Timestamp:

07/12/11 14:37:08 (23 months ago)

Author:

jeremyz

Message:

add Pattern::find_note, Pattern::remove_note

Location:

trunk/src/core

Files:

• include/hydrogen/basics/pattern.h (modified) (1 diff)
• src/basics/pattern.cpp (modified) (1 diff)

trunk/src/core/include/hydrogen/basics/pattern.h

@@ -83 +83 @@
          */
         void insert_note( Note* note, int position=-1 );
+        /**
+         * \brief search for a note at a given index within __notes wich correspond to the given arguments
+         * \param idx the index to search in within __notes
+         * \param instrument the instrument the note should be playing
+         * \param key the key that should be set to the note
+         * \param octave the octave that should be set to the note
+         * \param strict if set to false, will search for a note around the given idx
+         * \return the note if found, 0 otherwise
+         */
+        Note* find_note( int idx, Instrument* instrument, Note::Key key, Note::Octave octave, bool strict=true);
+        /**
+         * \brief removes a given note from __notes, it's not deleted
+         * \param note the note to be removed
+         */
+        void remove_note( Note* note );
 
         /**

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

@@ -59 +59 @@
 }
 
+Note* Pattern::find_note( int idx, Instrument* instrument, Note::Key key, Note::Octave octave, bool strict ) {
+    if (strict) {
+        for( notes_cst_it_t it=note_map.lower_bound(idx); it!=note_map.upper_bound(idx); ++it ) {
+            Note* note = it->second;
+            if (note->match( instrument, key, octave )) return note;
+        }
+    } else {
+        // TODO maybe not start from 0 but idx-X
+        for ( int n=0; n<idx; n++ ) {
+            for( notes_cst_it_t it=note_map.lower_bound(n); it!=note_map.upper_bound(n); ++it ) {
+                Note *note = it->second;
+                if (note->match( instrument, key, octave ) && ( (idx<=note->get_position()+note->get_length()) && idx>=note->get_position() ) ) return note;
+            }
+        }
+    }
+    return 0;
+}
+
+void Pattern::remove_note( Note* note ) {
+    for( notes_it_t it=note_map.begin(); it!=note_map.end(); ++it ) {
+        if(it->second==note) {
+            note_map.erase( it );
+            break;
+        }
+    }
+}
+
 bool Pattern::references( Instrument* instr )
 {