Changeset 324

Timestamp:

08/12/08 21:08:29 (5 years ago)

Author:

jakoblund

Message:

JACK Driver: small code cleanup

Files:

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

trunk/libs/hydrogen/src/IO/jack_output.cpp

@@ -248 +248 @@
                 float hydrogen_ticks_to_locate =  bar_ticks + ( m_JackTransportPos.beat-1 )*hydrogen_TPB + m_JackTransportPos.tick *( hydrogen_TPB/m_JackTransportPos.ticks_per_beat ) ;
         
-//              char bbt[30];
-//              sprintf( bbt, "Locating BBT: [%d,%d,%d]", m_JackTransportPos.bar, m_JackTransportPos.beat, m_JackTransportPos.tick );
+//              INFOLOG( QString( "Position from Time Master: BBT [%1,%2,%3]" ) . arg( m_JackTransportPos.bar ) . arg( m_JackTransportPos.beat ) . arg( m_JackTransportPos.tick ) );
 //              WARNINGLOG( QString(bbt) + " -- Tx/Beat = "+to_string(m_JackTransportPos.ticks_per_beat)+", Meter "+to_string(m_JackTransportPos.beats_per_bar)+"/"+to_string(m_JackTransportPos.beat_type)+" =>tick " + to_string( hydrogen_ticks_to_locate ) );
         
@@ -348 +347 @@
                         } else {
                                 if ( Preferences::getInstance()->m_bJackMasterMode == Preferences::NO_JACK_TIME_MASTER ) {
-                                        // NOTE There's no timebase_master. If audioEngine_process_checkBPMChanged handled a tempo change during last cycle, the offset doesn't match.
+                                        // If There's no timebase_master, and audioEngine_process_checkBPMChanged handled a tempo change during last cycle, the offset doesn't match, but hopefully it was calculated correctly:
+                                        m_transport.m_nFrames = m_JackTransportPos.frame - bbt_frame_offset;
                                         // In jack 'slave' mode, if there's no master, the following line is needed to be able to relocate by clicking the song ruler (wierd corner case, but still...)
-                                        m_transport.m_nFrames = m_JackTransportPos.frame - bbt_frame_offset;
                                         if ( m_transport.m_status == TransportInfo::ROLLING )
                                                         H->triggerRelocateDuringPlay();
@@ -358 +357 @@
                                         m_transport.m_nFrames = H->getHumantimeFrames() - getBufferSize();
                                 }
-//                              bbt_frame_offset = 0;
                         }
                 }