summaryrefslogtreecommitdiffstats
path: root/src/gui/application/RosegardenGUIApp.cpp.orig
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/application/RosegardenGUIApp.cpp.orig')
-rw-r--r--src/gui/application/RosegardenGUIApp.cpp.orig68
1 files changed, 34 insertions, 34 deletions
diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig
index 0b6e768..331096d 100644
--- a/src/gui/application/RosegardenGUIApp.cpp.orig
+++ b/src/gui/application/RosegardenGUIApp.cpp.orig
@@ -437,7 +437,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
// problems. This warning has to happen early, in case it
// affects the ability to load plugins etc from a file on the
// command line.
- m_seqManager->checkSoundDrivertqStatus(true);
+ m_seqManager->checkSoundDriverStatus(true);
}
if (m_view) {
@@ -445,7 +445,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
m_view, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *)));
}
- if (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK) {
+ if (m_seqManager->getSoundDriverStatus() & AUDIO_OK) {
slotStateChanged("got_audio", true);
} else {
slotStateChanged("got_audio", false);
@@ -1631,7 +1631,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument)
this, TQT_SLOT(slotDocumentDevicesResyncd()));
m_doc->syncDevices();
- m_doc->clearModifiedtqStatus();
+ m_doc->clearModifiedStatus();
if (newDocument->getStudio().haveMidiDevices()) {
stateChanged("got_midi_devices");
@@ -1658,7 +1658,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument)
emit documentChanged(m_doc);
- m_doc->clearModifiedtqStatus(); // because it's set as modified by the various
+ m_doc->clearModifiedStatus(); // because it's set as modified by the various
// init operations
// TODO: this sucks, have to sort it out somehow.
@@ -1739,7 +1739,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
// Stop if playing
//
- if (m_seqManager && m_seqManager->getTransporttqStatus() == PLAYING)
+ if (m_seqManager && m_seqManager->getTransportStatus() == PLAYING)
slotStop();
slotEnableTransport(false);
@@ -1834,7 +1834,7 @@ RosegardenGUIApp::createDocumentFromRGFile(TQString filePath)
newDoc->setAbsFilePath(info.absFilePath());
newDoc->setTitle(info.fileName());
} else {
- newDoc->clearModifiedtqStatus();
+ newDoc->clearModifiedStatus();
}
} else {
delete newDoc;
@@ -4236,7 +4236,7 @@ RosegardenGUIApp::slotUpdatePlaybackPosition()
// std::cerr << "RosegardenGUIApp::slotUpdatePlaybackPosition: mapper timeT = " << elapsedTime << std::endl;
- if (m_seqManager->getTransporttqStatus() == RECORDING) {
+ if (m_seqManager->getTransportStatus() == RECORDING) {
MappedComposition mC;
if (mapper->getRecordedEvents(mC) > 0) {
@@ -4358,10 +4358,10 @@ void RosegardenGUIApp::slotSetPointerPosition(timeT t)
// std::cerr << "RosegardenGUIApp::slotSetPointerPosition: t = " << t << std::endl;
if (m_seqManager) {
- if ( m_seqManager->getTransporttqStatus() == PLAYING ||
- m_seqManager->getTransporttqStatus() == RECORDING ) {
+ if ( m_seqManager->getTransportStatus() == PLAYING ||
+ m_seqManager->getTransportStatus() == RECORDING ) {
if (t > comp.getEndMarker()) {
- if (m_seqManager->getTransporttqStatus() == PLAYING) {
+ if (m_seqManager->getTransportStatus() == PLAYING) {
slotStop();
t = comp.getEndMarker();
@@ -4477,8 +4477,8 @@ void RosegardenGUIApp::slotDisplayBarTime(timeT t)
void RosegardenGUIApp::slotRefreshTimeDisplay()
{
- if ( m_seqManager->getTransporttqStatus() == PLAYING ||
- m_seqManager->getTransporttqStatus() == RECORDING ) {
+ if ( m_seqManager->getTransportStatus() == PLAYING ||
+ m_seqManager->getTransportStatus() == RECORDING ) {
return ; // it'll be refreshed in a moment anyway
}
slotSetPointerPosition(m_doc->getComposition().getPosition());
@@ -4560,7 +4560,7 @@ void RosegardenGUIApp::slotTestStartupTester()
}
#ifdef HAVE_LIBJACK
- if (m_seqManager && (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK)) {
+ if (m_seqManager && (m_seqManager->getSoundDriverStatus() & AUDIO_OK)) {
m_haveAudioImporter = m_startupTester->haveAudioFileImporter(&missing);
@@ -4623,7 +4623,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
if (isSequencerRunning()) {
RG_DEBUG << "RosegardenGUIApp::launchSequencer() - sequencer already running - returning\n";
- if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false);
+ if (m_seqManager) m_seqManager->checkSoundDriverStatus(false);
return true;
}
@@ -4639,7 +4639,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
<< "existing DCOP registered sequencer found\n";
if (useExisting) {
- if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false);
+ if (m_seqManager) m_seqManager->checkSoundDriverStatus(false);
m_sequencerProcess = (KProcess*)SequencerExternal;
return true;
}
@@ -4733,7 +4733,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
try {
// if (m_seqManager) {
// RG_DEBUG << "RosegardenGUIApp::launchSequencer : checking sound driver status\n";
- // m_seqManager->checkSoundDrivertqStatus();
+ // m_seqManager->checkSoundDriverStatus();
// }
stateChanged("sequencer_running");
@@ -5168,9 +5168,9 @@ RosegardenGUIApp::slotToggleMetronome()
{
Composition &comp = m_doc->getComposition();
- if (m_seqManager->getTransporttqStatus() == STARTING_TO_RECORD ||
- m_seqManager->getTransporttqStatus() == RECORDING ||
- m_seqManager->getTransporttqStatus() == RECORDING_ARMED) {
+ if (m_seqManager->getTransportStatus() == STARTING_TO_RECORD ||
+ m_seqManager->getTransportStatus() == RECORDING ||
+ m_seqManager->getTransportStatus() == RECORDING_ARMED) {
if (comp.useRecordMetronome())
comp.setRecordMetronome(false);
else
@@ -5192,7 +5192,7 @@ RosegardenGUIApp::slotRewindToBeginning()
{
// ignore requests if recording
//
- if (m_seqManager->getTransporttqStatus() == RECORDING)
+ if (m_seqManager->getTransportStatus() == RECORDING)
return ;
m_seqManager->rewindToBeginning();
@@ -5203,7 +5203,7 @@ RosegardenGUIApp::slotFastForwardToEnd()
{
// ignore requests if recording
//
- if (m_seqManager->getTransporttqStatus() == RECORDING)
+ if (m_seqManager->getTransportStatus() == RECORDING)
return ;
m_seqManager->fastForwardToEnd();
@@ -5213,18 +5213,18 @@ void
RosegardenGUIApp::slotSetPlayPosition(timeT time)
{
RG_DEBUG << "RosegardenGUIApp::slotSetPlayPosition(" << time << ")" << endl;
- if (m_seqManager->getTransporttqStatus() == RECORDING)
+ if (m_seqManager->getTransportStatus() == RECORDING)
return ;
m_doc->slotSetPointerPosition(time);
- if (m_seqManager->getTransporttqStatus() == PLAYING)
+ if (m_seqManager->getTransportStatus() == PLAYING)
return ;
slotPlay();
}
-void RosegardenGUIApp::notifySequencertqStatus(int status)
+void RosegardenGUIApp::notifySequencerStatus(int status)
{
stateChanged("not_playing",
(status == PLAYING ||
@@ -5232,7 +5232,7 @@ void RosegardenGUIApp::notifySequencertqStatus(int status)
KXMLGUIClient::StateReverse : KXMLGUIClient::StateNoReverse);
if (m_seqManager)
- m_seqManager->setTransporttqStatus((TransporttqStatus) status);
+ m_seqManager->setTransportStatus((TransportStatus) status);
}
void RosegardenGUIApp::processAsynchronousMidi(const MappedComposition &mC)
@@ -5261,10 +5261,10 @@ RosegardenGUIApp::slotRecord()
return ;
}
- if (m_seqManager->getTransporttqStatus() == RECORDING) {
+ if (m_seqManager->getTransportStatus() == RECORDING) {
slotStop();
return ;
- } else if (m_seqManager->getTransporttqStatus() == PLAYING) {
+ } else if (m_seqManager->getTransportStatus() == PLAYING) {
slotToggleRecord();
return ;
}
@@ -5398,7 +5398,7 @@ void RosegardenGUIApp::slotPlay()
// slotRecord ensures we don't toggle the recording state in
// SequenceManager)
//
- if (m_seqManager->getTransporttqStatus() == RECORDING_ARMED) {
+ if (m_seqManager->getTransportStatus() == RECORDING_ARMED) {
slotRecord();
return ;
}
@@ -5481,7 +5481,7 @@ void RosegardenGUIApp::slotRewind()
{
// ignore requests if recording
//
- if (m_seqManager->getTransporttqStatus() == RECORDING)
+ if (m_seqManager->getTransportStatus() == RECORDING)
return ;
if (m_seqManager)
m_seqManager->rewind();
@@ -5491,7 +5491,7 @@ void RosegardenGUIApp::slotFastforward()
{
// ignore requests if recording
//
- if (m_seqManager->getTransporttqStatus() == RECORDING)
+ if (m_seqManager->getTransportStatus() == RECORDING)
return ;
if (m_seqManager)
@@ -6307,8 +6307,8 @@ RosegardenGUIApp::slotAudioManager()
connect(this, TQT_SIGNAL(documentAboutToChange()),
m_audioManagerDialog, TQT_SLOT(close()));
- m_audioManagerDialog->setAudioSubsystemtqStatus(
- m_seqManager->getSoundDrivertqStatus() & AUDIO_OK);
+ m_audioManagerDialog->setAudioSubsystemStatus(
+ m_seqManager->getSoundDriverStatus() & AUDIO_OK);
plugAccelerators(m_audioManagerDialog,
m_audioManagerDialog->getAccelerators());
@@ -7912,8 +7912,8 @@ void
RosegardenGUIApp::slotAutoSave()
{
if (!m_seqManager ||
- m_seqManager->getTransporttqStatus() == PLAYING ||
- m_seqManager->getTransporttqStatus() == RECORDING)
+ m_seqManager->getTransportStatus() == PLAYING ||
+ m_seqManager->getTransportStatus() == RECORDING)
return ;
KConfig* config = kapp->config();