diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2014-02-16 14:40:24 -0600 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2014-02-16 14:40:24 -0600 |
commit | 0ab5fbc594609c90373e83aae598eb4efd37ddf3 (patch) | |
tree | 4c5a2c8155b6104cca588bfe3cd80837be93f1e0 | |
parent | ae53ad08dbe88e0dc753e9aa71e66a8afe441844 (diff) | |
download | rosegarden-0ab5fbc594609c90373e83aae598eb4efd37ddf3.tar.gz rosegarden-0ab5fbc594609c90373e83aae598eb4efd37ddf3.zip |
Fix unintended renaming
-rw-r--r-- | src/commands/studio/CreateOrDeleteDeviceCommand.cpp | 14 | ||||
-rw-r--r-- | src/commands/studio/ReconnectDeviceCommand.cpp | 8 | ||||
-rw-r--r-- | src/document/RoseXmlHandler.cpp | 18 | ||||
-rw-r--r-- | src/gui/seqmanager/CompositionMmapper.cpp | 16 | ||||
-rw-r--r-- | src/gui/seqmanager/ControlBlockMmapper.cpp | 16 | ||||
-rw-r--r-- | src/gui/seqmanager/MetronomeMmapper.cpp | 18 | ||||
-rw-r--r-- | src/gui/seqmanager/SegmentMmapper.cpp | 34 | ||||
-rw-r--r-- | src/gui/seqmanager/SegmentMmapperFactory.cpp | 4 | ||||
-rw-r--r-- | src/gui/seqmanager/SequenceManager.cpp | 126 | ||||
-rw-r--r-- | src/gui/studio/StudioControl.cpp | 22 | ||||
-rw-r--r-- | src/misc/Debug.h | 2 | ||||
-rw-r--r-- | src/sequencer/ControlBlockMmapper.cpp | 4 |
12 files changed, 141 insertions, 141 deletions
diff --git a/src/commands/studio/CreateOrDeleteDeviceCommand.cpp b/src/commands/studio/CreateOrDeleteDeviceCommand.cpp index c3f7d8e..3933483 100644 --- a/src/commands/studio/CreateOrDeleteDeviceCommand.cpp +++ b/src/commands/studio/CreateOrDeleteDeviceCommand.cpp @@ -84,7 +84,7 @@ CreateOrDeleteDeviceCommand::execute() if (!rgapp->sequencerCall("addDevice(int, unsigned int)", replyType, replyData, data)) { - SETQMAN_DEBUG << "CreateDeviceCommand::execute - " + SEQMAN_DEBUG << "CreateDeviceCommand::execute - " << "failure in sequencer addDevice" << endl; return ; } @@ -93,12 +93,12 @@ CreateOrDeleteDeviceCommand::execute() reply >> m_deviceId; if (m_deviceId == Device::NO_DEVICE) { - SETQMAN_DEBUG << "CreateDeviceCommand::execute - " + SEQMAN_DEBUG << "CreateDeviceCommand::execute - " << "sequencer addDevice failed" << endl; return ; } - SETQMAN_DEBUG << "CreateDeviceCommand::execute - " + SEQMAN_DEBUG << "CreateDeviceCommand::execute - " << " added device " << m_deviceId << endl; arg.device()->reset(); @@ -107,12 +107,12 @@ CreateOrDeleteDeviceCommand::execute() if (!rgapp->sequencerCall("setConnection(unsigned int, TQString)", replyType, replyData, data)) { - SETQMAN_DEBUG << "CreateDeviceCommand::execute - " + SEQMAN_DEBUG << "CreateDeviceCommand::execute - " << "failure in sequencer setConnection" << endl; return ; } - SETQMAN_DEBUG << "CreateDeviceCommand::execute - " + SEQMAN_DEBUG << "CreateDeviceCommand::execute - " << " reconnected device " << m_deviceId << " to " << m_connection << endl; @@ -143,12 +143,12 @@ CreateOrDeleteDeviceCommand::execute() if (!rgapp->sequencerCall("removeDevice(unsigned int)", replyType, replyData, data)) { - SETQMAN_DEBUG << "CreateDeviceCommand::execute - " + SEQMAN_DEBUG << "CreateDeviceCommand::execute - " << "failure in sequencer addDevice" << endl; return ; } - SETQMAN_DEBUG << "CreateDeviceCommand::unexecute - " + SEQMAN_DEBUG << "CreateDeviceCommand::unexecute - " << " removed device " << m_deviceId << endl; m_studio->removeDevice(m_deviceId); diff --git a/src/commands/studio/ReconnectDeviceCommand.cpp b/src/commands/studio/ReconnectDeviceCommand.cpp index b798a2c..3d28185 100644 --- a/src/commands/studio/ReconnectDeviceCommand.cpp +++ b/src/commands/studio/ReconnectDeviceCommand.cpp @@ -56,12 +56,12 @@ ReconnectDeviceCommand::execute() if (!rgapp->sequencerCall("setConnection(unsigned int, TQString)", replyType, replyData, data)) { - SETQMAN_DEBUG << "ReconnectDeviceCommand::execute - " + SEQMAN_DEBUG << "ReconnectDeviceCommand::execute - " << "failure in sequencer setConnection" << endl; return ; } - SETQMAN_DEBUG << "ReconnectDeviceCommand::execute - " + SEQMAN_DEBUG << "ReconnectDeviceCommand::execute - " << " reconnected device " << m_deviceId << " to " << m_newConnection << endl; } @@ -84,12 +84,12 @@ ReconnectDeviceCommand::unexecute() if (!rgapp->sequencerCall("setConnection(unsigned int, TQString)", replyType, replyData, data)) { - SETQMAN_DEBUG << "ReconnectDeviceCommand::unexecute - " + SEQMAN_DEBUG << "ReconnectDeviceCommand::unexecute - " << "failure in sequencer setConnection" << endl; return ; } - SETQMAN_DEBUG << "ReconnectDeviceCommand::unexecute - " + SEQMAN_DEBUG << "ReconnectDeviceCommand::unexecute - " << " reconnected device " << m_deviceId << " to " << m_oldConnection << endl; } diff --git a/src/document/RoseXmlHandler.cpp b/src/document/RoseXmlHandler.cpp index 4b6d932..cba24de 100644 --- a/src/document/RoseXmlHandler.cpp +++ b/src/document/RoseXmlHandler.cpp @@ -2250,7 +2250,7 @@ RoseXmlHandler::addMIDIDevice(TQString name, bool createAtSequencer) arg << (unsigned int)MidiDevice::Play; if (!rgapp->sequencerCall("addDevice(int, unsigned int)", replyType, replyData, data)) { - SETQMAN_DEBUG << "RoseXmlHandler::addMIDIDevice - " + SEQMAN_DEBUG << "RoseXmlHandler::addMIDIDevice - " << "can't call sequencer addDevice" << endl; return ; } @@ -2259,18 +2259,18 @@ RoseXmlHandler::addMIDIDevice(TQString name, bool createAtSequencer) TQDataStream reply(replyData, IO_ReadOnly); reply >> deviceId; } else { - SETQMAN_DEBUG << "RoseXmlHandler::addMIDIDevice - " + SEQMAN_DEBUG << "RoseXmlHandler::addMIDIDevice - " << "got unknown returntype from addDevice()" << endl; return ; } if (deviceId == Device::NO_DEVICE) { - SETQMAN_DEBUG << "RoseXmlHandler::addMIDIDevice - " + SEQMAN_DEBUG << "RoseXmlHandler::addMIDIDevice - " << "sequencer addDevice failed" << endl; return ; } - SETQMAN_DEBUG << "RoseXmlHandler::addMIDIDevice - " + SEQMAN_DEBUG << "RoseXmlHandler::addMIDIDevice - " << " added device " << deviceId << endl; } else { @@ -2298,7 +2298,7 @@ RoseXmlHandler::addMIDIDevice(TQString name, bool createAtSequencer) void RoseXmlHandler::skipToNextPlayDevice() { - SETQMAN_DEBUG << "RoseXmlHandler::skipToNextPlayDevice; m_deviceRunningId is " << m_deviceRunningId << endl; + SEQMAN_DEBUG << "RoseXmlHandler::skipToNextPlayDevice; m_deviceRunningId is " << m_deviceRunningId << endl; for (DeviceList::iterator i = getStudio().getDevices()->begin(); i != getStudio().getDevices()->end(); ++i) { @@ -2310,7 +2310,7 @@ RoseXmlHandler::skipToNextPlayDevice() if (m_deviceRunningId == Device::NO_DEVICE || md->getId() > m_deviceRunningId) { - SETQMAN_DEBUG << "RoseXmlHandler::skipToNextPlayDevice: found next device: id " << md->getId() << endl; + SEQMAN_DEBUG << "RoseXmlHandler::skipToNextPlayDevice: found next device: id " << md->getId() << endl; m_device = md; m_deviceRunningId = md->getId(); @@ -2319,7 +2319,7 @@ RoseXmlHandler::skipToNextPlayDevice() } } - SETQMAN_DEBUG << "RoseXmlHandler::skipToNextPlayDevice: fresh out of devices" << endl; + SEQMAN_DEBUG << "RoseXmlHandler::skipToNextPlayDevice: fresh out of devices" << endl; m_device = 0; } @@ -2327,7 +2327,7 @@ RoseXmlHandler::skipToNextPlayDevice() void RoseXmlHandler::setMIDIDeviceConnection(TQString connection) { - SETQMAN_DEBUG << "RoseXmlHandler::setMIDIDeviceConnection(" << connection << ")" << endl; + SEQMAN_DEBUG << "RoseXmlHandler::setMIDIDeviceConnection(" << connection << ")" << endl; MidiDevice *md = dynamic_cast<MidiDevice *>(m_device); if (!md) @@ -2347,7 +2347,7 @@ RoseXmlHandler::setMIDIDeviceConnection(TQString connection) void RoseXmlHandler::setMIDIDeviceName(TQString name) { - SETQMAN_DEBUG << "RoseXmlHandler::setMIDIDeviceName(" << name << ")" << endl; + SEQMAN_DEBUG << "RoseXmlHandler::setMIDIDeviceName(" << name << ")" << endl; MidiDevice *md = dynamic_cast<MidiDevice *>(m_device); if (!md) diff --git a/src/gui/seqmanager/CompositionMmapper.cpp b/src/gui/seqmanager/CompositionMmapper.cpp index c86fbab..cbd153b 100644 --- a/src/gui/seqmanager/CompositionMmapper.cpp +++ b/src/gui/seqmanager/CompositionMmapper.cpp @@ -49,7 +49,7 @@ CompositionMmapper::CompositionMmapper(RosegardenGUIDoc *doc) { cleanup(); - SETQMAN_DEBUG << "CompositionMmapper() - doc = " << doc << endl; + SEQMAN_DEBUG << "CompositionMmapper() - doc = " << doc << endl; Composition &comp = m_doc->getComposition(); for (Composition::iterator it = comp.begin(); it != comp.end(); it++) { @@ -67,7 +67,7 @@ CompositionMmapper::CompositionMmapper(RosegardenGUIDoc *doc) CompositionMmapper::~CompositionMmapper() { - SETQMAN_DEBUG << "~CompositionMmapper()\n"; + SEQMAN_DEBUG << "~CompositionMmapper()\n"; // // Clean up possible left-overs @@ -92,7 +92,7 @@ void CompositionMmapper::cleanup() TQDir segmentsDir(tmpPath, "segment_*"); for (unsigned int i = 0; i < segmentsDir.count(); ++i) { TQString segmentName = tmpPath + '/' + segmentsDir[i]; - SETQMAN_DEBUG << "CompositionMmapper : cleaning up " << segmentName << endl; + SEQMAN_DEBUG << "CompositionMmapper : cleaning up " << segmentName << endl; TQFile::remove (segmentName); } @@ -107,7 +107,7 @@ bool CompositionMmapper::segmentModified(Segment* segment) return false; // this can happen with the SegmentSplitCommand, where the new segment's transpose is set // even though it's not mapped yet - SETQMAN_DEBUG << "CompositionMmapper::segmentModified(" << segment << ") - mmapper = " + SEQMAN_DEBUG << "CompositionMmapper::segmentModified(" << segment << ") - mmapper = " << mmapper << endl; return mmapper->refresh(); @@ -115,24 +115,24 @@ bool CompositionMmapper::segmentModified(Segment* segment) void CompositionMmapper::segmentAdded(Segment* segment) { - SETQMAN_DEBUG << "CompositionMmapper::segmentAdded(" << segment << ")\n"; + SEQMAN_DEBUG << "CompositionMmapper::segmentAdded(" << segment << ")\n"; mmapSegment(segment); } void CompositionMmapper::segmentDeleted(Segment* segment) { - SETQMAN_DEBUG << "CompositionMmapper::segmentDeleted(" << segment << ")\n"; + SEQMAN_DEBUG << "CompositionMmapper::segmentDeleted(" << segment << ")\n"; SegmentMmapper* mmapper = m_segmentMmappers[segment]; m_segmentMmappers.erase(segment); - SETQMAN_DEBUG << "CompositionMmapper::segmentDeleted() : deleting SegmentMmapper " << mmapper << endl; + SEQMAN_DEBUG << "CompositionMmapper::segmentDeleted() : deleting SegmentMmapper " << mmapper << endl; delete mmapper; } void CompositionMmapper::mmapSegment(Segment* segment) { - SETQMAN_DEBUG << "CompositionMmapper::mmapSegment(" << segment << ")\n"; + SEQMAN_DEBUG << "CompositionMmapper::mmapSegment(" << segment << ")\n"; SegmentMmapper* mmapper = SegmentMmapperFactory::makeMmapperForSegment(m_doc, segment, diff --git a/src/gui/seqmanager/ControlBlockMmapper.cpp b/src/gui/seqmanager/ControlBlockMmapper.cpp index ec4810b..ff37495 100644 --- a/src/gui/seqmanager/ControlBlockMmapper.cpp +++ b/src/gui/seqmanager/ControlBlockMmapper.cpp @@ -62,7 +62,7 @@ ControlBlockMmapper::ControlBlockMmapper(RosegardenGUIDoc* doc) m_fd = ::open(m_fileName.latin1(), O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); if (m_fd < 0) { - SETQMAN_DEBUG << "ControlBlockMmapper : Couldn't open " << m_fileName + SEQMAN_DEBUG << "ControlBlockMmapper : Couldn't open " << m_fileName << endl; throw Exception("Couldn't open " + qstrtostr(m_fileName)); } @@ -77,11 +77,11 @@ ControlBlockMmapper::ControlBlockMmapper(RosegardenGUIDoc* doc) MAP_SHARED, m_fd, 0); if (m_mmappedBuffer == (void*) - 1) { - SETQMAN_DEBUG << TQString("mmap failed : (%1) %2\n").arg(errno).arg(strerror(errno)); + SEQMAN_DEBUG << TQString("mmap failed : (%1) %2\n").arg(errno).arg(strerror(errno)); throw Exception("mmap failed"); } - SETQMAN_DEBUG << "ControlBlockMmapper : mmap size : " << m_mmappedSize + SEQMAN_DEBUG << "ControlBlockMmapper : mmap size : " << m_mmappedSize << " at " << (void*)m_mmappedBuffer << endl; // Create new control block on file @@ -126,7 +126,7 @@ void ControlBlockMmapper::updateMetronomeData(InstrumentId instId) void ControlBlockMmapper::updateMetronomeForPlayback() { bool muted = !m_doc->getComposition().usePlayMetronome(); - SETQMAN_DEBUG << "ControlBlockMmapper::updateMetronomeForPlayback: muted=" << muted << endl; + SEQMAN_DEBUG << "ControlBlockMmapper::updateMetronomeForPlayback: muted=" << muted << endl; if (m_controlBlock->isMetronomeMuted() == muted) return ; m_controlBlock->setMetronomeMuted(muted); @@ -135,7 +135,7 @@ void ControlBlockMmapper::updateMetronomeForPlayback() void ControlBlockMmapper::updateMetronomeForRecord() { bool muted = !m_doc->getComposition().useRecordMetronome(); - SETQMAN_DEBUG << "ControlBlockMmapper::updateMetronomeForRecord: muted=" << muted << endl; + SEQMAN_DEBUG << "ControlBlockMmapper::updateMetronomeForRecord: muted=" << muted << endl; if (m_controlBlock->isMetronomeMuted() == muted) return ; m_controlBlock->setMetronomeMuted(muted); @@ -164,14 +164,14 @@ bool ControlBlockMmapper::updateSoloData(bool solo, void ControlBlockMmapper::setDocument(RosegardenGUIDoc* doc) { - SETQMAN_DEBUG << "ControlBlockMmapper::setDocument()\n"; + SEQMAN_DEBUG << "ControlBlockMmapper::setDocument()\n"; m_doc = doc; initControlBlock(); } void ControlBlockMmapper::initControlBlock() { - SETQMAN_DEBUG << "ControlBlockMmapper::initControlBlock()\n"; + SEQMAN_DEBUG << "ControlBlockMmapper::initControlBlock()\n"; m_controlBlock = new (m_mmappedBuffer) ControlBlock(m_doc->getComposition().getMaxTrackId()); @@ -195,7 +195,7 @@ void ControlBlockMmapper::initControlBlock() void ControlBlockMmapper::setFileSize(size_t size) { - SETQMAN_DEBUG << "ControlBlockMmapper : setting size of " + SEQMAN_DEBUG << "ControlBlockMmapper : setting size of " << m_fileName << " to " << size << endl; // rewind ::lseek(m_fd, 0, SEEK_SET); diff --git a/src/gui/seqmanager/MetronomeMmapper.cpp b/src/gui/seqmanager/MetronomeMmapper.cpp index 196c481..a21c9cf 100644 --- a/src/gui/seqmanager/MetronomeMmapper.cpp +++ b/src/gui/seqmanager/MetronomeMmapper.cpp @@ -54,7 +54,7 @@ MetronomeMmapper::MetronomeMmapper(RosegardenGUIDoc* doc) m_metronome(0), // no metronome to begin with m_tickDuration(0, 100000000) { - SETQMAN_DEBUG << "MetronomeMmapper ctor : " << this << endl; + SEQMAN_DEBUG << "MetronomeMmapper ctor : " << this << endl; // get metronome device Studio &studio = m_doc->getStudio(); @@ -65,13 +65,13 @@ MetronomeMmapper::MetronomeMmapper(RosegardenGUIDoc* doc) if (metronome) { - SETQMAN_DEBUG << "MetronomeMmapper: have metronome, it's on instrument " << metronome->getInstrument() << endl; + SEQMAN_DEBUG << "MetronomeMmapper: have metronome, it's on instrument " << metronome->getInstrument() << endl; m_metronome = new MidiMetronome(*metronome); } else { m_metronome = new MidiMetronome (SystemInstrumentBase); - SETQMAN_DEBUG << "MetronomeMmapper: no metronome for device " << device << endl; + SEQMAN_DEBUG << "MetronomeMmapper: no metronome for device " << device << endl; } Composition& c = m_doc->getComposition(); @@ -129,7 +129,7 @@ MetronomeMmapper::MetronomeMmapper(RosegardenGUIDoc* doc) sortTicks(); if (m_ticks.size() == 0) { - SETQMAN_DEBUG << "MetronomeMmapper : WARNING no ticks generated\n"; + SEQMAN_DEBUG << "MetronomeMmapper : WARNING no ticks generated\n"; } // Done by init() @@ -144,7 +144,7 @@ MetronomeMmapper::MetronomeMmapper(RosegardenGUIDoc* doc) MetronomeMmapper::~MetronomeMmapper() { - SETQMAN_DEBUG << "~MetronomeMmapper " << this << endl; + SEQMAN_DEBUG << "~MetronomeMmapper " << this << endl; delete m_metronome; } @@ -163,14 +163,14 @@ void MetronomeMmapper::dump() RealTime eventTime; Composition& comp = m_doc->getComposition(); - SETQMAN_DEBUG << "MetronomeMmapper::dump: instrument is " << m_metronome->getInstrument() << endl; + SEQMAN_DEBUG << "MetronomeMmapper::dump: instrument is " << m_metronome->getInstrument() << endl; MappedEvent* bufPos = m_mmappedEventBuffer, *mE; for (TickContainer::iterator i = m_ticks.begin(); i != m_ticks.end(); ++i) { /* - SETQMAN_DEBUG << "MetronomeMmapper::dump: velocity = " + SEQMAN_DEBUG << "MetronomeMmapper::dump: velocity = " << int(velocity) << endl; */ @@ -214,7 +214,7 @@ void MetronomeMmapper::dump() // Store the number of events at the start of the shared memory region *(size_t *)m_mmappedRegion = (bufPos - m_mmappedEventBuffer); - SETQMAN_DEBUG << "MetronomeMmapper::dump: - " + SEQMAN_DEBUG << "MetronomeMmapper::dump: - " << "Total events written = " << *(size_t *)m_mmappedRegion << endl; } @@ -244,7 +244,7 @@ size_t MetronomeMmapper::computeMmappedSize() Note(Note::Crotchet).getDuration(); /* - SETQMAN_DEBUG << "MetronomeMmapper::computeMmappedSize - " + SEQMAN_DEBUG << "MetronomeMmapper::computeMmappedSize - " << "Number of clock events catered for = " << clocks << endl; */ diff --git a/src/gui/seqmanager/SegmentMmapper.cpp b/src/gui/seqmanager/SegmentMmapper.cpp index 29fe715..8cebe8d 100644 --- a/src/gui/seqmanager/SegmentMmapper.cpp +++ b/src/gui/seqmanager/SegmentMmapper.cpp @@ -60,7 +60,7 @@ SegmentMmapper::SegmentMmapper(RosegardenGUIDoc* doc, m_mmappedRegion(0), m_mmappedEventBuffer((MappedEvent*)0) { - SETQMAN_DEBUG << "SegmentMmapper : " << this + SEQMAN_DEBUG << "SegmentMmapper : " << this << " trying to mmap " << m_fileName << endl; @@ -68,12 +68,12 @@ SegmentMmapper::SegmentMmapper(RosegardenGUIDoc* doc, S_IRUSR | S_IWUSR); if (m_fd < 0) { perror("SegmentMmapper::SegmentMmapper: Failed to open mmap file for writing"); - SETQMAN_DEBUG << "SegmentMmapper : Couldn't open " << m_fileName + SEQMAN_DEBUG << "SegmentMmapper : Couldn't open " << m_fileName << endl; throw Exception("Couldn't open " + qstrtostr(m_fileName)); } - // SETQMAN_DEBUG << "SegmentMmapper : mmap size = " << m_mmappedSize + // SEQMAN_DEBUG << "SegmentMmapper : mmap size = " << m_mmappedSize // << endl; } @@ -86,18 +86,18 @@ void SegmentMmapper::init() doMmap(); dump(); if (m_segment != 0) { - SETQMAN_DEBUG << "SegmentMmapper::init : mmap size = " << m_mmappedSize + SEQMAN_DEBUG << "SegmentMmapper::init : mmap size = " << m_mmappedSize << " for segment " << m_segment->getLabel() << endl; } } else { - SETQMAN_DEBUG << "SegmentMmapper::init : mmap size = 0 - skipping mmapping for now\n"; + SEQMAN_DEBUG << "SegmentMmapper::init : mmap size = 0 - skipping mmapping for now\n"; } } SegmentMmapper::~SegmentMmapper() { - SETQMAN_DEBUG << "~SegmentMmapper : " << this + SEQMAN_DEBUG << "~SegmentMmapper : " << this << " unmapping " << (void*)m_mmappedRegion << " of size " << m_mmappedSize << endl; @@ -106,7 +106,7 @@ SegmentMmapper::~SegmentMmapper() ::munmap(m_mmappedRegion, m_mmappedSize); ::close(m_fd); - SETQMAN_DEBUG << "~SegmentMmapper : removing " << m_fileName << endl; + SEQMAN_DEBUG << "~SegmentMmapper : removing " << m_fileName << endl; TQFile::remove (m_fileName); @@ -118,7 +118,7 @@ bool SegmentMmapper::refresh() size_t newMmappedSize = computeMmappedSize() + sizeof(size_t); - SETQMAN_DEBUG << "SegmentMmapper::refresh() - " << getFileName() + SEQMAN_DEBUG << "SegmentMmapper::refresh() - " << getFileName() << " - m_mmappedRegion = " << (void*)m_mmappedRegion << " - m_mmappedEventBuffer = " << (void*)m_mmappedEventBuffer << " - new size = " << newMmappedSize @@ -157,7 +157,7 @@ bool SegmentMmapper::refresh() void SegmentMmapper::setFileSize(size_t size) { - SETQMAN_DEBUG << "SegmentMmapper::setFileSize() : setting size of " + SEQMAN_DEBUG << "SegmentMmapper::setFileSize() : setting size of " << m_fileName << " to " << size << " - current size = " << m_mmappedSize << endl; @@ -173,7 +173,7 @@ void SegmentMmapper::setFileSize(size_t size) // so go the safe way if (size == 0) { - SETQMAN_DEBUG << "SegmentMmapper : size == 0 : no resize to do\n"; + SEQMAN_DEBUG << "SegmentMmapper : size == 0 : no resize to do\n"; return ; } @@ -203,13 +203,13 @@ void SegmentMmapper::setFileSize(size_t size) void SegmentMmapper::remap(size_t newsize) { - SETQMAN_DEBUG << "SegmentMmapper : remapping " << m_fileName + SEQMAN_DEBUG << "SegmentMmapper : remapping " << m_fileName << " from size " << m_mmappedSize << " to size " << newsize << endl; if (!m_mmappedRegion) { // nothing to mremap, just mmap - SETQMAN_DEBUG << "SegmentMmapper : nothing to remap - mmap instead\n"; + SEQMAN_DEBUG << "SegmentMmapper : nothing to remap - mmap instead\n"; m_mmappedSize = newsize; doMmap(); @@ -222,7 +222,7 @@ void SegmentMmapper::remap(size_t newsize) m_mmappedEventBuffer = (MappedEvent *)((size_t *)m_mmappedRegion + 1); if (m_mmappedRegion != oldBuffer) { - SETQMAN_DEBUG << "NOTE: buffer moved from " << oldBuffer << + SEQMAN_DEBUG << "NOTE: buffer moved from " << oldBuffer << " to " << (void *)m_mmappedRegion << endl; } #else @@ -234,7 +234,7 @@ void SegmentMmapper::remap(size_t newsize) #endif if (m_mmappedRegion == (void*) - 1) { - SETQMAN_DEBUG << TQString("mremap failed : (%1) %2\n").arg(errno).arg(strerror(errno)); + SEQMAN_DEBUG << TQString("mremap failed : (%1) %2\n").arg(errno).arg(strerror(errno)); throw Exception("mremap failed"); } @@ -253,11 +253,11 @@ void SegmentMmapper::doMmap() m_mmappedEventBuffer = (MappedEvent *)((size_t *)m_mmappedRegion + 1); if (m_mmappedRegion == (void*) - 1) { - SETQMAN_DEBUG << TQString("mmap failed : (%1) %2\n").arg(errno).arg(strerror(errno)); + SEQMAN_DEBUG << TQString("mmap failed : (%1) %2\n").arg(errno).arg(strerror(errno)); throw Exception("mmap failed"); } - SETQMAN_DEBUG << "SegmentMmapper::doMmap() - mmap size : " << m_mmappedSize + SEQMAN_DEBUG << "SegmentMmapper::doMmap() - mmap size : " << m_mmappedSize << " at " << (void*)m_mmappedRegion << endl; } @@ -401,7 +401,7 @@ void SegmentMmapper::dump() ++bufPos; } catch (...) { - SETQMAN_DEBUG << "SegmentMmapper::dump - caught exception while trying to create MappedEvent\n"; + SEQMAN_DEBUG << "SegmentMmapper::dump - caught exception while trying to create MappedEvent\n"; } } } diff --git a/src/gui/seqmanager/SegmentMmapperFactory.cpp b/src/gui/seqmanager/SegmentMmapperFactory.cpp index f681580..4f40cd6 100644 --- a/src/gui/seqmanager/SegmentMmapperFactory.cpp +++ b/src/gui/seqmanager/SegmentMmapperFactory.cpp @@ -46,7 +46,7 @@ SegmentMmapper* SegmentMmapperFactory::makeMmapperForSegment(RosegardenGUIDoc* d SegmentMmapper* mmapper = 0; if (segment == 0) { - SETQMAN_DEBUG << "SegmentMmapperFactory::makeMmapperForSegment() segment == 0\n"; + SEQMAN_DEBUG << "SegmentMmapperFactory::makeMmapperForSegment() segment == 0\n"; return 0; } @@ -58,7 +58,7 @@ SegmentMmapper* SegmentMmapperFactory::makeMmapperForSegment(RosegardenGUIDoc* d mmapper = new AudioSegmentMmapper(doc, segment, fileName); break; default: - SETQMAN_DEBUG << "SegmentMmapperFactory::makeMmapperForSegment(" << segment + SEQMAN_DEBUG << "SegmentMmapperFactory::makeMmapperForSegment(" << segment << ") : can't map, unknown segment type " << segment->getType() << endl; mmapper = 0; } diff --git a/src/gui/seqmanager/SequenceManager.cpp b/src/gui/seqmanager/SequenceManager.cpp index cc6d52b..38f1522 100644 --- a/src/gui/seqmanager/SequenceManager.cpp +++ b/src/gui/seqmanager/SequenceManager.cpp @@ -148,7 +148,7 @@ SequenceManager::~SequenceManager() { m_doc->getComposition().removeObserver(this); - SETQMAN_DEBUG << "SequenceManager::~SequenceManager()\n"; + SEQMAN_DEBUG << "SequenceManager::~SequenceManager()\n"; delete m_compositionMmapper; delete m_controlBlockMmapper; delete m_metronomeMmapper; @@ -159,7 +159,7 @@ SequenceManager::~SequenceManager() void SequenceManager::setDocument(RosegardenGUIDoc* doc) { - SETQMAN_DEBUG << "SequenceManager::setDocument(" << doc << ")\n"; + SEQMAN_DEBUG << "SequenceManager::setDocument(" << doc << ")\n"; DataBlockRepository::clear(); @@ -201,7 +201,7 @@ void SequenceManager::setDocument(RosegardenGUIDoc* doc) for (Composition::iterator i = comp.begin(); i != comp.end(); ++i) { - SETQMAN_DEBUG << "Adding segment with rid " << (*i)->getRuntimeId() << endl; + SEQMAN_DEBUG << "Adding segment with rid " << (*i)->getRuntimeId() << endl; m_segments.insert(SegmentRefreshMap::value_type (*i, (*i)->getNewRefreshStatusId())); @@ -284,15 +284,15 @@ SequenceManager::play() //!!! disable the record button, because recording while playing is horribly // broken, and disabling it is less complicated than fixing it // see #1223025 - DMM - // SETQMAN_DEBUG << "SequenceManager::play() - disabling record button, as we are playing\n"; + // SEQMAN_DEBUG << "SequenceManager::play() - disabling record button, as we are playing\n"; // m_transport->RecordButton()->setEnabled(false); if (comp.getCurrentTempo() == 0) { comp.setCompositionDefaultTempo(comp.getTempoForQpm(120.0)); - SETQMAN_DEBUG << "SequenceManager::play() - setting Tempo to Default value of 120.000\n"; + SEQMAN_DEBUG << "SequenceManager::play() - setting Tempo to Default value of 120.000\n"; } else { - SETQMAN_DEBUG << "SequenceManager::play() - starting to play\n"; + SEQMAN_DEBUG << "SequenceManager::play() - starting to play\n"; } // Send initial tempo @@ -422,9 +422,9 @@ SequenceManager::stopping() return ; } - SETQMAN_DEBUG << "SequenceManager::stopping() - preparing to stop\n"; + SEQMAN_DEBUG << "SequenceManager::stopping() - preparing to stop\n"; - // SETQMAN_DEBUG << kdBacktrace() << endl; + // SEQMAN_DEBUG << kdBacktrace() << endl; stop(); @@ -452,7 +452,7 @@ SequenceManager::stop() // re-enable the record button if it was previously disabled when // going into play mode - DMM - // SETQMAN_DEBUG << "SequenceManager::stop() - re-enabling record button\n"; + // SEQMAN_DEBUG << "SequenceManager::stop() - re-enabling record button\n"; // m_transport->RecordButton()->setEnabled(true); @@ -489,13 +489,13 @@ SequenceManager::stop() m_doc->stopRecordingMidi(); m_doc->stopRecordingAudio(); - SETQMAN_DEBUG << "SequenceManager::stop() - stopped recording\n"; + SEQMAN_DEBUG << "SequenceManager::stop() - stopped recording\n"; } // always untoggle the play button at this stage // m_transport->PlayButton()->setOn(false); - SETQMAN_DEBUG << "SequenceManager::stop() - stopped playing\n"; + SEQMAN_DEBUG << "SequenceManager::stop() - stopped playing\n"; // We don't reset controllers at this point - what happens with static // controllers the next time we play otherwise? [rwb] @@ -524,7 +524,7 @@ SequenceManager::rewind() clock_t now = clock(); int elapsed = (now - m_lastRewoundAt) * 1000 / CLOCKS_PER_SEC; - SETQMAN_DEBUG << "That was " << m_lastRewoundAt << ", this is " << now << ", elapsed is " << elapsed << endl; + SEQMAN_DEBUG << "That was " << m_lastRewoundAt << ", this is " << now << ", elapsed is " << elapsed << endl; if (elapsed >= 0 && elapsed <= 200) { if (position > barRange.first && @@ -586,7 +586,7 @@ SequenceManager::record(bool toggled) { mapSequencer(); - SETQMAN_DEBUG << "SequenceManager::record(" << toggled << ")" << endl; + SEQMAN_DEBUG << "SequenceManager::record(" << toggled << ")" << endl; Composition &comp = m_doc->getComposition(); Studio &studio = m_doc->getStudio(); @@ -624,7 +624,7 @@ SequenceManager::record(bool toggled) if (toggled) { // preparing record or punch-in record if (m_transportStatus == RECORDING_ARMED) { - SETQMAN_DEBUG << "SequenceManager::record - unarming record\n"; + SEQMAN_DEBUG << "SequenceManager::record - unarming record\n"; m_transportStatus = STOPPED; // Toggle the buttons @@ -635,7 +635,7 @@ SequenceManager::record(bool toggled) } if (m_transportStatus == STOPPED) { - SETQMAN_DEBUG << "SequenceManager::record - armed record\n"; + SEQMAN_DEBUG << "SequenceManager::record - armed record\n"; m_transportStatus = RECORDING_ARMED; // Toggle the buttons @@ -646,7 +646,7 @@ SequenceManager::record(bool toggled) } if (m_transportStatus == RECORDING) { - SETQMAN_DEBUG << "SequenceManager::record - stop recording and keep playing\n"; + SEQMAN_DEBUG << "SequenceManager::record - stop recording and keep playing\n"; TQByteArray data; TQCString replyType; @@ -654,7 +654,7 @@ SequenceManager::record(bool toggled) // Send Record to the Sequencer to signal it to drop out of record mode if (!rgapp->sequencerCall("punchOut()", replyType, replyData, data)) { - SETQMAN_DEBUG << "SequenceManager::record - the \"not very plausible\" code executed\n"; + SEQMAN_DEBUG << "SequenceManager::record - the \"not very plausible\" code executed\n"; // #1797873 - set new transport status first, so that // if we're stopping recording we don't risk the // record segment being restored by a timer while the @@ -676,7 +676,7 @@ SequenceManager::record(bool toggled) } if (m_transportStatus == PLAYING) { - SETQMAN_DEBUG << "SequenceManager::record - punch in recording\n"; + SEQMAN_DEBUG << "SequenceManager::record - punch in recording\n"; punchIn = true; goto punchin; } @@ -767,7 +767,7 @@ punchin: InstrumentId iid = comp.getTrackById(*i)->getInstrument(); Instrument *inst = studio.getInstrumentById(iid); if (inst && (inst->getType() != Instrument::Audio)) { - SETQMAN_DEBUG << "SequenceManager: mdoc->addRecordMIDISegment(" << *i << ")" << endl; + SEQMAN_DEBUG << "SequenceManager: mdoc->addRecordMIDISegment(" << *i << ")" << endl; m_doc->addRecordMIDISegment(*i); } } @@ -778,10 +778,10 @@ punchin: m_transport->PlayButton()->setOn(true); if (comp.getCurrentTempo() == 0) { - SETQMAN_DEBUG << "SequenceManager::play() - setting Tempo to Default value of 120.000\n"; + SEQMAN_DEBUG << "SequenceManager::play() - setting Tempo to Default value of 120.000\n"; comp.setCompositionDefaultTempo(comp.getTempoForQpm(120.0)); } else { - SETQMAN_DEBUG << "SequenceManager::record() - starting to record\n"; + SEQMAN_DEBUG << "SequenceManager::record() - starting to record\n"; } // set the tempo in the transport @@ -950,7 +950,7 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC, if ((*i)->getType() >= MappedEvent::Audio) { if ((*i)->getType() == MappedEvent::AudioStopped) { /* - SETQMAN_DEBUG << "AUDIO FILE ID = " + SEQMAN_DEBUG << "AUDIO FILE ID = " << int((*i)->getData1()) << " - FILE STOPPED - " << "INSTRUMENT = " @@ -971,7 +971,7 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC, if ((*i)->getType() == MappedEvent::AudioGeneratePreview) { - SETQMAN_DEBUG << "Received AudioGeneratePreview: data1 is " << int((*i)->getData1()) << ", data2 " << int((*i)->getData2()) << ", instrument is " << (*i)->getInstrument() << endl; + SEQMAN_DEBUG << "Received AudioGeneratePreview: data1 is " << int((*i)->getData1()) << ", data2 " << int((*i)->getData2()) << ", instrument is " << (*i)->getInstrument() << endl; m_doc->finalizeAudioFile((int)(*i)->getData1() + (int)(*i)->getData2() * 256); @@ -994,7 +994,7 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC, m_transportStatus == RECORDING) { if ((*i)->getType() == MappedEvent::SystemFailure) { - SETQMAN_DEBUG << "Failure of some sort..." << endl; + SEQMAN_DEBUG << "Failure of some sort..." << endl; bool handling = true; @@ -1041,7 +1041,7 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC, continue; if (!m_canReport) { - SETQMAN_DEBUG << "Not reporting it to user just yet" + SEQMAN_DEBUG << "Not reporting it to user just yet" << endl; continue; } @@ -1212,7 +1212,7 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC, } } if ((*i)->getRecordedDevice() == Device::CONTROL_DEVICE) { - SETQMAN_DEBUG << "controllerDeviceEventReceived" << endl; + SEQMAN_DEBUG << "controllerDeviceEventReceived" << endl; emit controllerDeviceEventReceived(*i); } } @@ -1221,14 +1221,14 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC, void SequenceManager::rewindToBeginning() { - SETQMAN_DEBUG << "SequenceManager::rewindToBeginning()\n"; + SEQMAN_DEBUG << "SequenceManager::rewindToBeginning()\n"; m_doc->slotSetPointerPosition(m_doc->getComposition().getStartMarker()); } void SequenceManager::fastForwardToEnd() { - SETQMAN_DEBUG << "SequenceManager::fastForwardToEnd()\n"; + SEQMAN_DEBUG << "SequenceManager::fastForwardToEnd()\n"; Composition &comp = m_doc->getComposition(); m_doc->slotSetPointerPosition(comp.getDuration()); @@ -1291,7 +1291,7 @@ SequenceManager::checkSoundDriverStatus(bool warnUser) m_soundDriverStatus = result; } - SETQMAN_DEBUG << "Sound driver status is: " << m_soundDriverStatus << endl; + SEQMAN_DEBUG << "Sound driver status is: " << m_soundDriverStatus << endl; if (!warnUser) return; @@ -1432,7 +1432,7 @@ SequenceManager::sendAudioLevel(MappedEvent *mE) void SequenceManager::resetControllers() { - SETQMAN_DEBUG << "SequenceManager::resetControllers - resetting\n"; + SEQMAN_DEBUG << "SequenceManager::resetControllers - resetting\n"; // Should do all Midi Instrument - not just guess like this is doing // currently. @@ -1459,7 +1459,7 @@ SequenceManager::resetControllers() void SequenceManager::resetMidiNetwork() { - SETQMAN_DEBUG << "SequenceManager::resetMidiNetwork - resetting\n"; + SEQMAN_DEBUG << "SequenceManager::resetMidiNetwork - resetting\n"; MappedComposition mC; // Should do all Midi Instrument - not just guess like this is doing @@ -1492,7 +1492,7 @@ SequenceManager::sendMIDIRecordingDevice(const TQString recordDeviceStr) MidiByte(true)); StudioControl::sendMappedEvent(mE); - SETQMAN_DEBUG << "set MIDI record device to " + SEQMAN_DEBUG << "set MIDI record device to " << recordDevice << endl; } } @@ -1558,7 +1558,7 @@ SequenceManager::reinitialiseSequencerStudio() void SequenceManager::panic() { - SETQMAN_DEBUG << "panic button\n"; + SEQMAN_DEBUG << "panic button\n"; stopping(); @@ -1628,7 +1628,7 @@ SequenceManager::applyFiltering(const MappedComposition &mC, void SequenceManager::resetCompositionMmapper() { - SETQMAN_DEBUG << "SequenceManager::resetCompositionMmapper()\n"; + SEQMAN_DEBUG << "SequenceManager::resetCompositionMmapper()\n"; delete m_compositionMmapper; m_compositionMmapper = new CompositionMmapper(m_doc); @@ -1640,7 +1640,7 @@ void SequenceManager::resetCompositionMmapper() void SequenceManager::resetMetronomeMmapper() { - SETQMAN_DEBUG << "SequenceManager::resetMetronomeMmapper()\n"; + SEQMAN_DEBUG << "SequenceManager::resetMetronomeMmapper()\n"; delete m_metronomeMmapper; m_metronomeMmapper = SegmentMmapperFactory::makeMetronome(m_doc); @@ -1648,7 +1648,7 @@ void SequenceManager::resetMetronomeMmapper() void SequenceManager::resetTempoSegmentMmapper() { - SETQMAN_DEBUG << "SequenceManager::resetTempoSegmentMmapper()\n"; + SEQMAN_DEBUG << "SequenceManager::resetTempoSegmentMmapper()\n"; delete m_tempoSegmentMmapper; m_tempoSegmentMmapper = SegmentMmapperFactory::makeTempo(m_doc); @@ -1656,7 +1656,7 @@ void SequenceManager::resetTempoSegmentMmapper() void SequenceManager::resetTimeSigSegmentMmapper() { - SETQMAN_DEBUG << "SequenceManager::resetTimeSigSegmentMmapper()\n"; + SEQMAN_DEBUG << "SequenceManager::resetTimeSigSegmentMmapper()\n"; delete m_timeSigSegmentMmapper; m_timeSigSegmentMmapper = SegmentMmapperFactory::makeTimeSig(m_doc); @@ -1664,7 +1664,7 @@ void SequenceManager::resetTimeSigSegmentMmapper() void SequenceManager::resetControlBlockMmapper() { - SETQMAN_DEBUG << "SequenceManager::resetControlBlockMmapper()\n"; + SEQMAN_DEBUG << "SequenceManager::resetControlBlockMmapper()\n"; m_controlBlockMmapper->setDocument(m_doc); } @@ -1672,9 +1672,9 @@ void SequenceManager::resetControlBlockMmapper() bool SequenceManager::event(TQEvent *e) { if (e->type() == TQEvent::User) { - SETQMAN_DEBUG << "SequenceManager::event() with user event\n"; + SEQMAN_DEBUG << "SequenceManager::event() with user event\n"; if (m_updateRequested) { - SETQMAN_DEBUG << "SequenceManager::event(): update requested\n"; + SEQMAN_DEBUG << "SequenceManager::event(): update requested\n"; checkRefreshStatus(); m_updateRequested = false; } @@ -1686,7 +1686,7 @@ bool SequenceManager::event(TQEvent *e) void SequenceManager::update() { - SETQMAN_DEBUG << "SequenceManager::update()\n"; + SEQMAN_DEBUG << "SequenceManager::update()\n"; // schedule a refresh-status check for the next event loop TQEvent *e = new TQEvent(TQEvent::User); m_updateRequested = true; @@ -1695,7 +1695,7 @@ void SequenceManager::update() void SequenceManager::checkRefreshStatus() { - SETQMAN_DEBUG << "SequenceManager::checkRefreshStatus()\n"; + SEQMAN_DEBUG << "SequenceManager::checkRefreshStatus()\n"; // Look at trigger segments first: if one of those has changed, we'll // need to be aware of it when scanning segments subsequently @@ -1725,11 +1725,11 @@ void SequenceManager::checkRefreshStatus() m_triggerSegments = newTriggerMap; - SETQMAN_DEBUG << "SequenceManager::checkRefreshStatus: segments modified by changes to trigger segments are:" << endl; + SEQMAN_DEBUG << "SequenceManager::checkRefreshStatus: segments modified by changes to trigger segments are:" << endl; int x = 0; for (TriggerSegmentRec::SegmentRuntimeIdSet::iterator i = ridset.begin(); i != ridset.end(); ++i) { - SETQMAN_DEBUG << x << ": " << *i << endl; + SEQMAN_DEBUG << x << ": " << *i << endl; ++x; } @@ -1741,7 +1741,7 @@ void SequenceManager::checkRefreshStatus() } m_removedSegments.clear(); - SETQMAN_DEBUG << "SequenceManager::checkRefreshStatus: we have " + SEQMAN_DEBUG << "SequenceManager::checkRefreshStatus: we have " << m_segments.size() << " segments" << endl; // then the ones which are still there @@ -1763,11 +1763,11 @@ void SequenceManager::checkRefreshStatus() void SequenceManager::segmentModified(Segment* s) { - SETQMAN_DEBUG << "SequenceManager::segmentModified(" << s << ")\n"; + SEQMAN_DEBUG << "SequenceManager::segmentModified(" << s << ")\n"; bool sizeChanged = m_compositionMmapper->segmentModified(s); - SETQMAN_DEBUG << "SequenceManager::segmentModified() : size changed = " + SEQMAN_DEBUG << "SequenceManager::segmentModified() : size changed = " << sizeChanged << endl; if ((m_transportStatus == PLAYING) && sizeChanged) { @@ -1777,7 +1777,7 @@ void SequenceManager::segmentModified(Segment* s) streamOut << (TQString)m_compositionMmapper->getSegmentFileName(s); streamOut << (size_t)m_compositionMmapper->getSegmentFileSize(s); - SETQMAN_DEBUG << "SequenceManager::segmentModified() : DCOP-call sequencer remapSegment" + SEQMAN_DEBUG << "SequenceManager::segmentModified() : DCOP-call sequencer remapSegment" << m_compositionMmapper->getSegmentFileName(s) << endl; rgapp->sequencerSend("remapSegment(TQString, size_t)", data); @@ -1786,13 +1786,13 @@ void SequenceManager::segmentModified(Segment* s) void SequenceManager::segmentAdded(const Composition*, Segment* s) { - SETQMAN_DEBUG << "SequenceManager::segmentAdded(" << s << ")\n"; + SEQMAN_DEBUG << "SequenceManager::segmentAdded(" << s << ")\n"; m_addedSegments.push_back(s); } void SequenceManager::segmentRemoved(const Composition*, Segment* s) { - SETQMAN_DEBUG << "SequenceManager::segmentRemoved(" << s << ")\n"; + SEQMAN_DEBUG << "SequenceManager::segmentRemoved(" << s << ")\n"; m_removedSegments.push_back(s); std::vector<Segment*>::iterator i = find(m_addedSegments.begin(), m_addedSegments.end(), s); if (i != m_addedSegments.end()) @@ -1801,19 +1801,19 @@ void SequenceManager::segmentRemoved(const Composition*, Segment* s) void SequenceManager::segmentRepeatChanged(const Composition*, Segment* s, bool repeat) { - SETQMAN_DEBUG << "SequenceManager::segmentRepeatChanged(" << s << ", " << repeat << ")\n"; + SEQMAN_DEBUG << "SequenceManager::segmentRepeatChanged(" << s << ", " << repeat << ")\n"; segmentModified(s); } void SequenceManager::segmentRepeatEndChanged(const Composition*, Segment* s, timeT newEndTime) { - SETQMAN_DEBUG << "SequenceManager::segmentRepeatEndChanged(" << s << ", " << newEndTime << ")\n"; + SEQMAN_DEBUG << "SequenceManager::segmentRepeatEndChanged(" << s << ", " << newEndTime << ")\n"; segmentModified(s); } void SequenceManager::segmentEventsTimingChanged(const Composition*, Segment * s, timeT t, RealTime) { - SETQMAN_DEBUG << "SequenceManager::segmentEventsTimingChanged(" << s << ", " << t << ")\n"; + SEQMAN_DEBUG << "SequenceManager::segmentEventsTimingChanged(" << s << ", " << t << ")\n"; segmentModified(s); if (s && s->getType() == Segment::Audio && m_transportStatus == PLAYING) { TQByteArray data; @@ -1823,13 +1823,13 @@ void SequenceManager::segmentEventsTimingChanged(const Composition*, Segment * s void SequenceManager::segmentTransposeChanged(const Composition*, Segment *s, int transpose) { - SETQMAN_DEBUG << "SequenceManager::segmentTransposeChanged(" << s << ", " << transpose << ")\n"; + SEQMAN_DEBUG << "SequenceManager::segmentTransposeChanged(" << s << ", " << transpose << ")\n"; segmentModified(s); } void SequenceManager::segmentTrackChanged(const Composition*, Segment *s, TrackId id) { - SETQMAN_DEBUG << "SequenceManager::segmentTrackChanged(" << s << ", " << id << ")\n"; + SEQMAN_DEBUG << "SequenceManager::segmentTrackChanged(" << s << ", " << id << ")\n"; segmentModified(s); if (s && s->getType() == Segment::Audio && m_transportStatus == PLAYING) { TQByteArray data; @@ -1839,13 +1839,13 @@ void SequenceManager::segmentTrackChanged(const Composition*, Segment *s, TrackI void SequenceManager::segmentEndMarkerChanged(const Composition*, Segment *s, bool) { - SETQMAN_DEBUG << "SequenceManager::segmentEndMarkerChanged(" << s << ")\n"; + SEQMAN_DEBUG << "SequenceManager::segmentEndMarkerChanged(" << s << ")\n"; segmentModified(s); } void SequenceManager::processAddedSegment(Segment* s) { - SETQMAN_DEBUG << "SequenceManager::processAddedSegment(" << s << ")\n"; + SEQMAN_DEBUG << "SequenceManager::processAddedSegment(" << s << ")\n"; m_compositionMmapper->segmentAdded(s); @@ -1869,7 +1869,7 @@ void SequenceManager::processAddedSegment(Segment* s) void SequenceManager::processRemovedSegment(Segment* s) { - SETQMAN_DEBUG << "SequenceManager::processRemovedSegment(" << s << ")\n"; + SEQMAN_DEBUG << "SequenceManager::processRemovedSegment(" << s << ")\n"; TQString filename = m_compositionMmapper->getSegmentFileName(s); m_compositionMmapper->segmentDeleted(s); @@ -1893,7 +1893,7 @@ void SequenceManager::processRemovedSegment(Segment* s) void SequenceManager::endMarkerTimeChanged(const Composition *, bool /*shorten*/) { - SETQMAN_DEBUG << "SequenceManager::endMarkerTimeChanged()\n"; + SEQMAN_DEBUG << "SequenceManager::endMarkerTimeChanged()\n"; m_compositionMmapperResetTimer->start(500, true); // schedule a composition mmapper reset in 0.5s } @@ -1904,7 +1904,7 @@ void SequenceManager::timeSignatureChanged(const Composition *) void SequenceManager::trackChanged(const Composition *, Track* t) { - SETQMAN_DEBUG << "SequenceManager::trackChanged(" << t << ", " << (t ? t->getPosition() : -1) << ")\n"; + SEQMAN_DEBUG << "SequenceManager::trackChanged(" << t << ", " << (t ? t->getPosition() : -1) << ")\n"; m_controlBlockMmapper->updateTrackData(t); if (m_transportStatus == PLAYING) { @@ -1924,7 +1924,7 @@ void SequenceManager::metronomeChanged(InstrumentId id, // This method is called when the user has changed the // metronome instrument, pitch etc - SETQMAN_DEBUG << "SequenceManager::metronomeChanged (simple)" + SEQMAN_DEBUG << "SequenceManager::metronomeChanged (simple)" << ", instrument = " << id << endl; @@ -1949,7 +1949,7 @@ void SequenceManager::metronomeChanged(const Composition *) // This method is called when the muting status in the composition // has changed -- the metronome itself has not actually changed - SETQMAN_DEBUG << "SequenceManager::metronomeChanged " + SEQMAN_DEBUG << "SequenceManager::metronomeChanged " << ", instrument = " << m_metronomeMmapper->getMetronomeInstrument() << endl; @@ -1982,7 +1982,7 @@ void SequenceManager::soloChanged(const Composition *, bool solo, TrackId select void SequenceManager::tempoChanged(const Composition *c) { - SETQMAN_DEBUG << "SequenceManager::tempoChanged()\n"; + SEQMAN_DEBUG << "SequenceManager::tempoChanged()\n"; // Refresh all segments // diff --git a/src/gui/studio/StudioControl.cpp b/src/gui/studio/StudioControl.cpp index 04a838c..5657f57 100644 --- a/src/gui/studio/StudioControl.cpp +++ b/src/gui/studio/StudioControl.cpp @@ -60,7 +60,7 @@ streamOut << (int)type; if (!rgapp->sequencerCall("createMappedObject(int)", replyType, replyData, data)) { - SETQMAN_DEBUG << "createStudioObject - " + SEQMAN_DEBUG << "createStudioObject - " << "failed to contact Rosegarden sequencer" << endl; } else @@ -87,7 +87,7 @@ StudioControl::destroyStudioObject(MappedObjectId id) if (!rgapp->sequencerCall("destroyMappedObject(int)", replyType, replyData, data)) { - SETQMAN_DEBUG << "destroyStudioObject - " + SEQMAN_DEBUG << "destroyStudioObject - " << "failed to contact Rosegarden sequencer" << endl; } else { @@ -119,7 +119,7 @@ StudioControl::getStudioObjectProperty(MappedObjectId id, if (!rgapp->sequencerCall("getPropertyList(int, TQString)", replyType, replyData, data)) { - SETQMAN_DEBUG << "getStudioObjectProperty - " + SEQMAN_DEBUG << "getStudioObjectProperty - " << "failed to contact Rosegarden sequencer" << endl; } else { @@ -224,7 +224,7 @@ StudioControl::getStudioObjectByType(MappedObject::MappedObjectType type) if (!rgapp->sequencerCall("getMappedObjectId(int)", replyType, replyData, data)) { - SETQMAN_DEBUG << "getStudioObjectByType - " + SEQMAN_DEBUG << "getStudioObjectByType - " << "failed to contact Rosegarden sequencer" << endl; } else { @@ -271,7 +271,7 @@ StudioControl::getStudioPluginPort(MappedObjectId pluginId, if (!rgapp->sequencerCall("getMappedPort(int, unsigned long int)", replyType, replyData, data)) { - SETQMAN_DEBUG << "getStudioPluginPort - " + SEQMAN_DEBUG << "getStudioPluginPort - " << "failed to contact Rosegarden sequencer" << endl; } else { @@ -293,7 +293,7 @@ StudioControl::getPluginInformation() if (!rgapp->sequencerCall("getPluginInformation()", replyType, replyData, data)) { - SETQMAN_DEBUG << "getPluginInformation - " + SEQMAN_DEBUG << "getPluginInformation - " << "failed to contact Rosegarden sequencer" << endl; } else { @@ -320,7 +320,7 @@ StudioControl::getPluginProgram(MappedObjectId id, int bank, int program) if (!rgapp->sequencerCall("getPluginProgram(int, int, int)", replyType, replyData, data)) { - SETQMAN_DEBUG << "getPluginProgram - " + SEQMAN_DEBUG << "getPluginProgram - " << "failed to contact Rosegarden sequencer" << endl; } else { @@ -346,7 +346,7 @@ StudioControl::getPluginProgram(MappedObjectId id, TQString name) if (!rgapp->sequencerCall("getPluginProgram(int, TQString)", replyType, replyData, data)) { - SETQMAN_DEBUG << "getPluginProgram - " + SEQMAN_DEBUG << "getPluginProgram - " << "failed to contact Rosegarden sequencer" << endl; } else { @@ -370,7 +370,7 @@ StudioControl::connectStudioObjects(MappedObjectId id1, streamOut << (int)id2; if (!rgapp->sequencerSend("connectMappedObjects(int, int)", data)) { - SETQMAN_DEBUG << "connectStudioObjects - " + SEQMAN_DEBUG << "connectStudioObjects - " << "failed to contact Rosegarden sequencer" << endl; } @@ -391,7 +391,7 @@ StudioControl::disconnectStudioObjects(MappedObjectId id1, streamOut << (int)id2; if (!rgapp->sequencerSend("disconnectMappedObjects(int, int)", data)) { - SETQMAN_DEBUG << "disconnectStudioObjects - " + SEQMAN_DEBUG << "disconnectStudioObjects - " << "failed to contact Rosegarden sequencer" << endl; } @@ -410,7 +410,7 @@ StudioControl::disconnectStudioObject(MappedObjectId id) streamOut << (int)id; if (!rgapp->sequencerSend("disconnectMappedObject(int)", data)) { - SETQMAN_DEBUG << "disconnectStudioObject - " + SEQMAN_DEBUG << "disconnectStudioObject - " << "failed to contact Rosegarden sequencer" << endl; } diff --git a/src/misc/Debug.h b/src/misc/Debug.h index 37c3eca..ef53afb 100644 --- a/src/misc/Debug.h +++ b/src/misc/Debug.h @@ -54,7 +54,7 @@ namespace Rosegarden { class Event; class Segment; class RealTime; class Colour; #define NOTATION_DEBUG kdDebug(KDEBUG_AREA_NOTATION) #define MATRIX_DEBUG kdDebug(KDEBUG_AREA_MATRIX) #define SEQUENCER_DEBUG kdDebug(KDEBUG_AREA_SEQUENCER) -#define SETQMAN_DEBUG kdDebug(KDEBUG_AREA_SEQUENCEMANAGER) +#define SEQMAN_DEBUG kdDebug(KDEBUG_AREA_SEQUENCEMANAGER) #ifndef NDEBUG diff --git a/src/sequencer/ControlBlockMmapper.cpp b/src/sequencer/ControlBlockMmapper.cpp index d1dfa2d..95f2a16 100644 --- a/src/sequencer/ControlBlockMmapper.cpp +++ b/src/sequencer/ControlBlockMmapper.cpp @@ -45,7 +45,7 @@ ControlBlockMmapper::ControlBlockMmapper(TQString fileName) m_fd = ::open(m_fileName.latin1(), O_RDWR); if (m_fd < 0) { - SETQMAN_DEBUG << "ControlBlockMmapper : Couldn't open " << m_fileName + SEQMAN_DEBUG << "ControlBlockMmapper : Couldn't open " << m_fileName << endl; throw Exception(std::string("Couldn't open ") + m_fileName.latin1()); @@ -65,7 +65,7 @@ ControlBlockMmapper::ControlBlockMmapper(TQString fileName) throw Exception("mmap failed"); } - SETQMAN_DEBUG << "ControlBlockMmapper : mmap size : " << m_mmappedSize + SEQMAN_DEBUG << "ControlBlockMmapper : mmap size : " << m_mmappedSize << " at " << (void*)m_mmappedBuffer << endl; // Create new control block on file |