Changeset 1087

Timestamp:

04/27/09 03:41:57 (4 years ago)

Author:

gabriel@…

Message:

Remove/reimplement several H2Core::Hydrogen methods.

Many of these methods are no longer called, anywhere. Some were found
elsewhere, and have been replaced with equivalent code.

Location:

branches/transport_redesign_2/libs/hydrogen

Files:

• include/hydrogen/hydrogen.h (modified) (3 diffs)
• src/hydrogen.cpp (modified) (4 diffs)

branches/transport_redesign_2/libs/hydrogen/include/hydrogen/hydrogen.h

@@ -101 +101 @@
 
         unsigned long getTickPosition();
-        unsigned long getRealtimeTickPosition();
-        unsigned long getTotalFrames();
         unsigned long getRealtimeFrames();
 
 
         PatternList * getCurrentPatternList();
-        void setCurrentPatternList( PatternList * pPatternList );
 
         PatternList * getNextPatterns();
@@ -114 +111 @@
         void setPatternPos( int pos );
         
-        void triggerRelocateDuringPlay();
-
         long getTickForPosition( int );
 
@@ -206 +201 @@
         float getNewBpmJTM();
         void setNewBpmJTM( float bpmJTM);
-        void ComputeHumantimeFrames(uint32_t nFrames);
 
         void __panic();

branches/transport_redesign_2/libs/hydrogen/src/hydrogen.cpp

@@ -1772 +1772 @@
 }
 
-
-
-unsigned long Hydrogen::getRealtimeTickPosition()
-{
-        //unsigned long initTick = audioEngine_getTickPosition();
-        unsigned int initTick = ( unsigned int )( m_nRealtimeFrames
-                                                  / m_pAudioDriver->m_transport.m_nTickSize );
-        unsigned long retTick;
-
-        struct timeval currtime;
-        struct timeval deltatime;
-
-        double sampleRate = ( double ) m_pAudioDriver->getSampleRate();
-        gettimeofday ( &currtime, NULL );
-
-        timersub( &currtime, &m_currentTickTime, &deltatime );
-
-        // add a buffers worth for jitter resistance
-        double deltaSec =
-                ( double ) deltatime.tv_sec
-                + ( deltatime.tv_usec / 1000000.0 )
-                + ( m_pAudioDriver->getBufferSize() / ( double )sampleRate );
-
-        retTick = ( unsigned long ) ( ( sampleRate
-                                        / ( double ) m_pAudioDriver->m_transport.m_nTickSize )
-                                      * deltaSec );
-
-        retTick = initTick + retTick;
-
-        return retTick;
-}
-
-
-
 PatternList* Hydrogen::getCurrentPatternList()
 {
-        return m_pPlayingPatterns;
+        TransportPosition pos;
+        m_transport->get_position(&pos);
+        return m_pSong->get_pattern_group_vector()[pos.bar];
 }
 
 PatternList * Hydrogen::getNextPatterns()
 {
-        return m_pNextPatterns;
+        TransportPosition pos;
+        m_transport->get_position(&pos);
+        return m_pSong->get_pattern_group_vector()[pos.bar + 1];
 }
 
@@ -1984 +1954 @@
         return m_audioEngineState;
 }
-
-
-
-void Hydrogen::setCurrentPatternList( PatternList *pPatternList )
-{
-        AudioEngine::get_instance()->lock( "Hydrogen::setCurrentPatternList" );
-        m_pPlayingPatterns = pPatternList;
-        EventQueue::get_instance()->push_event( EVENT_PATTERN_CHANGED, -1 );
-        AudioEngine::get_instance()->unlock();
-}
-
-
 
 float Hydrogen::getProcessTime()
@@ -2177 +2135 @@
 
 
-unsigned long Hydrogen::getTotalFrames()
-{
-        return m_pAudioDriver->m_transport.m_nFrames;
-}
-
 unsigned long Hydrogen::getRealtimeFrames()
 {
@@ -2522 +2475 @@
 
 
-void Hydrogen::ComputeHumantimeFrames(uint32_t nFrames)
-{
-        if ( ( m_audioEngineState == STATE_PLAYING ) )
-        m_nHumantimeFrames = nFrames + m_nHumantimeFrames;
-}
-
-
 //~ jack transport master
-
-void Hydrogen::triggerRelocateDuringPlay()
-{
-        if ( m_pSong->get_mode() == Song::PATTERN_MODE )
-                m_nPatternStartTick = -1; // This forces the barline position 
-}
-
 
 void Hydrogen::togglePlaysSelected()