diff options
Diffstat (limited to 'src/sound/AlsaDriver.cpp')
| -rw-r--r-- | src/sound/AlsaDriver.cpp | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/src/sound/AlsaDriver.cpp b/src/sound/AlsaDriver.cpp index 921b17f..58d8093 100644 --- a/src/sound/AlsaDriver.cpp +++ b/src/sound/AlsaDriver.cpp @@ -223,7 +223,7 @@ AlsaDriver::getSystemInfo() } void -AlsaDriver::showQueuetqStatus(int queue) +AlsaDriver::showQueueStatus(int queue) { int err, idx, min, max; snd_seq_queue_status_t *status; @@ -705,7 +705,7 @@ AlsaDriver::generateInstruments() DeviceId ssiDeviceId = getSpareDeviceId(); - if (m_drivertqStatus & AUDIO_OK) { + if (m_driverStatus & 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_drivertqStatus & AUDIO_OK) + if (m_driverStatus & 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") - .tqarg(m_outputPorts.size() + 1); + .arg(m_outputPorts.size() + 1); } else { portName = TQString("out %1 - %2") - .tqarg(m_outputPorts.size() + 1) - .tqarg(deviceName); + .arg(m_outputPorts.size() + 1) + .arg(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 || - (getMTCtqStatus() == TRANSPORT_SLAVE)) { + (getMTCStatus() == TRANSPORT_SLAVE)) { m_firstTimerCheck = true; return ; } @@ -1817,7 +1817,7 @@ AlsaDriver::initialiseMidi() // Modify status with MIDI success // - m_drivertqStatus |= MIDI_OK; + m_driverStatus |= MIDI_OK; generateTimerList(); setCurrentTimer(AUTO_TIMER_NAME); @@ -1851,7 +1851,7 @@ AlsaDriver::initialiseAudio() m_jackDriver = new JackDriver(this); if (m_jackDriver->isOK()) { - m_drivertqStatus |= AUDIO_OK; + m_driverStatus |= 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 (getMMCtqStatus() == TRANSPORT_MASTER) { + if (getMMCStatus() == TRANSPORT_MASTER) { sendMMC(127, MIDI_MMC_PLAY, true, ""); m_eat_mtc = 0; } - if (getMTCtqStatus() == TRANSPORT_MASTER) { + if (getMTCStatus() == TRANSPORT_MASTER) { insertMTCFullFrame(position); } // If MIDI Sync is enabled then adjust for the MIDI Clock to // synchronise the sequencer with the clock. // - if (getMIDISynctqStatus() == TRANSPORT_MASTER) { + if (getMIDISyncStatus() == 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 (getMIDISynctqStatus() == TRANSPORT_MASTER) { + if (getMIDISyncStatus() == TRANSPORT_MASTER) { sendSystemDirect(SND_SEQ_EVENT_STOP, NULL); } - if (getMMCtqStatus() == TRANSPORT_MASTER) { + if (getMMCStatus() == 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_recordtqStatus == RECORD_ON) { + if (m_recordStatus == 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_recordtqStatus == RECORD_ON) - m_recordtqStatus = RECORD_OFF; + if (m_recordStatus == RECORD_ON) + m_recordStatus = 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 (getMMCtqStatus() == TRANSPORT_MASTER) { + if (getMMCStatus() == 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 (getMTCtqStatus() == TRANSPORT_MASTER) { + if (getMTCStatus() == 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 (getMTCtqStatus() == TRANSPORT_SLAVE) { + if (getMTCStatus() == TRANSPORT_SLAVE) { handleMTCTQFrame(event->data.control.value, eventTime); } break; @@ -2733,7 +2733,7 @@ AlsaDriver::getMappedComposition() break; case SND_SEQ_EVENT_START: - if ((getMIDISynctqStatus() == TRANSPORT_SLAVE) && !isPlaying()) { + if ((getMIDISyncStatus() == 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 ((getMIDISynctqStatus() == TRANSPORT_SLAVE) && !isPlaying()) { + if ((getMIDISyncStatus() == 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 ((getMIDISynctqStatus() == TRANSPORT_SLAVE) && isPlaying()) { + if ((getMIDISyncStatus() == TRANSPORT_SLAVE) && isPlaying()) { ExternalTransport *transport = getExternalTransportControl(); if (transport) { transport->transportChange(ExternalTransport::TransportStop); @@ -2819,7 +2819,7 @@ AlsaDriver::getMappedComposition() } } - if (getMTCtqStatus() == TRANSPORT_SLAVE && isPlaying()) { + if (getMTCStatus() == 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 (getMTCtqStatus() != TRANSPORT_SLAVE) + if (getMTCStatus() != 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 (getMTCtqStatus() != TRANSPORT_SLAVE) + if (getMTCStatus() != 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 (getMMCtqStatus() != TRANSPORT_SLAVE) + if (getMMCStatus() != 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 (getMTCtqStatus() == TRANSPORT_MASTER) { + if (getMTCStatus() == TRANSPORT_MASTER) { insertMTCTQFrames(sliceStart, sliceEnd); } @@ -4009,7 +4009,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC, // we're really rolling. m_playing = true; - if (getMTCtqStatus() == TRANSPORT_SLAVE) { + if (getMTCStatus() == TRANSPORT_SLAVE) { tweakSkewForMTC(0); } } @@ -4155,7 +4155,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC, << std::endl; #endif - setMIDISynctqStatus(TRANSPORT_OFF); + setMIDISyncStatus(TRANSPORT_OFF); break; case 1: @@ -4167,7 +4167,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC, << std::endl; #endif - setMIDISynctqStatus(TRANSPORT_MASTER); + setMIDISyncStatus(TRANSPORT_MASTER); break; case 2: @@ -4179,7 +4179,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC, << std::endl; #endif - setMIDISynctqStatus(TRANSPORT_SLAVE); + setMIDISyncStatus(TRANSPORT_SLAVE); break; } } @@ -4274,7 +4274,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC, << std::endl; #endif - setMMCtqStatus(TRANSPORT_MASTER); + setMMCStatus(TRANSPORT_MASTER); break; case 2: @@ -4285,7 +4285,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC, << std::endl; #endif - setMMCtqStatus(TRANSPORT_SLAVE); + setMMCStatus(TRANSPORT_SLAVE); break; case 0: @@ -4297,7 +4297,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC, << std::endl; #endif - setMMCtqStatus(TRANSPORT_OFF); + setMMCStatus(TRANSPORT_OFF); break; } } @@ -4312,7 +4312,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC, << std::endl; #endif - setMTCtqStatus(TRANSPORT_MASTER); + setMTCStatus(TRANSPORT_MASTER); tweakSkewForMTC(0); m_mtcFirstTime = -1; break; @@ -4325,7 +4325,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC, << std::endl; #endif - setMTCtqStatus(TRANSPORT_SLAVE); + setMTCStatus(TRANSPORT_SLAVE); m_mtcFirstTime = -1; break; @@ -4338,7 +4338,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC, << std::endl; #endif - setMTCtqStatus(TRANSPORT_OFF); + setMTCStatus(TRANSPORT_OFF); m_mtcFirstTime = -1; break; } @@ -4477,15 +4477,15 @@ AlsaDriver::processEventsOut(const MappedComposition &mC, } bool -AlsaDriver::record(RecordtqStatus recordtqStatus, +AlsaDriver::record(RecordStatus recordStatus, const std::vector<InstrumentId> *armedInstruments, const std::vector<TQString> *audioFileNames) { m_recordingInstruments.clear(); - if (recordtqStatus == RECORD_ON) { + if (recordStatus == RECORD_ON) { // start recording - m_recordtqStatus = RECORD_ON; + m_recordStatus = RECORD_ON; m_alsaRecordStartTime = RealTime::zeroTime; unsigned int audioCount = 0; @@ -4522,7 +4522,7 @@ AlsaDriver::record(RecordtqStatus recordtqStatus, #endif if (!good) { - m_recordtqStatus = RECORD_OFF; + m_recordStatus = 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(RecordtqStatus recordtqStatus, } } } else - if (recordtqStatus == RECORD_OFF) { - m_recordtqStatus = RECORD_OFF; + if (recordStatus == RECORD_OFF) { + m_recordStatus = RECORD_OFF; } #ifdef DEBUG_ALSA else { |