Changeset 1088

Timestamp:

04/27/09 03:42:06 (4 years ago)

Author:

gabriel@…

Message:

Change API for Jack Transport Master. Remove unused methods from H2Core::Hydrogen.

This is a partial changeover. The API is changed, but:

• H2Transport.cpp does not compile because the EVENT_JACK_MASTER needs to be implemented for the Event Queue.

• JackTransportMaster?'s core function (the callback) is not yet implemented.

• hydrogen.cpp still does not compile.

Location:

branches/transport_redesign_2

Files:

• gui/src/PlayerControl.cpp (modified) (3 diffs)
• libs/hydrogen/include/hydrogen/hydrogen.h (modified) (1 diff)
• libs/hydrogen/src/hydrogen.cpp (modified) (1 diff)
• libs/hydrogen/src/song.cpp (modified) (1 diff)
• libs/hydrogen/src/transport/H2Transport.cpp (modified) (8 diffs)
• libs/hydrogen/src/transport/H2Transport.h (modified) (1 diff)
• libs/hydrogen/src/transport/JackTimeMaster.cpp (added)
• libs/hydrogen/src/transport/JackTimeMaster.h (added)

branches/transport_redesign_2/gui/src/PlayerControl.cpp

@@ -540 +540 @@
                                 {
                                         m_pJackMasterBtn->setPressed(false);
-                                        Hydrogen::get_instance()->offJackMaster();      
+                                        Hydrogen::get_instance()->clearJackTimeMaster();        
                                         pPref->m_bJackMasterMode = Preferences::NO_JACK_TIME_MASTER;
                                 }
@@ -845 +845 @@
                 AudioEngine::get_instance()->unlock();
                 (HydrogenApp::getInstance())->setStatusBarMessage(trUtf8(" Jack-Time-Master mode = On"), 5000);
-                Hydrogen::get_instance()->onJackMaster();
+                Hydrogen::get_instance()->setJackTimeMaster(false);
                 
         }
@@ -854 +854 @@
                 (HydrogenApp::getInstance())->setStatusBarMessage(trUtf8(" Jack-Time-Master mode = Off"), 5000);
                 //m_pControlsBBTPanel->hide();
-                Hydrogen::get_instance()->offJackMaster();
+                Hydrogen::get_instance()->clearJackTimeMaster();
         }
 

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

@@ -193 +193 @@
 
         /// jack time master
-        unsigned long getHumantimeFrames();
-        void setHumantimeFrames(unsigned long hframes);
-        void offJackMaster();
-        void onJackMaster();
-        unsigned long getTimeMasterFrames();
-        long getTickForHumanPosition( int humanpos );
-        float getNewBpmJTM();
-        void setNewBpmJTM( float bpmJTM);
+        bool setJackTimeMaster(bool if_none_already = false);  // Returns true if we became master
+        void clearJackTimeMaster();
+        bool getJackTimeMaster();    /* Note:  There's no way to know for sure
+                                        if we are _actually_ the JACK time master. */
+        ///~jack time master
 
         void __panic();

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

@@ -2369 +2369 @@
 
 // jack transport master
