diff --git a/include/SampleRecordHandle.h b/include/SampleRecordHandle.h index e7bc29613..b26a7d0f6 100644 --- a/include/SampleRecordHandle.h +++ b/include/SampleRecordHandle.h @@ -65,7 +65,7 @@ private: Track * m_track; BBTrack * m_bbTrack; SampleClip * m_clip; - + // The offset from the start of m_track that the record has // started from. TimePos m_startRecordTimeOffset; diff --git a/src/core/AudioEngine.cpp b/src/core/AudioEngine.cpp index 2edcd2b59..25068d36e 100644 --- a/src/core/AudioEngine.cpp +++ b/src/core/AudioEngine.cpp @@ -352,7 +352,7 @@ const surroundSampleFrame * AudioEngine::renderNextBuffer() if( it != m_playHandles.end() ) { - if((*it)->audioPort()) { (*it)->audioPort()->removePlayHandle(*it); } + if((*it)->audioPort()) { (*it)->audioPort()->removePlayHandle(*it); } if( ( *it )->type() == PlayHandle::TypeNotePlayHandle ) { NotePlayHandleManager::release( (NotePlayHandle*) *it ); @@ -400,7 +400,7 @@ const surroundSampleFrame * AudioEngine::renderNextBuffer() } if( ( *it )->isFinished() ) { - if((*it)->audioPort()) { (*it)->audioPort()->removePlayHandle(*it); } + if((*it)->audioPort()) { (*it)->audioPort()->removePlayHandle(*it); } if( ( *it )->type() == PlayHandle::TypeNotePlayHandle ) { NotePlayHandleManager::release( (NotePlayHandle*) *it ); diff --git a/src/core/DataFile.cpp b/src/core/DataFile.cpp index 8dd267f96..69eb6d7b3 100644 --- a/src/core/DataFile.cpp +++ b/src/core/DataFile.cpp @@ -445,15 +445,15 @@ bool DataFile::copyResources(const QString& resourcesDir) { // Get absolute path to resource bool error; - auto attribute = el.attribute(*res); + auto attribute = el.attribute(*res); - // Skip empty resources. In some cases, there might be an - // alternative way of actually representing the data (e.g. data element for SampleTCO) - if (attribute.isEmpty()) - { - ++res; - continue; - } + // Skip empty resources. In some cases, there might be an + // alternative way of actually representing the data (e.g. data element for SampleTCO) + if (attribute.isEmpty()) + { + ++res; + continue; + } QString resPath = PathUtil::toAbsolute(attribute, &error); // If we are running without the project loaded (from CLI), "local:" base diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp index 5217139cc..517b16396 100644 --- a/src/gui/editors/SongEditor.cpp +++ b/src/gui/editors/SongEditor.cpp @@ -1025,14 +1025,14 @@ SongEditorWindow::SongEditorWindow(Song* song) : connect(song, SIGNAL(projectLoaded()), this, SLOT(adjustUiAfterProjectLoad())); connect(this, SIGNAL(resized()), m_editor, SLOT(updatePositionLine())); - // In case our current audio device does not support capture, - // disable the record buttons. - if(!Engine::audioEngine()->audioDev()->supportsCapture()) { - for(auto &recordAction : {m_recordAccompanyAction, m_recordAction}) { - recordAction->setEnabled(false); - recordAction->setToolTip(tr("Recording is unavailable: try connecting an input device or switching backend")); - } - } + // In case our current audio device does not support capture, + // disable the record buttons. + if(!Engine::audioEngine()->audioDev()->supportsCapture()) { + for(auto &recordAction : {m_recordAccompanyAction, m_recordAction}) { + recordAction->setEnabled(false); + recordAction->setToolTip(tr("Recording is unavailable: try connecting an input device or switching backend")); + } + } } QSize SongEditorWindow::sizeHint() const diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp index 68a32187c..f9b159e86 100644 --- a/src/tracks/SampleTrack.cpp +++ b/src/tracks/SampleTrack.cpp @@ -108,11 +108,11 @@ bool SampleTrack::play( const TimePos & _start, const fpp_t _frames, // In case we are recoding, "play" the whole TCO. if(sClip->isRecord()) { - samplePlayLength = clipFrameLength; - } + samplePlayLength = clipFrameLength; + } - //we only play within the sampleBuffer limits - //Ignore that in case of recoding. + //we only play within the sampleBuffer limits + //Ignore that in case of recoding. if(sampleStart < sampleBufferLength || sClip->isRecord ()) { sClip->setSampleStartFrame(sampleStart);