summaryrefslogtreecommitdiffstats
path: root/src/sound
diff options
context:
space:
mode:
Diffstat (limited to 'src/sound')
-rw-r--r--src/sound/AlsaDriver.cpp6
-rw-r--r--src/sound/AudioFileManager.cpp28
-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/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/RIFFAudioFile.cpp2
10 files changed, 75 insertions, 75 deletions
diff --git a/src/sound/AlsaDriver.cpp b/src/sound/AlsaDriver.cpp
index e3f738d..58d8093 100644
--- a/src/sound/AlsaDriver.cpp
+++ b/src/sound/AlsaDriver.cpp
@@ -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
diff --git a/src/sound/AudioFileManager.cpp b/src/sound/AudioFileManager.cpp
index 346810c..10d6474 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")
- .tqarg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
- .tqarg(newId + 1);
+ .arg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
+ .arg(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")
- .tqarg(prefix)
- .tqarg(sourceBase.c_str())
- .tqarg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
- .tqarg(newId + 1);
+ .arg(prefix)
+ .arg(sourceBase.c_str())
+ .arg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
+ .arg(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").tqarg(url.prettyURL()));
+ emit setOperationName(i18n("Downloading file %1").arg(url.prettyURL()));
TQString localPath = "";
if (!KIO::NetAccess::download(url, localPath)) {
- KMessageBox::error(0, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+ KMessageBox::error(0, i18n("Cannot download file %1").arg(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").tqarg(sampleRate);
+ *proc << TQString("%1").arg(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").tqarg(sampleRate);
+ *proc << TQString("%1").arg(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")
- .tqarg(sourceBase)
- .tqarg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
- .tqarg(newId + 1);
+ .arg(sourceBase)
+ .arg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
+ .arg(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").tqarg(sampleRate);
+ *m_importProcess << TQString("%1").arg(sampleRate);
}
*m_importProcess << "-c";
*m_importProcess << fileName.c_str();
diff --git a/src/sound/AudioTimeStretcher.h b/src/sound/AudioTimeStretcher.h
index 96fc54c..fb2029b 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 tqshape in to the modulation array (if
+ * Also add the window shape 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 9189fa6..9e10778 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").tqarg(descriptor->UniqueID));
+ list.push_back(TQString("%1").arg(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").tqarg(descriptor->PortCount));
+ list.push_back(TQString("%1").arg(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").tqarg(p));
+ list.push_back(TQString("%1").arg(p));
list.push_back(descriptor->PortNames[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)));
+ 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)));
}
}
diff --git a/src/sound/DSSIPluginInstance.cpp b/src/sound/DSSIPluginInstance.cpp
index df18b59..c89aca2 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").tqarg(index).tqarg(programDescriptor->Name);
+ d.name = TQString("%1. %2").arg(index).arg(programDescriptor->Name);
m_cachedPrograms.push_back(d);
}
diff --git a/src/sound/LADSPAPluginFactory.cpp b/src/sound/LADSPAPluginFactory.cpp
index 9a7b49a..b1560d8 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").tqarg(descriptor->UniqueID));
+ list.push_back(TQString("%1").arg(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").tqarg(descriptor->PortCount));
+ list.push_back(TQString("%1").arg(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").tqarg(p));
+ list.push_back(TQString("%1").arg(p));
list.push_back(descriptor->PortNames[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)));
+ 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)));
}
}
@@ -664,7 +664,7 @@ LADSPAPluginFactory::discoverPlugins()
TQDir pluginDir(*i, "*.so");
for (unsigned int j = 0; j < pluginDir.count(); ++j) {
- discoverPlugins(TQString("%1/%2").tqarg(*i).tqarg(pluginDir[j]));
+ discoverPlugins(TQString("%1/%2").arg(*i).arg(pluginDir[j]));
}
}
diff --git a/src/sound/MappedEvent.cpp b/src/sound/MappedEvent.cpp
index 2eb6382..4bae51e 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").tqarg(id)),
+ : m_fileName(KGlobal::dirs()->resourceDirs("tmp").first() + TQString("/rosegarden_datablock_%1").arg(id)),
m_file(m_fileName),
m_cleared(false)
{
diff --git a/src/sound/MappedStudio.cpp b/src/sound/MappedStudio.cpp
index e5a583c..9911b67 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_tqchildren.begin();
- for (; it != m_tqchildren.end(); it++)
+ std::vector<MappedObject*>::iterator it = m_children.begin();
+ for (; it != m_children.end(); it++)
if ((*it) == object)
return ;
- m_tqchildren.push_back(object);
+ m_children.push_back(object);
}
void
MappedObject::removeChild(MappedObject *object)
{
- std::vector<MappedObject*>::iterator it = m_tqchildren.begin();
- for (; it != m_tqchildren.end(); it++) {
+ std::vector<MappedObject*>::iterator it = m_children.begin();
+ for (; it != m_children.end(); it++) {
if ((*it) == object) {
- m_tqchildren.erase(it);
+ m_children.erase(it);
return ;
}
}
@@ -211,9 +211,9 @@ MappedObjectPropertyList
MappedObject::getChildren()
{
MappedObjectPropertyList list;
- std::vector<MappedObject*>::iterator it = m_tqchildren.begin();
- for (; it != m_tqchildren.end(); it++)
- list.push_back(TQString("%1").tqarg((*it)->getId()));
+ std::vector<MappedObject*>::iterator it = m_children.begin();
+ for (; it != m_children.end(); it++)
+ list.push_back(TQString("%1").arg((*it)->getId()));
return list;
}
@@ -225,10 +225,10 @@ MappedObjectPropertyList
MappedObject::getChildren(MappedObjectType type)
{
MappedObjectPropertyList list;
- std::vector<MappedObject*>::iterator it = m_tqchildren.begin();
- for (; it != m_tqchildren.end(); it++) {
+ std::vector<MappedObject*>::iterator it = m_children.begin();
+ for (; it != m_children.end(); it++) {
if ((*it)->getType() == type)
- list.push_back(TQString("%1").tqarg((*it)->getId()));
+ list.push_back(TQString("%1").arg((*it)->getId()));
}
return list;
@@ -244,16 +244,16 @@ MappedObject::destroyChildren()
// see note in destroy() below
- std::vector<MappedObject *> tqchildren = m_tqchildren;
- m_tqchildren.clear();
+ std::vector<MappedObject *> children = m_children;
+ m_children.clear();
- std::vector<MappedObject *>::iterator it = tqchildren.begin();
- for (; it != tqchildren.end(); it++)
+ std::vector<MappedObject *>::iterator it = children.begin();
+ for (; it != children.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 tqchildren.
+// do the same for all its children.
//
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_tqchildren here, as it will
+ // we don't want to be iterating over m_children here, as it will
// change from under us.
- std::vector<MappedObject *> tqchildren = m_tqchildren;
- m_tqchildren.clear();
+ std::vector<MappedObject *> children = m_children;
+ m_children.clear();
- std::vector<MappedObject *>::iterator it = tqchildren.begin();
- for (; it != tqchildren.end(); it++) {
+ std::vector<MappedObject *>::iterator it = children.begin();
+ for (; it != children.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").tqarg(m_instrumentId));
+ list.push_back(MappedObjectProperty("%1").arg(m_instrumentId));
} else if (property == MappedAudioFader::FaderLevel) {
- list.push_back(MappedObjectProperty("%1").tqarg(m_level));
+ list.push_back(MappedObjectProperty("%1").arg(m_level));
} else if (property == MappedAudioFader::FaderRecordLevel) {
- list.push_back(MappedObjectProperty("%1").tqarg(m_recordLevel));
+ list.push_back(MappedObjectProperty("%1").arg(m_recordLevel));
} else if (property == MappedAudioFader::Channels) {
- list.push_back(MappedObjectProperty("%1").tqarg(m_channels));
+ list.push_back(MappedObjectProperty("%1").arg(m_channels));
} else if (property == MappedAudioFader::InputChannel) {
- list.push_back(MappedObjectProperty("%1").tqarg(m_inputChannel));
+ list.push_back(MappedObjectProperty("%1").arg(m_inputChannel));
} else if (property == MappedAudioFader::Pan) {
- list.push_back(MappedObjectProperty("%1").tqarg(m_pan));
+ list.push_back(MappedObjectProperty("%1").arg(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").tqarg(*it));
+ list.push_back(TQString("%1").arg(*it));
}
} else if (property == MappedConnectableObject::ConnectionsOut) {
MappedObjectValueList::const_iterator
it = m_connectionsOut.begin();
for ( ; it != m_connectionsOut.end(); ++it) {
- list.push_back(TQString("%1").tqarg(*it));
+ list.push_back(TQString("%1").arg(*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").tqarg(m_bussId));
+ list.push_back(MappedObjectProperty("%1").arg(m_bussId));
} else if (property == Level) {
- list.push_back(MappedObjectProperty("%1").tqarg(m_level));
+ list.push_back(MappedObjectProperty("%1").arg(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").tqarg(*it));
+ list.push_back(TQString("%1").arg(*it));
}
} else if (property == MappedConnectableObject::ConnectionsOut) {
MappedObjectValueList::const_iterator
it = m_connectionsOut.begin();
for ( ; it != m_connectionsOut.end(); ++it) {
- list.push_back(TQString("%1").tqarg(*it));
+ list.push_back(TQString("%1").arg(*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").tqarg(m_inputNumber));
+ list.push_back(MappedObjectProperty("%1").arg(m_inputNumber));
}
return list;
diff --git a/src/sound/MappedStudio.h b/src/sound/MappedStudio.h
index 96c5639..89acc9b 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_tqchildren; }
+ std::vector<MappedObject*> getChildObjects() { return m_children; }
protected:
@@ -144,7 +144,7 @@ protected:
std::string m_name;
MappedObject *m_parent;
- std::vector<MappedObject*> m_tqchildren;
+ std::vector<MappedObject*> m_children;
};
diff --git a/src/sound/RIFFAudioFile.cpp b/src/sound/RIFFAudioFile.cpp
index 823ee4f..c34435f 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 tqinvalidate the read buffer
+ // whatever we do here we invalidate the read buffer
//
m_loseBuffer = true;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-30 16:05:03 +0000