diff options
Diffstat (limited to 'src/sequencer')
| -rw-r--r-- | src/sequencer/ControlBlockMmapper.cpp | 4 | ||||
| -rw-r--r-- | src/sequencer/ControlBlockMmapper.h | 8 | ||||
| -rw-r--r-- | src/sequencer/MmappedSegment.cpp | 10 | ||||
| -rw-r--r-- | src/sequencer/MmappedSegment.h | 18 | ||||
| -rw-r--r-- | src/sequencer/RosegardenSequencerApp.cpp | 136 | ||||
| -rw-r--r-- | src/sequencer/RosegardenSequencerApp.h | 56 | ||||
| -rw-r--r-- | src/sequencer/RosegardenSequencerIface.h | 48 | ||||
| -rw-r--r-- | src/sequencer/SequencerMmapper.cpp | 8 | ||||
| -rw-r--r-- | src/sequencer/SequencerMmapper.h | 4 | ||||
| -rw-r--r-- | src/sequencer/main.cpp | 2 |
10 files changed, 147 insertions, 147 deletions
diff --git a/src/sequencer/ControlBlockMmapper.cpp b/src/sequencer/ControlBlockMmapper.cpp index d9bf83d..95f2a16 100644 --- a/src/sequencer/ControlBlockMmapper.cpp +++ b/src/sequencer/ControlBlockMmapper.cpp @@ -35,7 +35,7 @@ namespace Rosegarden { -ControlBlockMmapper::ControlBlockMmapper(QString fileName) +ControlBlockMmapper::ControlBlockMmapper(TQString fileName) : m_fileName(fileName), m_fd( -1), m_mmappedBuffer(0), @@ -59,7 +59,7 @@ ControlBlockMmapper::ControlBlockMmapper(QString fileName) if (m_mmappedBuffer == (void*) - 1) { - SEQUENCER_DEBUG << QString("mmap failed : (%1) %2\n"). + SEQUENCER_DEBUG << TQString("mmap failed : (%1) %2\n"). arg(errno).arg(strerror(errno)); throw Exception("mmap failed"); diff --git a/src/sequencer/ControlBlockMmapper.h b/src/sequencer/ControlBlockMmapper.h index 55d4c9f..d5925a1 100644 --- a/src/sequencer/ControlBlockMmapper.h +++ b/src/sequencer/ControlBlockMmapper.h @@ -26,7 +26,7 @@ #ifndef _MMAPPEDCONTROLBLOCK_H_ #define _MMAPPEDCONTROLBLOCK_H_ -#include <qstring.h> +#include <tqstring.h> #include "sound/MappedEvent.h" #include "sound/ControlBlock.h" @@ -37,10 +37,10 @@ namespace Rosegarden class ControlBlockMmapper { public: - ControlBlockMmapper(QString fileName); + ControlBlockMmapper(TQString fileName); ~ControlBlockMmapper(); - QString getFileName() { return m_fileName; } + TQString getFileName() { return m_fileName; } // delegate ControlBlock's interface InstrumentId getInstrumentForTrack(unsigned int trackId) @@ -82,7 +82,7 @@ public: protected: //--------------- Data members --------------------------------- - QString m_fileName; + TQString m_fileName; int m_fd; void* m_mmappedBuffer; size_t m_mmappedSize; diff --git a/src/sequencer/MmappedSegment.cpp b/src/sequencer/MmappedSegment.cpp index 57b3dc9..2176bdd 100644 --- a/src/sequencer/MmappedSegment.cpp +++ b/src/sequencer/MmappedSegment.cpp @@ -35,7 +35,7 @@ namespace Rosegarden { -MmappedSegment::MmappedSegment(const QString filename) +MmappedSegment::MmappedSegment(const TQString filename) : m_fd( -1), m_mmappedSize(0), m_mmappedRegion(0), @@ -56,7 +56,7 @@ bool MmappedSegment::isMetronome() void MmappedSegment::map() { - QFileInfo fInfo(m_filename); + TQFileInfo fInfo(m_filename); if (!fInfo.exists()) { SEQUENCER_DEBUG << "MmappedSegment::map() : file " << m_filename << " doesn't exist\n"; throw Exception("file not found"); @@ -70,7 +70,7 @@ void MmappedSegment::map() if (m_mmappedRegion == (void*) - 1) { - SEQUENCER_DEBUG << QString("mmap failed : (%1) %2\n"). + SEQUENCER_DEBUG << TQString("mmap failed : (%1) %2\n"). arg(errno).arg(strerror(errno)); throw Exception("mmap failed"); @@ -145,7 +145,7 @@ bool MmappedSegment::remap(size_t newSize) if (m_mmappedRegion == (void*) - 1) { - SEQUENCER_DEBUG << QString("mremap failed : (%1) %2\n"). + SEQUENCER_DEBUG << TQString("mremap failed : (%1) %2\n"). arg(errno).arg(strerror(errno)); throw Exception("mremap failed"); @@ -539,7 +539,7 @@ MmappedSegmentsMetaIterator::fillCompositionWithEventsUntil(bool /*firstFetch*/, return eventsRemaining || foundOneEvent; } -void MmappedSegmentsMetaIterator::resetIteratorForSegment(const QString& filename) +void MmappedSegmentsMetaIterator::resetIteratorForSegment(const TQString& filename) { for (segmentiterators::iterator i = m_iterators.begin(); i != m_iterators.end(); ++i) { MmappedSegment::iterator* iter = *i; diff --git a/src/sequencer/MmappedSegment.h b/src/sequencer/MmappedSegment.h index 32e2ea8..0becead 100644 --- a/src/sequencer/MmappedSegment.h +++ b/src/sequencer/MmappedSegment.h @@ -39,10 +39,10 @@ #include <kstandarddirs.h> #include <dcopclient.h> -#include <qdatetime.h> -#include <qstring.h> -#include <qdir.h> -#include <qbuffer.h> +#include <tqdatetime.h> +#include <tqstring.h> +#include <tqdir.h> +#include <tqbuffer.h> #include "ControlBlockMmapper.h" #include "sound/MappedInstrument.h" @@ -62,11 +62,11 @@ class MappedComposition; class MmappedSegment { public: - MmappedSegment(const QString filename); + MmappedSegment(const TQString filename); ~MmappedSegment(); bool remap(size_t newSize); - QString getFileName() const { return m_filename; } + TQString getFileName() const { return m_filename; } bool isMetronome(); MappedEvent* getBuffer() { return m_mmappedEventBuffer; } size_t getSize() const { return m_mmappedSize; } @@ -116,14 +116,14 @@ protected: // unsigned int m_nbMappedEvents; void *m_mmappedRegion; MappedEvent* m_mmappedEventBuffer; - QString m_filename; + TQString m_filename; }; class MmappedSegmentsMetaIterator { public: - typedef std::map<QString, MmappedSegment*> mmappedsegments; + typedef std::map<TQString, MmappedSegment*> mmappedsegments; MmappedSegmentsMetaIterator(mmappedsegments&, ControlBlockMmapper*); @@ -143,7 +143,7 @@ public: const RealTime& start, const RealTime& end); - void resetIteratorForSegment(const QString& filename); + void resetIteratorForSegment(const TQString& filename); void addSegment(MmappedSegment*); void deleteSegment(MmappedSegment*); diff --git a/src/sequencer/RosegardenSequencerApp.cpp b/src/sequencer/RosegardenSequencerApp.cpp index 4c26efb..179820f 100644 --- a/src/sequencer/RosegardenSequencerApp.cpp +++ b/src/sequencer/RosegardenSequencerApp.cpp @@ -38,11 +38,11 @@ #include <kstandarddirs.h> #include <dcopclient.h> -#include <qdatetime.h> -#include <qstring.h> -#include <qdir.h> -#include <qbuffer.h> -#include <qvaluevector.h> +#include <tqdatetime.h> +#include <tqstring.h> +#include <tqdir.h> +#include <tqbuffer.h> +#include <tqvaluevector.h> #include "misc/Debug.h" #include "ControlBlockMmapper.h" @@ -86,7 +86,7 @@ RosegardenSequencerApp::RosegardenSequencerApp() : SEQUENCER_DEBUG << "Registering with DCOP server" << endl; // Without DCOP we are nothing - QCString realAppId = kapp->dcopClient()->registerAs(kapp->name(), false); + TQCString realAppId = kapp->dcopClient()->registerAs(kapp->name(), false); if (realAppId.isNull()) { SEQUENCER_DEBUG << "RosegardenSequencer cannot register " @@ -119,9 +119,9 @@ RosegardenSequencerApp::RosegardenSequencerApp() : // Check for new clients every so often // - m_newClientTimer = new QTimer(this); - connect(m_newClientTimer, SIGNAL(timeout()), - this, SLOT(slotCheckForNewClients())); + m_newClientTimer = new TQTimer(this); + connect(m_newClientTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotCheckForNewClients())); m_newClientTimer->start(3000); // every 3 seconds } @@ -411,9 +411,9 @@ RosegardenSequencerApp::updateClocks() void RosegardenSequencerApp::notifySequencerStatus() { - QByteArray data, replyData; - QCString replyType; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data, replyData; + TQCString replyType; + TQDataStream arg(data, IO_WriteOnly); arg << (int)m_transportStatus; @@ -588,8 +588,8 @@ RosegardenSequencerApp::processAsynchronousEvents() // std::cerr << "processAsynchronousEvents: have " << mC->size() << " events" << std::endl; - QByteArray data; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQDataStream arg(data, IO_WriteOnly); arg << mC; if (m_controlBlockMmapper->isMidiRoutingEnabled()) { @@ -665,13 +665,13 @@ RosegardenSequencerApp::record(const RealTime &time, SEQUENCER_DEBUG << "RosegardenSequencerApp::record()" << " - starting to record" << endl; - QValueVector<InstrumentId> armedInstruments; - QValueVector<QString> audioFileNames; + TQValueVector<InstrumentId> armedInstruments; + TQValueVector<TQString> audioFileNames; { - QByteArray data, replyData; - QCString replyType; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data, replyData; + TQCString replyType; + TQDataStream arg(data, IO_WriteOnly); if (!kapp->dcopClient()->call(ROSEGARDEN_GUI_APP_NAME, ROSEGARDEN_GUI_IFACE_NAME, @@ -682,8 +682,8 @@ RosegardenSequencerApp::record(const RealTime &time, << endl; } - QDataStream reply(replyData, IO_ReadOnly); - if (replyType == "QValueVector<InstrumentId>") { + TQDataStream reply(replyData, IO_ReadOnly); + if (replyType == "TQValueVector<InstrumentId>") { reply >> armedInstruments; } else { SEQUENCER_DEBUG << "RosegardenSequencer::record() - " @@ -691,7 +691,7 @@ RosegardenSequencerApp::record(const RealTime &time, } } - QValueVector<InstrumentId> audioInstruments; + TQValueVector<InstrumentId> audioInstruments; for (unsigned int i = 0; i < armedInstruments.size(); ++i) { if (armedInstruments[i] >= AudioInstrumentBase && @@ -702,23 +702,23 @@ RosegardenSequencerApp::record(const RealTime &time, if (audioInstruments.size() > 0) { - QByteArray data, replyData; - QCString replyType; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data, replyData; + TQCString replyType; + TQDataStream arg(data, IO_WriteOnly); arg << audioInstruments; if (!kapp->dcopClient()->call(ROSEGARDEN_GUI_APP_NAME, ROSEGARDEN_GUI_IFACE_NAME, - "createRecordAudioFiles(QValueVector<InstrumentId>)", + "createRecordAudioFiles(TQValueVector<InstrumentId>)", data, replyType, replyData, true)) { SEQUENCER_DEBUG << "RosegardenSequencer::record()" << " - can't call RosegardenGUI client for createNewAudioFiles" << endl; } - QDataStream reply(replyData, IO_ReadOnly); - if (replyType == "QValueVector<QString>") { + TQDataStream reply(replyData, IO_ReadOnly); + if (replyType == "TQValueVector<TQString>") { reply >> audioFileNames; } else { SEQUENCER_DEBUG << "RosegardenSequencer::record() - " @@ -733,7 +733,7 @@ RosegardenSequencerApp::record(const RealTime &time, } std::vector<InstrumentId> armedInstrumentsVec; - std::vector<QString> audioFileNamesVec; + std::vector<TQString> audioFileNamesVec; for (int i = 0; i < armedInstruments.size(); ++i) { armedInstrumentsVec.push_back(armedInstruments[i]); } @@ -834,17 +834,17 @@ RosegardenSequencerApp::play(const RealTime &time, // Map all segments // - QDir segmentsDir(m_segmentFilesPath, "segment_*"); + TQDir segmentsDir(m_segmentFilesPath, "segment_*"); for (unsigned int i = 0; i < segmentsDir.count(); ++i) { mmapSegment(m_segmentFilesPath + "/" + segmentsDir[i]); } - QString tmpDir = KGlobal::dirs()->resourceDirs("tmp").last(); + TQString tmpDir = KGlobal::dirs()->resourceDirs("tmp").last(); // Map metronome // - QString metronomeFileName = tmpDir + "/rosegarden_metronome"; - QFileInfo metronomeFileInfo(metronomeFileName); + TQString metronomeFileName = tmpDir + "/rosegarden_metronome"; + TQFileInfo metronomeFileInfo(metronomeFileName); if (metronomeFileInfo.exists()) mmapSegment(metronomeFileName); else @@ -852,8 +852,8 @@ RosegardenSequencerApp::play(const RealTime &time, // Map tempo segment // - QString tempoSegmentFileName = tmpDir + "/rosegarden_tempo"; - QFileInfo tempoSegmentFileInfo(tempoSegmentFileName); + TQString tempoSegmentFileName = tmpDir + "/rosegarden_tempo"; + TQFileInfo tempoSegmentFileInfo(tempoSegmentFileName); if (tempoSegmentFileInfo.exists()) mmapSegment(tempoSegmentFileName); else @@ -861,8 +861,8 @@ RosegardenSequencerApp::play(const RealTime &time, // Map time sig segment // - QString timeSigSegmentFileName = tmpDir + "/rosegarden_timesig"; - QFileInfo timeSigSegmentFileInfo(timeSigSegmentFileName); + TQString timeSigSegmentFileName = tmpDir + "/rosegarden_timesig"; + TQFileInfo timeSigSegmentFileInfo(timeSigSegmentFileName); if (timeSigSegmentFileInfo.exists()) mmapSegment(timeSigSegmentFileName); else @@ -906,7 +906,7 @@ RosegardenSequencerApp::punchOut() return false; } -MmappedSegment* RosegardenSequencerApp::mmapSegment(const QString& file) +MmappedSegment* RosegardenSequencerApp::mmapSegment(const TQString& file) { MmappedSegment* m = 0; @@ -941,7 +941,7 @@ void RosegardenSequencerApp::cleanupMmapData() m_metaIterator = 0; } -void RosegardenSequencerApp::remapSegment(const QString& filename, size_t newSize) +void RosegardenSequencerApp::remapSegment(const TQString& filename, size_t newSize) { if (m_transportStatus != PLAYING) return ; @@ -953,7 +953,7 @@ void RosegardenSequencerApp::remapSegment(const QString& filename, size_t newSiz m_metaIterator->resetIteratorForSegment(filename); } -void RosegardenSequencerApp::addSegment(const QString& filename) +void RosegardenSequencerApp::addSegment(const TQString& filename) { if (m_transportStatus != PLAYING) return ; @@ -966,7 +966,7 @@ void RosegardenSequencerApp::addSegment(const QString& filename) m_metaIterator->addSegment(m); } -void RosegardenSequencerApp::deleteSegment(const QString& filename) +void RosegardenSequencerApp::deleteSegment(const TQString& filename) { if (m_transportStatus != PLAYING) return ; @@ -1097,7 +1097,7 @@ RosegardenSequencerApp::setLoop(long loopStartSec, // Return the status of the sound systems (audio and MIDI) // unsigned int -RosegardenSequencerApp::getSoundDriverStatus(const QString &guiVersion) +RosegardenSequencerApp::getSoundDriverStatus(const TQString &guiVersion) { unsigned int driverStatus = m_driver->getStatus(); if (guiVersion == VERSION) @@ -1114,7 +1114,7 @@ RosegardenSequencerApp::getSoundDriverStatus(const QString &guiVersion) // Add an audio file to the sequencer int -RosegardenSequencerApp::addAudioFile(const QString &fileName, int id) +RosegardenSequencerApp::addAudioFile(const TQString &fileName, int id) { return ((int)m_driver->addAudioFile(fileName.utf8().data(), id)); } @@ -1238,7 +1238,7 @@ RosegardenSequencerApp::removeDevice(unsigned int deviceId) } void -RosegardenSequencerApp::renameDevice(unsigned int deviceId, QString name) +RosegardenSequencerApp::renameDevice(unsigned int deviceId, TQString name) { m_driver->renameDevice(deviceId, name); } @@ -1261,14 +1261,14 @@ RosegardenSequencerApp::getConnection(int type, unsigned int direction, void RosegardenSequencerApp::setConnection(unsigned int deviceId, - QString connection) + TQString connection) { m_driver->setConnection(deviceId, connection); } void RosegardenSequencerApp::setPlausibleConnection(unsigned int deviceId, - QString connection) + TQString connection) { m_driver->setPlausibleConnection(deviceId, connection); } @@ -1292,7 +1292,7 @@ RosegardenSequencerApp::getCurrentTimer() } void -RosegardenSequencerApp::setCurrentTimer(QString timer) +RosegardenSequencerApp::setCurrentTimer(TQString timer) { m_driver->setCurrentTimer(timer); } @@ -1307,13 +1307,13 @@ void RosegardenSequencerApp::sequencerAlive() { if (!kapp->dcopClient()-> - isApplicationRegistered(QCString(ROSEGARDEN_GUI_APP_NAME))) { + isApplicationRegistered(TQCString(ROSEGARDEN_GUI_APP_NAME))) { SEQUENCER_DEBUG << "RosegardenSequencerApp::sequencerAlive() - " << "waiting for GUI to register" << endl; return ; } - QByteArray data; + TQByteArray data; if (!kapp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME, ROSEGARDEN_GUI_IFACE_NAME, @@ -1356,7 +1356,7 @@ RosegardenSequencerApp::initialiseStudio() void RosegardenSequencerApp::setMappedProperty(int id, - const QString &property, + const TQString &property, float value) { @@ -1396,8 +1396,8 @@ RosegardenSequencerApp::setMappedProperties(const MappedObjectIdList &ids, void RosegardenSequencerApp::setMappedProperty(int id, - const QString &property, - const QString &value) + const TQString &property, + const TQString &value) { SEQUENCER_DEBUG << "setProperty: id = " << id @@ -1412,7 +1412,7 @@ RosegardenSequencerApp::setMappedProperty(int id, } void -RosegardenSequencerApp::setMappedPropertyList(int id, const QString &property, +RosegardenSequencerApp::setMappedPropertyList(int id, const TQString &property, const MappedObjectPropertyList &values) { SEQUENCER_DEBUG << "setPropertyList: id = " << id @@ -1424,13 +1424,13 @@ RosegardenSequencerApp::setMappedPropertyList(int id, const QString &property, if (object) { try { object->setPropertyList(property, values); - } catch (QString err) { - QByteArray data; - QDataStream arg(data, IO_WriteOnly); + } catch (TQString err) { + TQByteArray data; + TQDataStream arg(data, IO_WriteOnly); arg << err; kapp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME, ROSEGARDEN_GUI_IFACE_NAME, - "showError(QString)", + "showError(TQString)", data); } } @@ -1454,11 +1454,11 @@ RosegardenSequencerApp::getMappedObjectId(int type) } -std::vector<QString> +std::vector<TQString> RosegardenSequencerApp::getPropertyList(int id, - const QString &property) + const TQString &property) { - std::vector<QString> list; + std::vector<TQString> list; MappedObject *object = m_studio->getObjectById(id); @@ -1473,10 +1473,10 @@ RosegardenSequencerApp::getPropertyList(int id, return list; } -std::vector<QString> +std::vector<TQString> RosegardenSequencerApp::getPluginInformation() { - std::vector<QString> list; + std::vector<TQString> list; PluginFactory::enumerateAllPlugins(list); @@ -1496,11 +1496,11 @@ RosegardenSequencerApp::getPluginProgram(int id, int bank, int program) } } - return QString(); + return TQString(); } unsigned long -RosegardenSequencerApp::getPluginProgram(int id, const QString &name) +RosegardenSequencerApp::getPluginProgram(int id, const TQString &name) { MappedObject *object = m_studio->getObjectById(id); @@ -1750,7 +1750,7 @@ RosegardenSequencerApp::checkExternalTransport() TransportPair pair = *m_transportRequests.begin(); m_transportRequests.pop_front(); - QByteArray data; + TQByteArray data; switch (pair.first) { @@ -1786,7 +1786,7 @@ RosegardenSequencerApp::checkExternalTransport() break; case TransportJumpToTime: { - QDataStream arg(data, IO_WriteOnly); + TQDataStream arg(data, IO_WriteOnly); arg << (int)pair.second.sec; arg << (int)pair.second.usec(); @@ -1805,7 +1805,7 @@ RosegardenSequencerApp::checkExternalTransport() } case TransportStartAtTime: { - QDataStream arg(data, IO_WriteOnly); + TQDataStream arg(data, IO_WriteOnly); arg << (int)pair.second.sec; arg << (int)pair.second.usec(); @@ -1822,7 +1822,7 @@ RosegardenSequencerApp::checkExternalTransport() "stop()", data); - QDataStream arg(data, IO_WriteOnly); + TQDataStream arg(data, IO_WriteOnly); arg << (int)pair.second.sec; arg << (int)pair.second.usec(); diff --git a/src/sequencer/RosegardenSequencerApp.h b/src/sequencer/RosegardenSequencerApp.h index bb72547..72208d3 100644 --- a/src/sequencer/RosegardenSequencerApp.h +++ b/src/sequencer/RosegardenSequencerApp.h @@ -35,14 +35,14 @@ // include files for Qt -#include <qstrlist.h> +#include <tqstrlist.h> // include files for KDE #include <kapp.h> #include <kmainwindow.h> #include <kaccel.h> -#include <qtimer.h> +#include <tqtimer.h> #include "base/Composition.h" #include "gui/application/RosegardenDCOP.h" @@ -161,11 +161,11 @@ public: // Return the Sound system status (audio/MIDI) // - virtual unsigned int getSoundDriverStatus(const QString &guiVersion); + virtual unsigned int getSoundDriverStatus(const TQString &guiVersion); // Add and remove Audio files on the sequencer // - virtual int addAudioFile(const QString &fileName, int id); + virtual int addAudioFile(const TQString &fileName, int id); virtual int removeAudioFile(int id); // Deletes all the audio files and clears down any flapping i/o handles @@ -209,18 +209,18 @@ public: virtual int canReconnect(int deviceType); virtual unsigned int addDevice(int type, unsigned int direction); virtual void removeDevice(unsigned int id); - virtual void renameDevice(unsigned int id, QString name); + virtual void renameDevice(unsigned int id, TQString name); virtual unsigned int getConnections(int type, unsigned int direction); - virtual QString getConnection(int type, unsigned int direction, + virtual TQString getConnection(int type, unsigned int direction, unsigned int connectionNo); - virtual void setConnection(unsigned int deviceId, QString connection); + virtual void setConnection(unsigned int deviceId, TQString connection); virtual void setPlausibleConnection(unsigned int deviceId, - QString idealConnection); + TQString idealConnection); virtual unsigned int getTimers(); - virtual QString getTimer(unsigned int n); - virtual QString getCurrentTimer(); - virtual void setCurrentTimer(QString timer); + virtual TQString getTimer(unsigned int n); + virtual TQString getCurrentTimer(); + virtual void setCurrentTimer(TQString timer); virtual void setLowLatencyMode(bool); @@ -232,7 +232,7 @@ public: // Set a MappedObject // virtual void setMappedProperty(int id, - const QString &property, + const TQString &property, float value); // Set many properties on many MappedObjects @@ -244,13 +244,13 @@ public: // Set a MappedObject to a string // virtual void setMappedProperty(int id, - const QString &property, - const QString &value); + const TQString &property, + const TQString &value); // Set a MappedObject to a property list // virtual void setMappedPropertyList(int id, - const QString &property, + const TQString &property, const MappedObjectPropertyList &values); // Get a MappedObject for a type @@ -259,14 +259,14 @@ public: // Get a Property list from an Object // - virtual std::vector<QString> getPropertyList(int id, - const QString &property); + virtual std::vector<TQString> getPropertyList(int id, + const TQString &property); - virtual std::vector<QString> getPluginInformation(); + virtual std::vector<TQString> getPluginInformation(); - virtual QString getPluginProgram(int id, int bank, int program); + virtual TQString getPluginProgram(int id, int bank, int program); - virtual unsigned long getPluginProgram(int id, const QString &name); + virtual unsigned long getPluginProgram(int id, const TQString &name); // Set a plugin port // @@ -307,9 +307,9 @@ public: // Debug stuff, to check MmappedSegment::iterator virtual void dumpFirstSegment(); - virtual void remapSegment(const QString& filename, size_t newSize); - virtual void addSegment(const QString& filename); - virtual void deleteSegment(const QString& filename); + virtual void remapSegment(const TQString& filename, size_t newSize); + virtual void addSegment(const TQString& filename); + virtual void deleteSegment(const TQString& filename); virtual void closeAllSegments(); virtual void remapTracks(); @@ -319,7 +319,7 @@ public: // Get a status report // - virtual QString getStatusLog(); + virtual TQString getStatusLog(); // // @@ -448,7 +448,7 @@ protected: void applyLatencyCompensation(MappedComposition &); // mmap-related stuff - MmappedSegment* mmapSegment(const QString&); + MmappedSegment* mmapSegment(const TQString&); void cleanupMmapData(); void initMetaIterator(); @@ -502,15 +502,15 @@ protected: // Slice revert storage // RealTime m_oldSliceSize; - QTimer *m_sliceTimer; + TQTimer *m_sliceTimer; // Timer to check for new clients // - QTimer *m_newClientTimer; + TQTimer *m_newClientTimer; // mmap segments // - QString m_segmentFilesPath; + TQString m_segmentFilesPath; MmappedSegmentsMetaIterator::mmappedsegments m_mmappedSegments; MmappedSegmentsMetaIterator* m_metaIterator; RealTime m_lastStartTime; diff --git a/src/sequencer/RosegardenSequencerIface.h b/src/sequencer/RosegardenSequencerIface.h index 47c0215..ac401ae 100644 --- a/src/sequencer/RosegardenSequencerIface.h +++ b/src/sequencer/RosegardenSequencerIface.h @@ -26,8 +26,8 @@ #define _ROSEGARDENSEQUENCERIFACE_H_ #include <dcopobject.h> -// #include <qvaluevector.h> -// #include <qpair.h> +// #include <tqvaluevector.h> +// #include <tqpair.h> #include "gui/application/RosegardenDCOP.h" @@ -104,11 +104,11 @@ public: // Get the status of the Sequencer // - virtual unsigned int getSoundDriverStatus(const QString &guiVersion) = 0; + virtual unsigned int getSoundDriverStatus(const TQString &guiVersion) = 0; // Add and delete audio files on the Sequencer // - virtual int addAudioFile(const QString &fileName, int id) = 0; + virtual int addAudioFile(const TQString &fileName, int id) = 0; virtual int removeAudioFile(int id) = 0; virtual void clearAllAudioFiles() = 0; @@ -179,7 +179,7 @@ public: // Rename the given device. // Ignored if the driver does not permit this operation. // - virtual void renameDevice(unsigned int id, QString name) = 0; + virtual void renameDevice(unsigned int id, TQString name) = 0; // Return the number of permissible connections for a device of // the given type and direction (corresponding to MidiDevice:: @@ -194,7 +194,7 @@ public: // DeviceDirection enum). Direction is ignored for non-MIDI devices. // Returns the empty string for invalid parameters. // - virtual QString getConnection(int type, + virtual TQString getConnection(int type, unsigned int direction, unsigned int connectionNo) = 0; @@ -202,14 +202,14 @@ public: // Ignored if driver does not permit reconnections or the connection // is not one of the permissible set for that device. // - virtual void setConnection(unsigned int deviceId, QString connection) = 0; + virtual void setConnection(unsigned int deviceId, TQString connection) = 0; // Reconnect a device to a particular connection or to the closest // thing to that connection currently available (using some heuristic). // Ignored if driver does not permit reconnections. // virtual void setPlausibleConnection(unsigned int deviceId, - QString idealConnection) = 0; + TQString idealConnection) = 0; // Return the number of different timers we are capable of // sychronising against. This may return 0 if the driver has no @@ -220,17 +220,17 @@ public: // Return the name of a timer from the available set (where // n is between 0 and the return value from getTimers() - 1). // - virtual QString getTimer(unsigned int n) = 0; + virtual TQString getTimer(unsigned int n) = 0; // Return the name of the timer we are currently synchronising // against. // - virtual QString getCurrentTimer() = 0; + virtual TQString getCurrentTimer() = 0; // Set the timer we are currently synchronising against. // Invalid arguments are simply ignored. // - virtual void setCurrentTimer(QString timer) = 0; + virtual void setCurrentTimer(TQString timer) = 0; virtual void setLowLatencyMode(bool lowLatMode) = 0; @@ -242,7 +242,7 @@ public: // Set a property on a MappedObject // virtual void setMappedProperty(int id, - const QString &property, + const TQString &property, float value) = 0; // Set many properties on many MappedObjects @@ -254,14 +254,14 @@ public: // Set a string property on a MappedObject // virtual void setMappedProperty(int id, - const QString &property, - const QString &value) = 0; + const TQString &property, + const TQString &value) = 0; // Set a MappedObject to a property list // virtual void setMappedPropertyList( int id, - const QString &property, + const TQString &property, const MappedObjectPropertyList &values) = 0; // Get a mapped object id for a object type @@ -270,21 +270,21 @@ public: // Get a list of properties of a certain type from an object // - virtual std::vector<QString> getPropertyList(int id, - const QString &property) = 0; + virtual std::vector<TQString> getPropertyList(int id, + const TQString &property) = 0; // Get a list of available plugins // - virtual std::vector<QString> getPluginInformation() = 0; + virtual std::vector<TQString> getPluginInformation() = 0; // Nasty hack: program name/number mappings are one thing that // mapped object properties can't cope with // - virtual QString getPluginProgram(int mappedId, int bank, int program) = 0; + virtual TQString getPluginProgram(int mappedId, int bank, int program) = 0; // Nastier hack: return value is bank << 16 + program // - virtual unsigned long getPluginProgram(int mappedId, const QString &name) = 0; + virtual unsigned long getPluginProgram(int mappedId, const TQString &name) = 0; // Cheat - we can't use a call (getPropertyList) during playback // so we use this method to set port N on plugin X. @@ -334,19 +334,19 @@ public: // Return a (potentially lengthy) human-readable status log // - virtual QString getStatusLog() = 0; + virtual TQString getStatusLog() = 0; // Debug stuff, to check MmappedSegment::iterator virtual void dumpFirstSegment() = 0; /// Remap a segment while playing - virtual void remapSegment(const QString& filename, size_t newSize) = 0; + virtual void remapSegment(const TQString& filename, size_t newSize) = 0; /// Add a segment while playing - virtual void addSegment(const QString& filename) = 0; + virtual void addSegment(const TQString& filename) = 0; /// Delete a segment while playing - virtual void deleteSegment(const QString& filename) = 0; + virtual void deleteSegment(const TQString& filename) = 0; /// Close all mmapped segments virtual void closeAllSegments() = 0; diff --git a/src/sequencer/SequencerMmapper.cpp b/src/sequencer/SequencerMmapper.cpp index 3a634ba..047878f 100644 --- a/src/sequencer/SequencerMmapper.cpp +++ b/src/sequencer/SequencerMmapper.cpp @@ -32,7 +32,7 @@ #include <kstddirs.h> -#include <qfile.h> +#include <tqfile.h> #include "SequencerMmapper.h" #include "misc/Debug.h" @@ -57,7 +57,7 @@ SequencerMmapper::SequencerMmapper(): m_mmappedSize(sizeof(SequencerDataBlock)) { // just in case - QFile::remove + TQFile::remove (m_fileName); m_fd = ::open(m_fileName.latin1(), @@ -81,7 +81,7 @@ SequencerMmapper::SequencerMmapper(): if (m_mmappedBuffer == (void*) - 1) { SEQUENCER_DEBUG << - QString("mmap failed : (%1) %2\n").arg(errno).arg(strerror(errno)); + TQString("mmap failed : (%1) %2\n").arg(errno).arg(strerror(errno)); throw Exception("mmap failed"); } @@ -96,7 +96,7 @@ SequencerMmapper::~SequencerMmapper() { ::munmap(m_mmappedBuffer, m_mmappedSize); ::close(m_fd); - QFile::remove + TQFile::remove (m_fileName); } diff --git a/src/sequencer/SequencerMmapper.h b/src/sequencer/SequencerMmapper.h index f35c2a7..026dfc4 100644 --- a/src/sequencer/SequencerMmapper.h +++ b/src/sequencer/SequencerMmapper.h @@ -87,11 +87,11 @@ public: protected: void init(); void setFileSize(size_t); - QString createFileName(); + TQString createFileName(); //--------------- Data members --------------------------------- // - QString m_fileName; + TQString m_fileName; int m_fd; void* m_mmappedBuffer; size_t m_mmappedSize; diff --git a/src/sequencer/main.cpp b/src/sequencer/main.cpp index aee5bc5..dd97510 100644 --- a/src/sequencer/main.cpp +++ b/src/sequencer/main.cpp @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) roseSeq = new RosegardenSequencerApp; } - QObject::connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit())); + TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit())); app.disableSessionManagement(); // we don't want to be // saved/restored by session |
