Changeset 320

Timestamp:

08/11/08 22:38:44 (5 years ago)

Author:

jakoblund

Message:

Adjustment to the sequencer so that notes in the beginning of the pattern(s) being located to
in Song Mode get played when 'Play' button is pressed. (the lookahead mechanism was suppressing
first notes)

Files:

• trunk/libs/hydrogen/src/hydrogen.cpp (modified) (3 diffs)

trunk/libs/hydrogen/src/hydrogen.cpp

@@ -1030 +1030 @@
         // plus lookahead. lookahead should be equal or greater than the nLeadLagFactor + nMaxTimeHumanize.
         int lookahead = nLeadLagFactor + nMaxTimeHumanize + 1;
-        if ( framepos == 0 ) {
-                tickNumber_start = 0; // a.k.a.: (int)( framepos / m_pAudioDriver->m_transport.m_nTickSize );
+        if ( framepos == 0 || ( m_pSong->get_mode() == Song::SONG_MODE && m_nSongPos == -1 ) ) {
+                tickNumber_start = (int)( framepos / m_pAudioDriver->m_transport.m_nTickSize );
         }
         else {
@@ -1181 +1181 @@
                         assert( m_nPatternTickPosition < nPatternSize );
                 }
-                /*
-                                        else {
-                                                _ERRORLOG( "Pattern mode. m_pPlayingPatterns->getSize() = 0" );
-                                                _ERRORLOG( "Panic! Stopping audio engine");
-                                                // PANIC!
-                                                m_pAudioDriver->stop();
-                                        }
-                                }
-                */
-
 
                 // metronome
@@ -1245 +1235 @@
 
                                                 // cannot play note before 0 frame
-                                                if (tick + nOffset / m_pAudioDriver->m_transport.m_nTickSize < 0) {
+                                                if (tick + nOffset / m_pAudioDriver->m_transport.m_nTickSize < tickNumber_start ) {
                                                         _INFOLOG(" offset before 0 frame ");
-                                                        nOffset = 0 - (int) (tick * m_pAudioDriver->m_transport.m_nTickSize);
+                                                        nOffset = tickNumber_start - (int) (tick * m_pAudioDriver->m_transport.m_nTickSize);
                                                 }
                                                 Note *pCopiedNote = new Note( pNote );