Changeset 834 for branches/new_fx_rack_and_sample_fun/libs/hydrogen/src/sampler/sampler.cpp

Timestamp:

02/21/09 01:29:28 (4 years ago)

Author:

wolke

Message:

mege 833 from trunk

Location:

branches/new_fx_rack_and_sample_fun

Files:

• . (modified) (1 prop)
• libs/hydrogen/src/sampler/sampler.cpp (modified) (6 diffs)

branches/new_fx_rack_and_sample_fun/libs/hydrogen/src/sampler/sampler.cpp

@@ -372 +372 @@
 
         int nNoteLength = -1;
-        if ( pNote->get_lenght() != -1 ) {
-                nNoteLength = ( int )( pNote->get_lenght() * __audio_output->m_transport.m_nTickSize );
+        if ( pNote->get_length() != -1 ) {
+                nNoteLength = ( int )( pNote->get_length() * __audio_output->m_transport.m_nTickSize );
         }
 
@@ -522 +522 @@
 {
         int nNoteLength = -1;
-        if ( pNote->get_lenght() != -1 ) {
-                nNoteLength = ( int )( pNote->get_lenght() * __audio_output->m_transport.m_nTickSize );
+        if ( pNote->get_length() != -1 ) {
+                nNoteLength = ( int )( pNote->get_length() * __audio_output->m_transport.m_nTickSize );
         }
         float fNotePitch = pNote->get_pitch() + fLayerPitch;
@@ -786 +786 @@
 
 
-void Sampler::setPlayingNotelenght( Instrument* instrument, unsigned long ticks, unsigned long noteOnTick )
+void Sampler::setPlayingNotelength( Instrument* instrument, unsigned long ticks, unsigned long noteOnTick )
 {
         if ( instrument ) { // stop all notes using this instrument
@@ -815 +815 @@
                 
                 if ( currentPattern ) {
-                                int patternsize = currentPattern->get_lenght();
+                                int patternsize = currentPattern->get_length();
         
                                 for ( unsigned nNote = 0 ;
-                                nNote < currentPattern->get_lenght() ;
+                                nNote < currentPattern->get_length() ;
                                 nNote++ ) {
                                         std::multimap <int, Note*>::iterator pos;
@@ -829 +829 @@
                                                                 if ( pNote->get_instrument() == instrument
                                                                 && pNote->get_position() == noteOnTick ) {
-                                                                        AudioEngine::get_instance()->lock("Sample::setnotelenght_event");
+                                                                        AudioEngine::get_instance()->lock("Sample::setnotelength_event");
                                         
                                                                         if ( ticks >  patternsize ) 
                                                                                 ticks = patternsize - noteOnTick;
-                                                                        pNote->set_lenght( ticks );
+                                                                        pNote->set_length( ticks );
                                                                         Hydrogen::get_instance()->getSong()->__is_modified = true;
                                                                         AudioEngine::get_instance()->unlock(); // unlock the audio engine
@@ -841 +841 @@
                                                                 if ( pNote->get_instrument() == pEngine->getSong()->get_instrument_list()->get( pEngine->getSelectedInstrumentNumber())
                                                                 && pNote->get_position() == noteOnTick ) {
-                                                                        AudioEngine::get_instance()->lock("Sample::setnotelenght_event");
+                                                                        AudioEngine::get_instance()->lock("Sample::setnotelength_event");
                                                                         if ( ticks >  patternsize ) 
                                                                                 ticks = patternsize - noteOnTick;
-                                                                        pNote->set_lenght( ticks );
+                                                                        pNote->set_length( ticks );
                                                                         Hydrogen::get_instance()->getSong()->__is_modified = true;
                                                                         AudioEngine::get_instance()->unlock(); // unlock the audio engine