summaryrefslogtreecommitdiffstats
path: root/src/sound
diff options
context:
space:
mode:
Diffstat (limited to 'src/sound')
-rw-r--r--src/sound/AlsaDriver.cpp88
-rw-r--r--src/sound/AlsaDriver.h4
-rw-r--r--src/sound/AudioFileManager.cpp30
-rw-r--r--src/sound/AudioProcess.cpp8
-rw-r--r--src/sound/AudioTimeStretcher.h2
-rw-r--r--src/sound/DSSIPluginFactory.cpp16
-rw-r--r--src/sound/DSSIPluginInstance.cpp2
-rw-r--r--src/sound/DummyDriver.h2
-rw-r--r--src/sound/JackDriver.cpp2
-rw-r--r--src/sound/LADSPAPluginFactory.cpp18
-rw-r--r--src/sound/MappedEvent.cpp2
-rw-r--r--src/sound/MappedStudio.cpp70
-rw-r--r--src/sound/MappedStudio.h4
-rw-r--r--src/sound/MidiFile.cpp16
-rw-r--r--src/sound/PeakFile.cpp4
-rw-r--r--src/sound/RIFFAudioFile.cpp2
-rw-r--r--src/sound/RecordableAudioFile.h8
-rw-r--r--src/sound/SoundDriver.cpp8
-rw-r--r--src/sound/SoundDriver.h36
19 files changed, 161 insertions, 161 deletions
diff --git a/src/sound/AlsaDriver.cpp b/src/sound/AlsaDriver.cpp
index 58d8093..921b17f 100644
--- a/src/sound/AlsaDriver.cpp
+++ b/src/sound/AlsaDriver.cpp
@@ -223,7 +223,7 @@ AlsaDriver::getSystemInfo()
}
void
-AlsaDriver::showQueueStatus(int queue)
+AlsaDriver::showQueuetqStatus(int queue)
{
int err, idx, min, max;
snd_seq_queue_status_t *status;
@@ -705,7 +705,7 @@ AlsaDriver::generateInstruments()
DeviceId ssiDeviceId = getSpareDeviceId();
- if (m_driverStatus & AUDIO_OK) {
+ if (m_drivertqStatus & AUDIO_OK) {
for (int i = 0; i < count; ++i) {
sprintf(number, " #%d", i + 1);
std::string name = "Synth plugin" + std::string(number);
@@ -743,7 +743,7 @@ AlsaDriver::generateInstruments()
DeviceId audioDeviceId = getSpareDeviceId();
- if (m_driverStatus & AUDIO_OK)
+ if (m_drivertqStatus & AUDIO_OK)
{
for (int channel = 0; channel < audioCount; ++channel) {
sprintf(number, " #%d", channel + 1);
@@ -973,11 +973,11 @@ AlsaDriver::createMidiDevice(AlsaPortDescription *port,
if (TQString(deviceName).startsWith("Anonymous MIDI device ")) {
portName = TQString("out %1")
- .arg(m_outputPorts.size() + 1);
+ .tqarg(m_outputPorts.size() + 1);
} else {
portName = TQString("out %1 - %2")
- .arg(m_outputPorts.size() + 1)
- .arg(deviceName);
+ .tqarg(m_outputPorts.size() + 1)
+ .tqarg(deviceName);
}
int outputPort = checkAlsaError(snd_seq_create_simple_port
@@ -1507,7 +1507,7 @@ AlsaDriver::checkTimerSync(size_t frames)
#ifdef HAVE_LIBJACK
if (!m_jackDriver || !m_queueRunning || frames == 0 ||
- (getMTCStatus() == TRANSPORT_SLAVE)) {
+ (getMTCtqStatus() == TRANSPORT_SLAVE)) {
m_firstTimerCheck = true;
return ;
}
@@ -1817,7 +1817,7 @@ AlsaDriver::initialiseMidi()
// Modify status with MIDI success
//
- m_driverStatus |= MIDI_OK;
+ m_drivertqStatus |= MIDI_OK;
generateTimerList();
setCurrentTimer(AUTO_TIMER_NAME);
@@ -1851,7 +1851,7 @@ AlsaDriver::initialiseAudio()
m_jackDriver = new JackDriver(this);
if (m_jackDriver->isOK()) {
- m_driverStatus |= AUDIO_OK;
+ m_drivertqStatus |= AUDIO_OK;
} else {
delete m_jackDriver;
m_jackDriver = 0;
@@ -1876,19 +1876,19 @@ AlsaDriver::initialisePlayback(const RealTime &position)
m_mtcSigmaE = 0;
m_mtcSigmaC = 0;
- if (getMMCStatus() == TRANSPORT_MASTER) {
+ if (getMMCtqStatus() == TRANSPORT_MASTER) {
sendMMC(127, MIDI_MMC_PLAY, true, "");
m_eat_mtc = 0;
}
- if (getMTCStatus() == TRANSPORT_MASTER) {
+ if (getMTCtqStatus() == TRANSPORT_MASTER) {
insertMTCFullFrame(position);
}
// If MIDI Sync is enabled then adjust for the MIDI Clock to
// synchronise the sequencer with the clock.
//
- if (getMIDISyncStatus() == TRANSPORT_MASTER) {
+ if (getMIDISynctqStatus() == TRANSPORT_MASTER) {
// Send the Song Position Pointer for MIDI CLOCK positioning
//
// Get time from current alsa time to start of alsa timing -
@@ -1935,11 +1935,11 @@ AlsaDriver::stopPlayback()
std::cerr << "\n\nAlsaDriver - stopPlayback" << std::endl;
#endif
- if (getMIDISyncStatus() == TRANSPORT_MASTER) {
+ if (getMIDISynctqStatus() == TRANSPORT_MASTER) {
sendSystemDirect(SND_SEQ_EVENT_STOP, NULL);
}
- if (getMMCStatus() == TRANSPORT_MASTER) {
+ if (getMMCtqStatus() == TRANSPORT_MASTER) {
sendMMC(127, MIDI_MMC_STOP, true, "");
//<VN> need to throw away the next MTC event
m_eat_mtc = 3;
@@ -1992,7 +1992,7 @@ AlsaDriver::punchOut()
#ifdef HAVE_LIBJACK
// Close any recording file
- if (m_recordStatus == RECORD_ON) {
+ if (m_recordtqStatus == RECORD_ON) {
for (InstrumentSet::const_iterator i = m_recordingInstruments.begin();
i != m_recordingInstruments.end(); ++i) {
@@ -2037,8 +2037,8 @@ AlsaDriver::punchOut()
// Change recorded state if any set
//
- if (m_recordStatus == RECORD_ON)
- m_recordStatus = RECORD_OFF;
+ if (m_recordtqStatus == RECORD_ON)
+ m_recordtqStatus = RECORD_OFF;
m_recordingInstruments.clear();
}
@@ -2050,7 +2050,7 @@ AlsaDriver::resetPlayback(const RealTime &oldPosition, const RealTime &position)
std::cerr << "\n\nAlsaDriver - resetPlayback(" << oldPosition << "," << position << ")" << std::endl;
#endif
- if (getMMCStatus() == TRANSPORT_MASTER) {
+ if (getMMCtqStatus() == TRANSPORT_MASTER) {
unsigned char t_sec = (unsigned char) position.sec % 60;
unsigned char t_min = (unsigned char) (position.sec / 60) % 60;
unsigned char t_hrs = (unsigned char) (position.sec / 3600);
@@ -2135,7 +2135,7 @@ AlsaDriver::resetPlayback(const RealTime &oldPosition, const RealTime &position)
snd_seq_remove_events_set_condition(info, SND_SEQ_REMOVE_OUTPUT);
snd_seq_remove_events(m_midiHandle, info);
- if (getMTCStatus() == TRANSPORT_MASTER) {
+ if (getMTCtqStatus() == TRANSPORT_MASTER) {
m_mtcFirstTime = -1;
m_mtcSigmaE = 0;
m_mtcSigmaC = 0;
@@ -2718,7 +2718,7 @@ AlsaDriver::getMappedComposition()
case SND_SEQ_EVENT_QFRAME:
if (fromController)
continue;
- if (getMTCStatus() == TRANSPORT_SLAVE) {
+ if (getMTCtqStatus() == TRANSPORT_SLAVE) {
handleMTCTQFrame(event->data.control.value, eventTime);
}
break;
@@ -2733,7 +2733,7 @@ AlsaDriver::getMappedComposition()
break;
case SND_SEQ_EVENT_START:
- if ((getMIDISyncStatus() == TRANSPORT_SLAVE) && !isPlaying()) {
+ if ((getMIDISynctqStatus() == TRANSPORT_SLAVE) && !isPlaying()) {
ExternalTransport *transport = getExternalTransportControl();
if (transport) {
transport->transportJump(ExternalTransport::TransportStopAtTime,
@@ -2749,7 +2749,7 @@ AlsaDriver::getMappedComposition()
break;
case SND_SEQ_EVENT_CONTINUE:
- if ((getMIDISyncStatus() == TRANSPORT_SLAVE) && !isPlaying()) {
+ if ((getMIDISynctqStatus() == TRANSPORT_SLAVE) && !isPlaying()) {
ExternalTransport *transport = getExternalTransportControl();
if (transport) {
transport->transportChange(ExternalTransport::TransportPlay);
@@ -2763,7 +2763,7 @@ AlsaDriver::getMappedComposition()
break;
case SND_SEQ_EVENT_STOP:
- if ((getMIDISyncStatus() == TRANSPORT_SLAVE) && isPlaying()) {
+ if ((getMIDISynctqStatus() == TRANSPORT_SLAVE) && isPlaying()) {
ExternalTransport *transport = getExternalTransportControl();
if (transport) {
transport->transportChange(ExternalTransport::TransportStop);
@@ -2819,7 +2819,7 @@ AlsaDriver::getMappedComposition()
}
}
- if (getMTCStatus() == TRANSPORT_SLAVE && isPlaying()) {
+ if (getMTCtqStatus() == TRANSPORT_SLAVE && isPlaying()) {
#ifdef MTC_DEBUG
std::cerr << "seq time is " << getSequencerTime() << ", last MTC receive "
<< m_mtcLastReceive << ", first time " << m_mtcFirstTime << std::endl;
@@ -2846,7 +2846,7 @@ static int lock_count = 0;
void
AlsaDriver::handleMTCTQFrame(unsigned int data_byte, RealTime the_time)
{
- if (getMTCStatus() != TRANSPORT_SLAVE)
+ if (getMTCtqStatus() != TRANSPORT_SLAVE)
return ;
switch (data_byte & 0xF0) {
@@ -3172,7 +3172,7 @@ AlsaDriver::insertMTCTQFrames(RealTime sliceStart, RealTime sliceEnd)
bool
AlsaDriver::testForMTCSysex(const snd_seq_event_t *event)
{
- if (getMTCStatus() != TRANSPORT_SLAVE)
+ if (getMTCtqStatus() != TRANSPORT_SLAVE)
return false;
// At this point, and possibly for the foreseeable future, the only
@@ -3344,7 +3344,7 @@ AlsaDriver::tweakSkewForMTC(int factor)
bool
AlsaDriver::testForMMCSysex(const snd_seq_event_t *event)
{
- if (getMMCStatus() != TRANSPORT_SLAVE)
+ if (getMMCtqStatus() != TRANSPORT_SLAVE)
return false;
if (event->data.ext.len != 6)
@@ -3764,7 +3764,7 @@ AlsaDriver::processMidiOut(const MappedComposition &mC,
processNotesOff(sliceEnd - m_playStartPosition + m_alsaPlayStartTime, now);
- if (getMTCStatus() == TRANSPORT_MASTER) {
+ if (getMTCtqStatus() == TRANSPORT_MASTER) {
insertMTCTQFrames(sliceStart, sliceEnd);
}
@@ -4009,7 +4009,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
// we're really rolling.
m_playing = true;
- if (getMTCStatus() == TRANSPORT_SLAVE) {
+ if (getMTCtqStatus() == TRANSPORT_SLAVE) {
tweakSkewForMTC(0);
}
}
@@ -4155,7 +4155,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
<< std::endl;
#endif
- setMIDISyncStatus(TRANSPORT_OFF);
+ setMIDISynctqStatus(TRANSPORT_OFF);
break;
case 1:
@@ -4167,7 +4167,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
<< std::endl;
#endif
- setMIDISyncStatus(TRANSPORT_MASTER);
+ setMIDISynctqStatus(TRANSPORT_MASTER);
break;
case 2:
@@ -4179,7 +4179,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
<< std::endl;
#endif
- setMIDISyncStatus(TRANSPORT_SLAVE);
+ setMIDISynctqStatus(TRANSPORT_SLAVE);
break;
}
}
@@ -4274,7 +4274,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
<< std::endl;
#endif
- setMMCStatus(TRANSPORT_MASTER);
+ setMMCtqStatus(TRANSPORT_MASTER);
break;
case 2:
@@ -4285,7 +4285,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
<< std::endl;
#endif
- setMMCStatus(TRANSPORT_SLAVE);
+ setMMCtqStatus(TRANSPORT_SLAVE);
break;
case 0:
@@ -4297,7 +4297,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
<< std::endl;
#endif
- setMMCStatus(TRANSPORT_OFF);
+ setMMCtqStatus(TRANSPORT_OFF);
break;
}
}
@@ -4312,7 +4312,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
<< std::endl;
#endif
- setMTCStatus(TRANSPORT_MASTER);
+ setMTCtqStatus(TRANSPORT_MASTER);
tweakSkewForMTC(0);
m_mtcFirstTime = -1;
break;
@@ -4325,7 +4325,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
<< std::endl;
#endif
- setMTCStatus(TRANSPORT_SLAVE);
+ setMTCtqStatus(TRANSPORT_SLAVE);
m_mtcFirstTime = -1;
break;
@@ -4338,7 +4338,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
<< std::endl;
#endif
- setMTCStatus(TRANSPORT_OFF);
+ setMTCtqStatus(TRANSPORT_OFF);
m_mtcFirstTime = -1;
break;
}
@@ -4477,15 +4477,15 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
}
bool
-AlsaDriver::record(RecordStatus recordStatus,
+AlsaDriver::record(RecordtqStatus recordtqStatus,
const std::vector<InstrumentId> *armedInstruments,
const std::vector<TQString> *audioFileNames)
{
m_recordingInstruments.clear();
- if (recordStatus == RECORD_ON) {
+ if (recordtqStatus == RECORD_ON) {
// start recording
- m_recordStatus = RECORD_ON;
+ m_recordtqStatus = RECORD_ON;
m_alsaRecordStartTime = RealTime::zeroTime;
unsigned int audioCount = 0;
@@ -4522,7 +4522,7 @@ AlsaDriver::record(RecordStatus recordStatus,
#endif
if (!good) {
- m_recordStatus = RECORD_OFF;
+ m_recordtqStatus = RECORD_OFF;
std::cerr << "AlsaDriver::record: No JACK driver, or JACK driver failed to prepare for recording audio" << std::endl;
return false;
}
@@ -4532,8 +4532,8 @@ AlsaDriver::record(RecordStatus recordStatus,
}
}
} else
- if (recordStatus == RECORD_OFF) {
- m_recordStatus = RECORD_OFF;
+ if (recordtqStatus == RECORD_OFF) {
+ m_recordtqStatus = RECORD_OFF;
}
#ifdef DEBUG_ALSA
else {
diff --git a/src/sound/AlsaDriver.h b/src/sound/AlsaDriver.h
index 4a22126..a7c83ee 100644
--- a/src/sound/AlsaDriver.h
+++ b/src/sound/AlsaDriver.h
@@ -68,7 +68,7 @@ public:
virtual MappedComposition *getMappedComposition();
- virtual bool record(RecordStatus recordStatus,
+ virtual bool record(RecordtqStatus recordtqStatus,
const std::vector<InstrumentId> *armedInstruments = 0,
const std::vector<TQString> *audioFileNames = 0);
@@ -105,7 +105,7 @@ public:
// Some stuff to help us debug this
//
void getSystemInfo();
- void showQueueStatus(int queue);
+ void showQueuetqStatus(int queue);
// Process pending
//
diff --git a/src/sound/AudioFileManager.cpp b/src/sound/AudioFileManager.cpp
index 10d6474..f8b57b1 100644
--- a/src/sound/AudioFileManager.cpp
+++ b/src/sound/AudioFileManager.cpp
@@ -537,8 +537,8 @@ AudioFileManager::createRecordingAudioFile()
while (fileName == "") {
fileName = TQString("rg-%1-%2.wav")
- .arg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
- .arg(newId + 1);
+ .tqarg(TQDateTime::tqcurrentDateTime().toString("yyyyMMdd-hhmmss"))
+ .tqarg(newId + 1);
if (TQFile(m_audioPath.c_str() + fileName).exists()) {
fileName = "";
@@ -622,10 +622,10 @@ AudioFileManager::createDerivedAudioFile(AudioFileId source,
while (fileName == "") {
fileName = TQString("%1-%2-%3-%4.wav")
- .arg(prefix)
- .arg(sourceBase.c_str())
- .arg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
- .arg(newId + 1);
+ .tqarg(prefix)
+ .tqarg(sourceBase.c_str())
+ .tqarg(TQDateTime::tqcurrentDateTime().toString("yyyyMMdd-hhmmss"))
+ .tqarg(newId + 1);
if (TQFile(m_audioPath.c_str() + fileName).exists()) {
fileName = "";
@@ -657,11 +657,11 @@ AudioFileManager::importURL(const KURL &url, int sampleRate)
std::cerr << "AudioFileManager::importURL("<< url.prettyURL().ascii() << ", " << sampleRate << ")" << std::endl;
- emit setOperationName(i18n("Downloading file %1").arg(url.prettyURL()));
+ emit setOperationName(i18n("Downloading file %1").tqarg(url.prettyURL()));
TQString localPath = "";
if (!KIO::NetAccess::download(url, localPath)) {
- KMessageBox::error(0, i18n("Cannot download file %1").arg(url.prettyURL()));
+ KMessageBox::error(0, i18n("Cannot download file %1").tqarg(url.prettyURL()));
throw SoundFile::BadSoundFileException(url.prettyURL().ascii());
}
@@ -688,7 +688,7 @@ AudioFileManager::fileNeedsConversion(const std::string &fileName,
*proc << "rosegarden-audiofile-importer";
if (sampleRate > 0) {
*proc << "-r";
- *proc << TQString("%1").arg(sampleRate);
+ *proc << TQString("%1").tqarg(sampleRate);
}
*proc << "-w";
*proc << fileName.c_str();
@@ -715,7 +715,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
*proc << "rosegarden-audiofile-importer";
if (sampleRate > 0) {
*proc << "-r";
- *proc << TQString("%1").arg(sampleRate);
+ *proc << TQString("%1").tqarg(sampleRate);
}
*proc << "-w";
*proc << fileName.c_str();
@@ -753,9 +753,9 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
while (targetName == "") {
targetName = TQString("conv-%2-%3-%4.wav")
- .arg(sourceBase)
- .arg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
- .arg(newId + 1);
+ .tqarg(sourceBase)
+ .tqarg(TQDateTime::tqcurrentDateTime().toString("yyyyMMdd-hhmmss"))
+ .tqarg(newId + 1);
if (TQFile(m_audioPath.c_str() + targetName).exists()) {
targetName = "";
@@ -768,7 +768,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
*m_importProcess << "rosegarden-audiofile-importer";
if (sampleRate > 0) {
*m_importProcess << "-r";
- *m_importProcess << TQString("%1").arg(sampleRate);
+ *m_importProcess << TQString("%1").tqarg(sampleRate);
}
*m_importProcess << "-c";
*m_importProcess << fileName.c_str();
@@ -777,7 +777,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
m_importProcess->start(KProcess::NotifyOnExit, KProcess::NoCommunication);
while (m_importProcess->isRunning()) {
- kapp->processEvents(100);
+ kapp->tqprocessEvents(100);
}
if (!m_importProcess->normalExit()) {
diff --git a/src/sound/AudioProcess.cpp b/src/sound/AudioProcess.cpp
index c811654..7a7f1ab 100644
--- a/src/sound/AudioProcess.cpp
+++ b/src/sound/AudioProcess.cpp
@@ -2337,7 +2337,7 @@ AudioFileWriter::closeRecordFile(InstrumentId id, AudioFileId &returnedId)
return false;
returnedId = m_files[id].first->getId();
- m_files[id].second->setStatus(RecordableAudioFile::DEFUNCT);
+ m_files[id].second->settqStatus(RecordableAudioFile::DEFUNCT);
#ifdef DEBUG_WRITER
@@ -2364,7 +2364,7 @@ AudioFileWriter::haveRecordFileOpen(InstrumentId id)
}
return (m_files[id].first &&
- (m_files[id].second->getStatus() != RecordableAudioFile::DEFUNCT));
+ (m_files[id].second->gettqStatus() != RecordableAudioFile::DEFUNCT));
}
bool
@@ -2377,7 +2377,7 @@ AudioFileWriter::haveRecordFilesOpen()
for (InstrumentId id = instrumentBase; id < instrumentBase + instrumentCount; ++id) {
if (m_files[id].first &&
- (m_files[id].second->getStatus() != RecordableAudioFile::DEFUNCT)) {
+ (m_files[id].second->gettqStatus() != RecordableAudioFile::DEFUNCT)) {
#ifdef DEBUG_WRITER
std::cerr << "AudioFileWriter::haveRecordFilesOpen: found open record file for instrument " << id << std::endl;
#endif
@@ -2410,7 +2410,7 @@ AudioFileWriter::kick(bool wantLock)
RecordableAudioFile *raf = m_files[id].second;
- if (raf->getStatus() == RecordableAudioFile::DEFUNCT) {
+ if (raf->gettqStatus() == RecordableAudioFile::DEFUNCT) {
#ifdef DEBUG_WRITER
std::cerr << "AudioFileWriter::kick: found defunct file on instrument " << id << std::endl;
diff --git a/src/sound/AudioTimeStretcher.h b/src/sound/AudioTimeStretcher.h
index fb2029b..96fc54c 100644
--- a/src/sound/AudioTimeStretcher.h
+++ b/src/sound/AudioTimeStretcher.h
@@ -159,7 +159,7 @@ protected:
/**
* Resynthesise from m_freq[channel] adding in to "out",
* adjusting phases on the basis of a prior step size of lastStep.
- * Also add the window shape in to the modulation array (if
+ * Also add the window tqshape in to the modulation array (if
* present) -- for use in ensuring the output has the correct
* magnitude afterwards.
*/
diff --git a/src/sound/DSSIPluginFactory.cpp b/src/sound/DSSIPluginFactory.cpp
index 9e10778..9189fa6 100644
--- a/src/sound/DSSIPluginFactory.cpp
+++ b/src/sound/DSSIPluginFactory.cpp
@@ -67,14 +67,14 @@ DSSIPluginFactory::enumeratePlugins(MappedObjectPropertyList &list)
list.push_back(*i);
list.push_back(descriptor->Name);
- list.push_back(TQString("%1").arg(descriptor->UniqueID));
+ list.push_back(TQString("%1").tqarg(descriptor->UniqueID));
list.push_back(descriptor->Label);
list.push_back(descriptor->Maker);
list.push_back(descriptor->Copyright);
list.push_back((ddesc->run_synth || ddesc->run_multiple_synths) ? "true" : "false");
list.push_back(ddesc->run_multiple_synths ? "true" : "false");
list.push_back(m_taxonomy[descriptor->UniqueID]);
- list.push_back(TQString("%1").arg(descriptor->PortCount));
+ list.push_back(TQString("%1").tqarg(descriptor->PortCount));
for (unsigned long p = 0; p < descriptor->PortCount; ++p) {
@@ -90,13 +90,13 @@ DSSIPluginFactory::enumeratePlugins(MappedObjectPropertyList &list)
type |= PluginPort::Output;
}
- list.push_back(TQString("%1").arg(p));
+ list.push_back(TQString("%1").tqarg(p));
list.push_back(descriptor->PortNames[p]);
- list.push_back(TQString("%1").arg(type));
- list.push_back(TQString("%1").arg(getPortDisplayHint(descriptor, p)));
- list.push_back(TQString("%1").arg(getPortMinimum(descriptor, p)));
- list.push_back(TQString("%1").arg(getPortMaximum(descriptor, p)));
- list.push_back(TQString("%1").arg(getPortDefault(descriptor, p)));
+ list.push_back(TQString("%1").tqarg(type));
+ list.push_back(TQString("%1").tqarg(getPortDisplayHint(descriptor, p)));
+ list.push_back(TQString("%1").tqarg(getPortMinimum(descriptor, p)));
+ list.push_back(TQString("%1").tqarg(getPortMaximum(descriptor, p)));
+ list.push_back(TQString("%1").tqarg(getPortDefault(descriptor, p)));
}
}
diff --git a/src/sound/DSSIPluginInstance.cpp b/src/sound/DSSIPluginInstance.cpp
index c89aca2..df18b59 100644
--- a/src/sound/DSSIPluginInstance.cpp
+++ b/src/sound/DSSIPluginInstance.cpp
@@ -451,7 +451,7 @@ DSSIPluginInstance::checkProgramCache()
ProgramDescriptor d;
d.bank = programDescriptor->Bank;
d.program = programDescriptor->Program;
- d.name = TQString("%1. %2").arg(index).arg(programDescriptor->Name);
+ d.name = TQString("%1. %2").tqarg(index).tqarg(programDescriptor->Name);
m_cachedPrograms.push_back(d);
}
diff --git a/src/sound/DummyDriver.h b/src/sound/DummyDriver.h
index d60c7c0..5cb5cad 100644
--- a/src/sound/DummyDriver.h
+++ b/src/sound/DummyDriver.h
@@ -60,7 +60,7 @@ public:
// Activate a recording state
//
- virtual bool record(RecordStatus /*recordStatus*/,
+ virtual bool record(RecordtqStatus /*recordtqStatus*/,
const std::vector<InstrumentId> */*armedInstruments = 0*/,
const std::vector<TQString> */*audioFileNames = 0*/)
{ return false; }
diff --git a/src/sound/JackDriver.cpp b/src/sound/JackDriver.cpp
index 673f5ea..ecd6739 100644
--- a/src/sound/JackDriver.cpp
+++ b/src/sound/JackDriver.cpp
@@ -1383,7 +1383,7 @@ JackDriver::jackProcessRecord(InstrumentId id,
float gain = AudioLevel::dB_to_multiplier(level);
- if (m_alsaDriver->getRecordStatus() == RECORD_ON &&
+ if (m_alsaDriver->getRecordtqStatus() == RECORD_ON &&
clocksRunning &&
m_fileWriter->haveRecordFileOpen(id)) {
diff --git a/src/sound/LADSPAPluginFactory.cpp b/src/sound/LADSPAPluginFactory.cpp
index b1560d8..9a7b49a 100644
--- a/src/sound/LADSPAPluginFactory.cpp
+++ b/src/sound/LADSPAPluginFactory.cpp
@@ -81,7 +81,7 @@ LADSPAPluginFactory::enumeratePlugins(MappedObjectPropertyList &list)
list.push_back(*i);
list.push_back(descriptor->Name);
- list.push_back(TQString("%1").arg(descriptor->UniqueID));
+ list.push_back(TQString("%1").tqarg(descriptor->UniqueID));
list.push_back(descriptor->Label);
list.push_back(descriptor->Maker);
list.push_back(descriptor->Copyright);
@@ -104,7 +104,7 @@ LADSPAPluginFactory::enumeratePlugins(MappedObjectPropertyList &list)
}
- list.push_back(TQString("%1").arg(descriptor->PortCount));
+ list.push_back(TQString("%1").tqarg(descriptor->PortCount));
for (unsigned long p = 0; p < descriptor->PortCount; ++p) {
@@ -120,13 +120,13 @@ LADSPAPluginFactory::enumeratePlugins(MappedObjectPropertyList &list)
type |= PluginPort::Output;
}
- list.push_back(TQString("%1").arg(p));
+ list.push_back(TQString("%1").tqarg(p));
list.push_back(descriptor->PortNames[p]);
- list.push_back(TQString("%1").arg(type));
- list.push_back(TQString("%1").arg(getPortDisplayHint(descriptor, p)));
- list.push_back(TQString("%1").arg(getPortMinimum(descriptor, p)));
- list.push_back(TQString("%1").arg(getPortMaximum(descriptor, p)));
- list.push_back(TQString("%1").arg(getPortDefault(descriptor, p)));
+ list.push_back(TQString("%1").tqarg(type));
+ list.push_back(TQString("%1").tqarg(getPortDisplayHint(descriptor, p)));
+ list.push_back(TQString("%1").tqarg(getPortMinimum(descriptor, p)));
+ list.push_back(TQString("%1").tqarg(getPortMaximum(descriptor, p)));
+ list.push_back(TQString("%1").tqarg(getPortDefault(descriptor, p)));
}
}
@@ -664,7 +664,7 @@ LADSPAPluginFactory::discoverPlugins()
TQDir pluginDir(*i, "*.so");
for (unsigned int j = 0; j < pluginDir.count(); ++j) {
- discoverPlugins(TQString("%1/%2").arg(*i).arg(pluginDir[j]));
+ discoverPlugins(TQString("%1/%2").tqarg(*i).tqarg(pluginDir[j]));
}
}
diff --git a/src/sound/MappedEvent.cpp b/src/sound/MappedEvent.cpp
index 4bae51e..2eb6382 100644
--- a/src/sound/MappedEvent.cpp
+++ b/src/sound/MappedEvent.cpp
@@ -390,7 +390,7 @@ protected:
};
DataBlockFile::DataBlockFile(DataBlockRepository::blockid id)
- : m_fileName(KGlobal::dirs()->resourceDirs("tmp").first() + TQString("/rosegarden_datablock_%1").arg(id)),
+ : m_fileName(KGlobal::dirs()->resourceDirs("tmp").first() + TQString("/rosegarden_datablock_%1").tqarg(id)),
m_file(m_fileName),
m_cleared(false)
{
diff --git a/src/sound/MappedStudio.cpp b/src/sound/MappedStudio.cpp
index 9911b67..e5a583c 100644
--- a/src/sound/MappedStudio.cpp
+++ b/src/sound/MappedStudio.cpp
@@ -185,21 +185,21 @@ const MappedObjectProperty MappedPluginPort::Value = "value";
void
MappedObject::addChild(MappedObject *object)
{
- std::vector<MappedObject*>::iterator it = m_children.begin();
- for (; it != m_children.end(); it++)
+ std::vector<MappedObject*>::iterator it = m_tqchildren.begin();
+ for (; it != m_tqchildren.end(); it++)
if ((*it) == object)
return ;
- m_children.push_back(object);
+ m_tqchildren.push_back(object);
}
void
MappedObject::removeChild(MappedObject *object)
{
- std::vector<MappedObject*>::iterator it = m_children.begin();
- for (; it != m_children.end(); it++) {
+ std::vector<MappedObject*>::iterator it = m_tqchildren.begin();
+ for (; it != m_tqchildren.end(); it++) {
if ((*it) == object) {
- m_children.erase(it);
+ m_tqchildren.erase(it);
return ;
}
}
@@ -211,9 +211,9 @@ MappedObjectPropertyList
MappedObject::getChildren()
{
MappedObjectPropertyList list;
- std::vector<MappedObject*>::iterator it = m_children.begin();
- for (; it != m_children.end(); it++)
- list.push_back(TQString("%1").arg((*it)->getId()));
+ std::vector<MappedObject*>::iterator it = m_tqchildren.begin();
+ for (; it != m_tqchildren.end(); it++)
+ list.push_back(TQString("%1").tqarg((*it)->getId()));
return list;
}
@@ -225,10 +225,10 @@ MappedObjectPropertyList
MappedObject::getChildren(MappedObjectType type)
{
MappedObjectPropertyList list;
- std::vector<MappedObject*>::iterator it = m_children.begin();
- for (; it != m_children.end(); it++) {
+ std::vector<MappedObject*>::iterator it = m_tqchildren.begin();
+ for (; it != m_tqchildren.end(); it++) {
if ((*it)->getType() == type)
- list.push_back(TQString("%1").arg((*it)->getId()));
+ list.push_back(TQString("%1").tqarg((*it)->getId()));
}
return list;
@@ -244,16 +244,16 @@ MappedObject::destroyChildren()
// see note in destroy() below
- std::vector<MappedObject *> children = m_children;
- m_children.clear();
+ std::vector<MappedObject *> tqchildren = m_tqchildren;
+ m_tqchildren.clear();
- std::vector<MappedObject *>::iterator it = children.begin();
- for (; it != children.end(); it++)
+ std::vector<MappedObject *>::iterator it = tqchildren.begin();
+ for (; it != tqchildren.end(); it++)
(*it)->destroy(); // remove from studio and destroy
}
// Destroy this object and remove it from the studio and
-// do the same for all its children.
+// do the same for all its tqchildren.
//
void
MappedObject::destroy()
@@ -268,14 +268,14 @@ MappedObject::destroy()
// which calls back on the parent (in this case us) to remove the
// child. (That's necessary for the case of destroying a plugin,
// where we need to remove it from its plugin manager -- etc.) So
- // we don't want to be iterating over m_children here, as it will
+ // we don't want to be iterating over m_tqchildren here, as it will
// change from under us.
- std::vector<MappedObject *> children = m_children;
- m_children.clear();
+ std::vector<MappedObject *> tqchildren = m_tqchildren;
+ m_tqchildren.clear();
- std::vector<MappedObject *>::iterator it = children.begin();
- for (; it != children.end(); it++) {
+ std::vector<MappedObject *>::iterator it = tqchildren.begin();
+ for (; it != tqchildren.end(); it++) {
(*it)->destroy();
}
@@ -875,30 +875,30 @@ MappedAudioFader::getPropertyList(const MappedObjectProperty &property)
list.push_back(MappedConnectableObject::ConnectionsIn);
list.push_back(MappedConnectableObject::ConnectionsOut);
} else if (property == MappedObject::Instrument) {
- list.push_back(MappedObjectProperty("%1").arg(m_instrumentId));
+ list.push_back(MappedObjectProperty("%1").tqarg(m_instrumentId));
} else if (property == MappedAudioFader::FaderLevel) {
- list.push_back(MappedObjectProperty("%1").arg(m_level));
+ list.push_back(MappedObjectProperty("%1").tqarg(m_level));
} else if (property == MappedAudioFader::FaderRecordLevel) {
- list.push_back(MappedObjectProperty("%1").arg(m_recordLevel));
+ list.push_back(MappedObjectProperty("%1").tqarg(m_recordLevel));
} else if (property == MappedAudioFader::Channels) {
- list.push_back(MappedObjectProperty("%1").arg(m_channels));
+ list.push_back(MappedObjectProperty("%1").tqarg(m_channels));
} else if (property == MappedAudioFader::InputChannel) {
- list.push_back(MappedObjectProperty("%1").arg(m_inputChannel));
+ list.push_back(MappedObjectProperty("%1").tqarg(m_inputChannel));
} else if (property == MappedAudioFader::Pan) {
- list.push_back(MappedObjectProperty("%1").arg(m_pan));
+ list.push_back(MappedObjectProperty("%1").tqarg(m_pan));
} else if (property == MappedConnectableObject::ConnectionsIn) {
MappedObjectValueList::const_iterator
it = m_connectionsIn.begin();
for ( ; it != m_connectionsIn.end(); ++it) {
- list.push_back(TQString("%1").arg(*it));
+ list.push_back(TQString("%1").tqarg(*it));
}
} else if (property == MappedConnectableObject::ConnectionsOut) {
MappedObjectValueList::const_iterator
it = m_connectionsOut.begin();
for ( ; it != m_connectionsOut.end(); ++it) {
- list.push_back(TQString("%1").arg(*it));
+ list.push_back(TQString("%1").tqarg(*it));
}
}
@@ -1013,22 +1013,22 @@ MappedAudioBuss::getPropertyList(const MappedObjectProperty &property)
list.push_back(MappedConnectableObject::ConnectionsIn);
list.push_back(MappedConnectableObject::ConnectionsOut);
} else if (property == BussId) {
- list.push_back(MappedObjectProperty("%1").arg(m_bussId));
+ list.push_back(MappedObjectProperty("%1").tqarg(m_bussId));
} else if (property == Level) {
- list.push_back(MappedObjectProperty("%1").arg(m_level));
+ list.push_back(MappedObjectProperty("%1").tqarg(m_level));
} else if (property == MappedConnectableObject::ConnectionsIn) {
MappedObjectValueList::const_iterator
it = m_connectionsIn.begin();
for ( ; it != m_connectionsIn.end(); ++it) {
- list.push_back(TQString("%1").arg(*it));
+ list.push_back(TQString("%1").tqarg(*it));
}
} else if (property == MappedConnectableObject::ConnectionsOut) {
MappedObjectValueList::const_iterator
it = m_connectionsOut.begin();
for ( ; it != m_connectionsOut.end(); ++it) {
- list.push_back(TQString("%1").arg(*it));
+ list.push_back(TQString("%1").tqarg(*it));
}
}
@@ -1152,7 +1152,7 @@ MappedAudioInput::getPropertyList(const MappedObjectProperty &property)
if (property == "") {
list.push_back(MappedAudioInput::InputNumber);
} else if (property == InputNumber) {
- list.push_back(MappedObjectProperty("%1").arg(m_inputNumber));
+ list.push_back(MappedObjectProperty("%1").tqarg(m_inputNumber));
}
return list;
diff --git a/src/sound/MappedStudio.h b/src/sound/MappedStudio.h
index 89acc9b..96c5639 100644
--- a/src/sound/MappedStudio.h
+++ b/src/sound/MappedStudio.h
@@ -135,7 +135,7 @@ public:
void destroy();
void destroyChildren();
- std::vector<MappedObject*> getChildObjects() { return m_children; }
+ std::vector<MappedObject*> getChildObjects() { return m_tqchildren; }
protected:
@@ -144,7 +144,7 @@ protected:
std::string m_name;
MappedObject *m_parent;
- std::vector<MappedObject*> m_children;
+ std::vector<MappedObject*> m_tqchildren;
};
diff --git a/src/sound/MidiFile.cpp b/src/sound/MidiFile.cpp
index a2a4475..509b3d3 100644
--- a/src/sound/MidiFile.cpp
+++ b/src/sound/MidiFile.cpp
@@ -171,7 +171,7 @@ MidiFile::getMidiByte(ifstream* midiFile)
emit setProgress((int)(double(midiFile->tellg()) /
double(m_fileSize) * 20.0));
- kapp->processEvents(50);
+ kapp->tqprocessEvents(50);
}
return (MidiByte)byte;
@@ -249,7 +249,7 @@ MidiFile::getMidiBytes(ifstream* midiFile, unsigned long numberOfBytes)
if (bytesGot % 2000 == 0) {
emit setProgress((int)(double(midiFile->tellg()) /
double(m_fileSize) * 20.0));
- kapp->processEvents(50);
+ kapp->tqprocessEvents(50);
}
return stringRet;
@@ -524,7 +524,7 @@ MidiFile::parseTrack(ifstream* midiFile, TrackId &lastTrackNum)
TrackId metaTrack = lastTrackNum;
// Remember the last non-meta status byte (-1 if we haven't seen one)
- int runningStatus = -1;
+ int runningtqStatus = -1;
bool firstTrack = true;
@@ -550,11 +550,11 @@ MidiFile::parseTrack(ifstream* midiFile, TrackId &lastTrackNum)
midiByte = getMidiByte(midiFile);
if (!(midiByte & MIDI_STATUS_BYTE_MASK)) {
- if (runningStatus < 0) {
+ if (runningtqStatus < 0) {
throw (Exception("Running status used for first event in track"));
}
- eventCode = (MidiByte)runningStatus;
+ eventCode = (MidiByte)runningtqStatus;
data1 = midiByte;
#ifdef MIDI_DEBUG
@@ -603,7 +603,7 @@ MidiFile::parseTrack(ifstream* midiFile, TrackId &lastTrackNum)
} else // the rest
{
- runningStatus = eventCode;
+ runningtqStatus = eventCode;
MidiEvent *midiEvent;
@@ -842,7 +842,7 @@ MidiFile::convertToRosegarden(Composition &composition, ConversionType type)
// split over these tracks
emit setProgress(20 +
(int)((80.0 * double(i) / double(m_numberOfTracks))));
- kapp->processEvents(50);
+ kapp->tqprocessEvents(50);
// Convert the deltaTime to an absolute time since
// the start of the segment. The addTime method
@@ -2120,7 +2120,7 @@ MidiFile::writeTrack(std::ofstream* midiFile, TrackId trackNumber)
if (progressCount % 500 == 0) {
emit setProgress(progressCount * 100 / progressTotal);
- kapp->processEvents(500);
+ kapp->tqprocessEvents(500);
}
}
diff --git a/src/sound/PeakFile.cpp b/src/sound/PeakFile.cpp
index 12e9186..aebd7c7 100644
--- a/src/sound/PeakFile.cpp
+++ b/src/sound/PeakFile.cpp
@@ -24,7 +24,7 @@
#include <tqdatetime.h>
#include <tqstringlist.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <kapp.h>
#include "PeakFile.h"
@@ -286,7 +286,7 @@ PeakFile::close()
// Set modification time to now
//
- m_modificationTime = m_modificationTime.currentDateTime();
+ m_modificationTime = m_modificationTime.tqcurrentDateTime();
TQString fDate;
fDate.sprintf("%04d:%02d:%02d:%02d:%02d:%02d:%03d",
diff --git a/src/sound/RIFFAudioFile.cpp b/src/sound/RIFFAudioFile.cpp
index c34435f..823ee4f 100644
--- a/src/sound/RIFFAudioFile.cpp
+++ b/src/sound/RIFFAudioFile.cpp
@@ -154,7 +154,7 @@ RIFFAudioFile::scanTo(std::ifstream *file, const RealTime &time)
if (file == 0)
return false;
- // whatever we do here we invalidate the read buffer
+ // whatever we do here we tqinvalidate the read buffer
//
m_loseBuffer = true;
diff --git a/src/sound/RecordableAudioFile.h b/src/sound/RecordableAudioFile.h
index 06df6f0..886b07c 100644
--- a/src/sound/RecordableAudioFile.h
+++ b/src/sound/RecordableAudioFile.h
@@ -44,21 +44,21 @@ public:
IDLE,
RECORDING,
DEFUNCT
- } RecordStatus;
+ } RecordtqStatus;
RecordableAudioFile(AudioFile *audioFile, // should be already open for writing
size_t bufferSize);
~RecordableAudioFile();
- void setStatus(const RecordStatus &status) { m_status = status; }
- RecordStatus getStatus() const { return m_status; }
+ void settqStatus(const RecordtqStatus &status) { m_status = status; }
+ RecordtqStatus gettqStatus() const { return m_status; }
size_t buffer(const sample_t *data, int channel, size_t frames);
void write();
protected:
AudioFile *m_audioFile;
- RecordStatus m_status;
+ RecordtqStatus m_status;
std::vector<RingBuffer<sample_t> *> m_ringBuffers; // one per channel
};
diff --git a/src/sound/SoundDriver.cpp b/src/sound/SoundDriver.cpp
index aab641c..f09de3b 100644
--- a/src/sound/SoundDriver.cpp
+++ b/src/sound/SoundDriver.cpp
@@ -40,12 +40,12 @@ namespace Rosegarden
SoundDriver::SoundDriver(MappedStudio *studio, const std::string &name):
m_name(name),
- m_driverStatus(NO_DRIVER),
+ m_drivertqStatus(NO_DRIVER),
m_playStartPosition(0, 0),
m_startPlayback(false),
m_playing(false),
m_midiRecordDevice(0),
- m_recordStatus(RECORD_OFF),
+ m_recordtqStatus(RECORD_OFF),
m_midiRunningId(MidiInstrumentBase),
m_audioRunningId(AudioInstrumentBase),
// m_audioQueueScavenger(4, 50),
@@ -55,8 +55,8 @@ SoundDriver::SoundDriver(MappedStudio *studio, const std::string &name):
m_studio(studio),
m_sequencerDataBlock(0),
m_externalTransport(0),
- m_mmcStatus(TRANSPORT_OFF),
- m_mtcStatus(TRANSPORT_OFF),
+ m_mmctqStatus(TRANSPORT_OFF),
+ m_mtctqStatus(TRANSPORT_OFF),
m_mmcId(0), // default MMC id of 0
m_midiClockEnabled(false),
m_midiClockInterval(0, 0),
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