Changeset 921

Timestamp:

03/22/09 13:53:56 (4 years ago)

Author:

gabriel@…

Message:

Rename SeqClientInterface? to SeqOutputInterface?.

This is to be more consistent about the difference with
SeqInputInterface? and make it easier to understand how they relate.
On top of that, both inputs and outputs are actually clients... not
just the outputs.

Location:

branches/transport_redesign/libs/hydrogen/src

Files:

• SeqOutputInterface.h (moved) (moved from branches/transport_redesign/libs/hydrogen/src/SeqClientInterface.h) (4 diffs)
• SeqScript.h (modified) (6 diffs)
• Sequencer.cpp (modified) (5 diffs)
• Sequencer.h (modified) (3 diffs)

branches/transport_redesign/libs/hydrogen/src/SeqOutputInterface.h

@@ -20 +20 @@
  *
  */
-#ifndef H2CORE_SEQCLIENTINTERFACE_H
-#define H2CORE_SEQCLIENTINTERFACE_H
+#ifndef H2CORE_SEQOUTPUTINTERFACE_H
+#define H2CORE_SEQOUTPUTINTERFACE_H
 
 #include "SeqScriptIterator.h"
@@ -33 +33 @@
      * outputs for the sequencer.
      */
-    class SeqClientInterface
+    class SeqOutputInterface
     {
     public:
-        virtual ~SeqClientInterface() {}
+        virtual ~SeqOutputInterface() {}
 
         /**
@@ -45 +45 @@
          * The 'pos' parameter should *not* unless you are *really* needing to
          * map frames back to B:b.t.  The 'pos' parameter is intended for
-         * clients that are doing something like MIDI recording (mapping
+         * outputs that are doing something like MIDI recording (mapping
          * realtime events back to the B:b.t location in the song.  Audio
          * (i.e. the sampler) and MIDI outputs should *not* use the pos
@@ -60 +60 @@
 } // namespace H2Core
 
-#endif // H2CORE_SEQCLIENTINTERFACE_H
+#endif // H2CORE_SEQOUTPUTINTERFACE_H

branches/transport_redesign/libs/hydrogen/src/SeqScript.h

@@ -28 +28 @@
 /**
  * The SeqScript is how the sequencer communicates events to sequence
- * clients.  It communicates a series of SeqEvents (typically note on/note
+ * output clients.  It communicates a series of SeqEvents (typically note on/note
  * off stuff).  Each event is indexed with an offset to the first frame of the
  * current process() cycle.
@@ -55 +55 @@
      *         SeqInputInterface* pMidiInput;
      *         SeqInputInterface* pGuiInput;
-     *         SeqClientInterface* pSampler; // i.e. H2Core::Sampler
-     *         SeqClientInterface* pMidiOut; // i.e. H2Core::MidiOutput
+     *         SeqOutputInterface* pSampler; // i.e. H2Core::Sampler
+     *         SeqOutputInterface* pMidiOut; // i.e. H2Core::MidiOutput
      *
      *         // Get events from input sources
@@ -64 +64 @@
      *         pGuiInput->process(seq, pos, nframes);
      *
-     *         // Send events to the clients to be processed.
+     *         // Send events to the ouput clients to be processed.
      *
      *         pSampler->process(seq.begin_const(),
@@ -78 +78 @@
      *     }
      *
-     *     SeqClientImplementation::process(SeqScriptConstIterator beg,
+     *     SeqOutputImplementation::process(SeqScriptConstIterator beg,
      *                                      SeqScriptConstIterator end,
      *                                      const TransportPosition& // pos //,
@@ -91 +91 @@
      *     }
      *
-     * This way, SeqScript is protected from manipulation by SequencerClients.
+     * This way, SeqScript is protected from manipulation by SeqOutputs.
      *
      */
@@ -120 +120 @@
          * METHODS FOR THE SEQUENCER
          *
-         * These methods should *only* be used by the sequencer.  Sequencer
-         * clients should *not* use these.  This could possibly be enforced by
-         * always passing the sequencer script to the client as
-         * 'const SequencerScript& script'.
+         * These methods should *only* be used by the sequencer inputs.  Sequencer
+         * outputs should *not* use these.
          */
         /// Reserves memory for a specific number of events.  This

branches/transport_redesign/libs/hydrogen/src/Sequencer.cpp

@@ -23 +23 @@
 #include "Sequencer.h"
 #include "SeqInputInterface.h"
-#include "SeqClientInterface.h"
+#include "SeqOutputInterface.h"
 
 #include <hydrogen/TransportPosition.h>
@@ -45 +45 @@
 {
     inputs_list_t::iterator i;
-    clients_list_t::iterator c;
+    outputs_list_t::iterator o;
     int tmp, rv = 0;
 
@@ -53 +53 @@
     }
 
-    for( c = m_clients.begin() ; c != m_clients.end() ; ++c ) {
-        tmp = (*c)->process(m_seq.begin_const(), m_seq.end_const(nframes), pos, nframes);
+    for( o = m_outputs.begin() ; o != m_outputs.end() ; ++o ) {
+        tmp = (*o)->process(m_seq.begin_const(), m_seq.end_const(nframes), pos, nframes);
         if( tmp ) rv = -1;
     }
@@ -84 +84 @@
 }
 
-int Sequencer::add_client(SeqClientInterface* c)
+int Sequencer::add_output(SeqOutputInterface* o)
 {
-    QMutexLocker lk(&m_clients_add_mutex);
+    QMutexLocker lk(&m_outputs_add_mutex);
     int rv = -1;
-    clients_list_t::iterator k;
-    k = find(m_clients.begin(), m_clients.end(), c);
-    if( k != m_clients.end() ) {
-        m_clients.push_back(c);
+    outputs_list_t::iterator k;
+    k = find(m_outputs.begin(), m_outputs.end(), o);
+    if( k != m_outputs.end() ) {
+        m_outputs.push_back(o);
         rv = 0;
     }
@@ -97 +97 @@
 }
 
-int Sequencer::remove_client(SeqClientInterface* c)
+int Sequencer::remove_output(SeqOutputInterface* o)
 {
-    #warning "When we return... it's assumed that it's OK to delete c... but it could still"
-    #warning "be in c->process().  How do we protect against that?"
-    m_clients.remove(c);
+    #warning "When we return... it's assumed that it's OK to delete o... but it could still"
+    #warning "be in o->process().  How do we protect against that?"
+    m_outputs.remove(o);
     return 0;
 }

branches/transport_redesign/libs/hydrogen/src/Sequencer.h

@@ -34 +34 @@
     class TransportPosition;
     class SeqInputInterface;
-    class SeqClientInterface;
+    class SeqOutputInterface;
 
     /**
@@ -50 +50 @@
         int add_input(SeqInputInterface* i);
         int remove_input(SeqInputInterface* i);
-        int add_client(SeqClientInterface* c);
-        int remove_client(SeqClientInterface* c);
+        int add_output(SeqOutputInterface* c);
+        int remove_output(SeqOutputInterface* c);
 
     private:
         typedef std::list<SeqInputInterface*> inputs_list_t;
-        typedef std::list<SeqClientInterface*> clients_list_t;
+        typedef std::list<SeqOutputInterface*> outputs_list_t;
 
         SeqScript m_seq;
@@ -61 +61 @@
         QMutex m_inputs_add_mutex;   // Must be locked when adding inputs
         inputs_list_t m_inputs;
-        QMutex m_clients_add_mutex;  // Must be locked when adding clients
-        clients_list_t m_clients;
+        QMutex m_outputs_add_mutex;  // Must be locked when adding outputs
+        outputs_list_t m_outputs;
     };