-unsigned long Hydrogen::getHumantimeFrames()
-{
-        return m_nHumantimeFrames;
-}
-
-void Hydrogen::setHumantimeFrames(unsigned long hframes)
-{
-        m_nHumantimeFrames = hframes;
-}
-
-
-
-#ifdef JACK_SUPPORT
-void Hydrogen::offJackMaster()
-{
-        static_cast< JackOutput* >( m_pAudioDriver )->com_release();
-}
-
-void Hydrogen::onJackMaster()
-{
-        static_cast< JackOutput* >( m_pAudioDriver )->initTimeMaster();
-}
-
-unsigned long Hydrogen::getTimeMasterFrames()
-{
-        float allframes = 0 ;
-
-        if ( m_pAudioDriver->m_transport.m_status == TransportInfo::STOPPED ){
-
-                int oldtick = getTickPosition();
-                for (int i = 0; i <= getPatternPos(); i++){
-                        float framesforposition =
-                                (long)getTickForHumanPosition(i)
-                                * (float)m_pAudioDriver->m_transport.m_nTickSize;
-                        allframes = framesforposition + allframes;
-                }
-                unsigned long framesfortimemaster = (unsigned int)(
-                        allframes
-                        + oldtick * (float)m_pAudioDriver->m_transport.m_nTickSize
-                        );
-                m_nHumantimeFrames = framesfortimemaster;
-                return framesfortimemaster;
-        }else
-        {
-        return m_nHumantimeFrames;
-        }
-}
-#endif
-
-long Hydrogen::getTickForHumanPosition( int humanpos )
-{
-        std::vector< PatternList* > * columns = m_pSong->get_pattern_group_vector();
-        
-        int nPatternGroups = columns->size();
-        if ( humanpos >= nPatternGroups ) {
-                if ( m_pSong->is_loop_enabled() ) {
-                        humanpos = humanpos % nPatternGroups;
-                } else {
-                        return -1;
-                }
-        }
-
-//      std::vector<PatternList*> *pColumns =
-//              m_pSong->get_pattern_group_vector()[ humanpos - 1 ]
-//                      .get( 0 )->get_length();
-        
-//      ERRORLOG( "Kick me!" );
-        if ( humanpos == 0 ) return 0;
-        Pattern *pPattern = columns->at( humanpos - 1 )->get( 0 );
-        if ( pPattern ) {
-                return pPattern->get_length();
-        } else {
-                return MAX_NOTES;
-        }
-//      int nPatternSize;
-        
-//      pColumns
-        
-/*      Pattern *pPattern = NULL;
-        for ( int i = 0; i < humanpos; ++i ) {
-                PatternList *pColumn = ( *pColumns )[ i ];
-                pPattern = pColumn->get( 0 );
-                if ( pPattern ) {
-                        nPatternSize = pPattern->get_length();
-                } else {
-                        nPatternSize = MAX_NOTES;
-                }
-
-                humanTick = nPatternSize;
-        }*/
-//      return humanTick;
-}
-
-
-
-float Hydrogen::getNewBpmJTM()
-{
-        return m_nNewBpmJTM;
-}
-
-void Hydrogen::setNewBpmJTM( float bpmJTM )
-{
-        m_nNewBpmJTM = bpmJTM;
-}
-
+
+bool Hydrogen::setJackTimeMaster(bool if_none_already)
+{
+        return m_pTransport->setJackTimeMaster(if_none_already);
+}
+
+void Hydrogen::clearJackTimeMaster()
+{
+        m_pTransport->clearJackTimeMaster();
+}
+
+bool Hydrogen::getJackTimeMaster()
+{
+        return m_pTransport->getJackTimeMaster();
+}
 
 //~ jack transport master

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

@@ -271 +271 @@
 
         float fBpm = LocalFileMng::readXmlFloat( songNode, "bpm", 120 );
-        Hydrogen::get_instance()->setNewBpmJTM( fBpm ); 
         float fVolume = LocalFileMng::readXmlFloat( songNode, "volume", 0.5 );
         float fMetronomeVolume = LocalFileMng::readXmlFloat( songNode, "metronomeVolume", 0.5 );

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

@@ -21 +21 @@
  */
 
+#include <memory>
 #include <hydrogen/event_queue.h>
 #include "H2Transport.h"
 #include "SimpleTransportMaster.h"
+#include "JackTimeMaster.h"
 
 using namespace H2Core;
@@ -30 +32 @@
 {
 public:
-    Transport* xport;
+    std::auto_ptr<Transport> xport;
+
+    /* This is used as a heartbeat signal with the JACK transport.
+     * It always sets it true.  We always set it false.  If it's
+     * ever false, then we're no longer being called... and probably
+     * no longer the transport master.
+     */
+    bool presumed_jtm;  // We *think* we're the Jack time master.
+    bool heartbeat_jtm;
+    std::auto_ptr<JackTimeMaster> jtm;
+    Song* pSong;  // Cached pointer for JTM
 };
 
