Changeset 884

Timestamp:

03/11/09 00:12:25 (4 years ago)

Author:

gabriel@…

Message:

Add a new_position member to TransportPosition?.

This may be premature optimization... but sequencer input objects may want to
keep a "cursor" for keeping track of how far they've progressed in the sequence
(i.e. for lookahead logic). Instead of making each of them detect relocations,
it made more sense to have it managed by the transport.

Location:

branches/transport_redesign/libs/hydrogen

Files:

• include/hydrogen/TransportPosition.h (modified) (1 diff)
• src/transport/JackTransportMaster.cpp (modified) (4 diffs)
• src/transport/SimpleTransportMaster.cpp (modified) (3 diffs)

branches/transport_redesign/libs/hydrogen/include/hydrogen/TransportPosition.h

@@ -36 +36 @@
     {
         enum { STOPPED, ROLLING } state; /// The current transport state.
+        bool new_position;        /// True if this position is not a continuation
+                                  /// of the last one (i.e. we've relocated)
         uint32_t frame;           /// The current frame of the transport.  When
                                   /// sequencing, this is just FYI.  All

branches/transport_redesign/libs/hydrogen/src/transport/JackTransportMaster.cpp

@@ -38 +38 @@
 public:
     jack_client_t* client;
+    uint32_t next_frame;
 };
 
@@ -43 +44 @@
 {
     d = new JackTransportMasterPrivate;
+    d.client = 0;
+    d.next_frame = (uint32_t)-1;
 }
 
@@ -85 +88 @@
         hpos->state = TransportPosition::STOPPED;
     }
+    hpos->new_position = ( jpos.frame != d->next_frame )
     hpos->frame = jpos.frame;
     hpos->frame_rate = jpos.frame_rate;
@@ -99 +103 @@
 }
 
-void JackTransportMaster::processed_frames(uint32_t /*nFrames*/)
+void JackTransportMaster::processed_frames(uint32_t nFrames)
 {
-    // Handled by JACK server.
+    jack_transport_state_t state;
+    jack_position_t jpos;
+
+    state = jack_transport_query(d->client, &jpos);
+    if( state == TransportPosition::ROLLING ) {
+        d->next_frame = jpos.frame + nFrames;
+    } else {
+        d->next_frame = jpos.frame;
+    }
 }
 

branches/transport_redesign/libs/hydrogen/src/transport/SimpleTransportMaster.cpp

@@ -76 +76 @@
     d->pos.tick = (abs_tick - d->pos.bar_start_tick) % d->pos.ticks_per_beat;
     d->pos.frame = frame;
+    d->pos.new_position = true;
     return 0;
 }
@@ -115 +116 @@
         / d->pos.beats_per_minute;
 
+    d->pos.new_position = true;
 
     return 0;
@@ -156 +158 @@
 
     d->pos.frame += nFrames;
+    d->pos.new_position = false;
 
     d->pos.bbt_offset += nFrames;