hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Return const QString& from SampleBuffer::audioFile

Browse Source
This commit is contained in:
sakertooth
2023-09-26 12:15:34 -04:00
parent 6900a2b114
commit 447045497f
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Sample.h
View File

@@ -101,7 +101,7 @@ public:
auto visualize(QPainter& p, const QRect& dr, int fromFrame = 0, int toFrame = 0) const -> void;
auto sampleDuration() const -> int;
auto sampleFile() const -> QString;
auto sampleFile() const -> const QString&;
auto sampleRate() const -> int;
auto sampleSize() const -> int;

4
include/SampleBuffer.h
View File

@@ -56,7 +56,7 @@ public:
friend void swap(SampleBuffer& first, SampleBuffer& second) noexcept;
auto toBase64() const -> QString;
auto audioFile() const -> QString;
auto audioFile() const -> const QString&;
auto sampleRate() const -> sample_rate_t;
auto begin() const -> const_iterator;
@@ -74,7 +74,7 @@ private:
private:
std::vector<sampleFrame> m_data;
std::optional<QString> m_audioFile;
QString m_audioFile;
int m_sampleRate = 0;
};

2
include/SampleClip.h
View File

@@ -54,7 +54,7 @@ public:
SampleClip& operator=( const SampleClip& that ) = delete;
void changeLength( const TimePos & _length ) override;
QString sampleFile() const;
const QString& sampleFile() const;
void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
void loadSettings( const QDomElement & _this ) override;

2
src/core/Sample.cpp
View File

@@ -263,7 +263,7 @@ auto Sample::sampleDuration() const -> int
return static_cast<double>(m_endFrame - m_startFrame) / m_buffer->sampleRate() * 1000;
}
auto Sample::sampleFile() const -> QString
auto Sample::sampleFile() const -> const QString&
{
return m_buffer->audioFile();
}

4
src/core/SampleBuffer.cpp
View File

@@ -151,9 +151,9 @@ QString SampleBuffer::toBase64() const
return byteArray.toBase64();
}
auto SampleBuffer::audioFile() const -> QString
auto SampleBuffer::audioFile() const -> const QString&
{
return m_audioFile.value_or("");
return m_audioFile;
}
auto SampleBuffer::sampleRate() const -> sample_rate_t

2
src/core/SampleClip.cpp
View File

@@ -118,7 +118,7 @@ void SampleClip::changeLength( const TimePos & _length )
QString SampleClip::sampleFile() const
const QString& SampleClip::sampleFile() const
{
return m_sample->sampleFile();
}