diff options
Diffstat (limited to 'src/sound/SoundDriver.h')
| -rw-r--r-- | src/sound/SoundDriver.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/sound/SoundDriver.h b/src/sound/SoundDriver.h index 74bd966..ee6f9da 100644 --- a/src/sound/SoundDriver.h +++ b/src/sound/SoundDriver.h @@ -54,10 +54,10 @@ typedef enum { RECORD_OFF, RECORD_ON, -} RecordStatus; +} RecordtqStatus; -// Status of a SoundDriver - whether we're got an audio and +// tqStatus of a SoundDriver - whether we're got an audio and // MIDI subsystem or not. This is reported right up to the // gui. // @@ -67,7 +67,7 @@ typedef enum AUDIO_OK = 0x01, // AUDIO's OK MIDI_OK = 0x02, // MIDI's OK VERSION_OK = 0x04 // GUI and sequencer versions match -} SoundDriverStatus; +} SoundDrivertqStatus; // Used for MMC and MTC, not for JACK transport @@ -77,7 +77,7 @@ typedef enum TRANSPORT_OFF, TRANSPORT_MASTER, TRANSPORT_SLAVE -} TransportSyncStatus; +} TransportSynctqStatus; // The NoteOffQueue holds a time ordered set of @@ -179,7 +179,7 @@ public: // Activate a recording state. armedInstruments and audioFileNames // can be NULL if no audio tracks recording. // - virtual bool record(RecordStatus recordStatus, + virtual bool record(RecordtqStatus recordtqStatus, const std::vector<InstrumentId> *armedInstruments = 0, const std::vector<TQString> *audioFileNames = 0) = 0; @@ -269,7 +269,7 @@ public: // Return the current status of the driver // - unsigned int getStatus() const { return m_driverStatus; } + unsigned int gettqStatus() const { return m_drivertqStatus; } // Are we playing? // @@ -281,7 +281,7 @@ public: virtual bool areClocksRunning() const = 0; RealTime getStartPosition() const { return m_playStartPosition; } - RecordStatus getRecordStatus() const { return m_recordStatus; } + RecordtqStatus getRecordtqStatus() const { return m_recordtqStatus; } // Return a MappedDevice full of the Instrument mappings // that the driver has discovered. The gui can then use @@ -385,18 +385,18 @@ public: // MIDI Realtime Sync setting // - TransportSyncStatus getMIDISyncStatus() const { return m_midiSyncStatus; } - void setMIDISyncStatus(TransportSyncStatus status) { m_midiSyncStatus = status; } + TransportSynctqStatus getMIDISynctqStatus() const { return m_midiSynctqStatus; } + void setMIDISynctqStatus(TransportSynctqStatus status) { m_midiSynctqStatus = status; } // MMC master/slave setting // - TransportSyncStatus getMMCStatus() const { return m_mmcStatus; } - void setMMCStatus(TransportSyncStatus status) { m_mmcStatus = status; } + TransportSynctqStatus getMMCtqStatus() const { return m_mmctqStatus; } + void setMMCtqStatus(TransportSynctqStatus status) { m_mmctqStatus = status; } // MTC master/slave setting // - TransportSyncStatus getMTCStatus() const { return m_mtcStatus; } - void setMTCStatus(TransportSyncStatus status) { m_mtcStatus = status; } + TransportSynctqStatus getMTCtqStatus() const { return m_mtctqStatus; } + void setMTCtqStatus(TransportSynctqStatus status) { m_mtctqStatus = status; } // MMC Id // @@ -446,7 +446,7 @@ protected: AudioFile* getAudioFile(unsigned int id); std::string m_name; - unsigned int m_driverStatus; + unsigned int m_drivertqStatus; RealTime m_playStartPosition; bool m_startPlayback; bool m_playing; @@ -470,7 +470,7 @@ protected: MappedComposition m_recordComposition; MappedComposition m_returnComposition; - RecordStatus m_recordStatus; + RecordtqStatus m_recordtqStatus; InstrumentId m_midiRunningId; @@ -506,9 +506,9 @@ protected: // MMC and MTC status and ID // - TransportSyncStatus m_midiSyncStatus; - TransportSyncStatus m_mmcStatus; - TransportSyncStatus m_mtcStatus; + TransportSynctqStatus m_midiSynctqStatus; + TransportSynctqStatus m_mmctqStatus; + TransportSynctqStatus m_mtctqStatus; MidiByte m_mmcId; // device id // MIDI clock interval |