@@ -37 +49 @@
 {
     d = new H2TransportPrivate;
-    d->xport = new SimpleTransportMaster;
+    d->xport.reset( new SimpleTransportMaster );
+    d->presumed_jtm = false;
+    d->heartbeat_jtm = false;
+    d->pSong = 0;
 }
 
 H2Transport::~H2Transport()
 {
-    delete d->xport;
     delete d;
 }
@@ -48 +62 @@
 int H2Transport::locate(uint32_t frame)
 {
-    if(d->xport) return d->xport->locate(frame);
+    if(d->xport.get()) return d->xport->locate(frame);
     return -1;
 }
@@ -54 +68 @@
 int H2Transport::locate(uint32_t bar, uint32_t beat, uint32_t tick)
 {
-    if(d->xport) return d->xport->locate(bar, beat, tick);
+    if(d->xport.get()) return d->xport->locate(bar, beat, tick);
     return -1;
 }
@@ -61 +75 @@
 {
     EventQueue::get_instance()->push_event( EVENT_TRANSPORT, (int)TransportPosition::ROLLING );
-    if(d->xport) d->xport->start();
+    if(d->xport.get()) d->xport->start();
 }
 
@@ -67 +81 @@
 {
     EventQueue::get_instance()->push_event( EVENT_TRANSPORT, (int)TransportPosition::STOPPED );
-    if(d->xport) d->xport->stop();
+    if(d->xport.get()) d->xport->stop();
 }
 
 void H2Transport::get_position(TransportPosition* pos)
 {
-    if(d->xport) d->xport->get_position(pos);
+    if(d->xport.get()) d->xport->get_position(pos);
 }
 
 void H2Transport::processed_frames(uint32_t nFrames)
 {
-    if(d->xport) d->xport->processed_frames(nFrames);
+    if( d->heartbeat_jtm == false && d->presumed_jtm == true ) {
+        EventQueue::get_instance()->push_event( EVENT_JACK_MASTER, JACK_MASTER_NO_MORE );
+        d->presumed_jtm = false;
+    }
+    d->heartbeat_jtm = false;
+
+    if(d->xport.get()) d->xport->processed_frames(nFrames);
 }
 
 void H2Transport::set_current_song(Song* s)
 {
-    if(d->xport) d->xport->set_current_song(s);
+    d->pSong = s;
+    if( d->jtm.get() ) {
+        d->jtm->set_current_song(s);
+    }
+    if(d->xport.get()) d->xport->set_current_song(s);
 }
 
 uint32_t H2Transport::get_current_frame()
 {
-    if(d->xport) {
+    if(d->xport.get()) {
         return d->xport->get_current_frame();
     }
@@ -95 +119 @@
 TransportPosition::State H2Transport::get_state()
 {
-    if(d->xport) {
+    if(d->xport.get()) {
         return d->xport->get_state();
     }
     return TransportPosition::STOPPED;
 }
+
+bool H2Transport::setJackTimeMaster(bool if_none_already)
+{
+    if( ! d->jtm.get() ) {
+        d->jtm.reset( new JackTimeMaster );
+        d->jtm->set_current_song( d->pSong );
+    }
+    return d->jtm->setMaster(if_none_already);
+}
+
+void H2Transport::clearJackTimeMaster()
+{
+    if( d->jtm.get() ) {
+        d->jtm->clearMaster();
+    }
+}
+
+bool H2Transport::getJackTimeMaster()
+{
+    return d->presumed_jtm;
+}

branches/transport_redesign_2/libs/hydrogen/src/transport/H2Transport.h

@@ -68 +68 @@
         virtual TransportPosition::State get_state(void);
 
+        // Special Methods for Jack Transport.
+        bool setJackTimeMaster(bool if_none_already = false);
+        void clearJackTimeMaster();
+        bool getJackTimeMaster();
+
         // Interface for application (i.e. GUI)
         // * get list of transport models