Changeset 595

Timestamp:

10/25/08 22:49:09 (2 months ago)

Author:

wolke

Message:

merge rev. 593:594 from trunk

Files:

• branches/new_fx_rack_and_sample_fun/libs/hydrogen/src/hydrogen.cpp (modified) (4 diffs)

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

@@ -162 +162 @@
-int m_nPatternStartTick = -1;
-int m_nPatternTickPosition = 0;
+int m_nLookaheadFrames = 0;
-
-// used in findPatternInTick
@@ -1054 +1055 @@
-        // nLeadLagFactor + nMaxTimeHumanize.
-        int lookahead = nLeadLagFactor + nMaxTimeHumanize + 1;
+        m_nLookaheadFrames = lookahead;
-        if ( framepos == 0
-             || ( m_audioEngineState == STATE_PLAYING
@@ -1831 +1833 @@
-        }
-
-        unsigned int column = getTickPosition();
-
-        realcolumn = getRealtimeTickPosition();
-
-        // quantize it to scale
-        int qcolumn = ( int )::round( column / ( double )scalar ) * scalar;
-        if ( qcolumn == MAX_NOTES ) qcolumn = 0;
-
-        if ( pref->getQuantizeEvents() ) {
-                column = qcolumn;
-        }
-
-
-        unsigned position = column;
-
-        Pattern* currentPattern = NULL;
-        PatternList *pPatternList = m_pSong->get_pattern_list();
@@ -1852 +1839 @@
-                currentPattern = pPatternList->get( m_nSelectedPatternNumber );
-        }
+
+        // Get current column and compensate for "lookahead"
+        unsigned int column = getTickPosition();
+        unsigned int lookaheadTicks = m_nLookaheadFrames
+                / m_pAudioDriver->m_transport.m_nTickSize;
+        if ( column >= lookaheadTicks ) {
+                column -= lookaheadTicks;
+        } else {
+                lookaheadTicks %= currentPattern->get_lenght();
+                column = (column + currentPattern->get_lenght() - lookaheadTicks)
+                        % currentPattern->get_lenght();
+        }
+
+        realcolumn = getRealtimeTickPosition();
+
+        // quantize it to scale
+        int qcolumn = ( int )::round( column / ( double )scalar ) * scalar;
+        if ( qcolumn == MAX_NOTES ) qcolumn = 0;
+
+        if ( pref->getQuantizeEvents() ) {
+                column = qcolumn;
+        }
+
+
+        unsigned position = column;
-
-        Instrument *instrRef = 0;