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

Remove old SampleBuffer

Browse Source
This commit is contained in:
sakertooth
2023-08-27 23:31:36 -04:00
parent 0017f66629
commit 53728ce70f
29 changed files with 203 additions and 2152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/CMakeLists.txt
View File

@@ -67,7 +67,6 @@ set(LMMS_SRCS
core/RingBuffer.cpp
core/Sample.cpp
core/SampleBuffer.cpp
core/SampleBuffer2.cpp
core/SampleClip.cpp
core/SamplePlayHandle.cpp
core/SampleRecordHandle.cpp

11
src/core/EnvelopeAndLfoParameters.cpp
View File

@@ -28,7 +28,7 @@
#include "AudioEngine.h"
#include "Engine.h"
#include "Oscillator.h"
#include "SampleLoader.h"
namespace lmms
{
@@ -221,7 +221,7 @@ inline sample_t EnvelopeAndLfoParameters::lfoShapeSample( fpp_t _frame_offset )
shape_sample = Oscillator::sawSample( phase );
break;
case LfoShape::UserDefinedWave:
shape_sample = m_userWave.userWaveSample( phase );
shape_sample = Oscillator::userWaveSample(m_userWave.get(), phase);
break;
case LfoShape::RandomWave:
if( frame == 0 )
@@ -354,7 +354,7 @@ void EnvelopeAndLfoParameters::saveSettings( QDomDocument & _doc,
m_lfoAmountModel.saveSettings( _doc, _parent, "lamt" );
m_x100Model.saveSettings( _doc, _parent, "x100" );
m_controlEnvAmountModel.saveSettings( _doc, _parent, "ctlenvamt" );
_parent.setAttribute( "userwavefile", m_userWave.audioFile() );
_parent.setAttribute("userwavefile", m_userWave->audioFile());
}
@@ -386,8 +386,9 @@ void EnvelopeAndLfoParameters::loadSettings( const QDomElement & _this )
m_sustainModel.setValue( 1.0 - m_sustainModel.value() );
}
m_userWave.setAudioFile( _this.attribute( "userwavefile" ) );
auto buffer = gui::SampleLoader::createBufferFromFile(_this.attribute("userwavefile"));
// TODO C++20: Deprecated, use std::atomic<std::shared_ptr> instead
std::atomic_store(&m_userWave, std::shared_ptr<const SampleBuffer>(std::move(buffer)));
updateSampleVars();
}

4
src/core/LfoController.cpp
View File

@@ -49,7 +49,7 @@ LfoController::LfoController( Model * _parent ) :
m_phaseOffset( 0 ),
m_currentPhase( 0 ),
m_sampleFunction( &Oscillator::sinSample ),
m_userDefSampleBuffer(std::make_shared<SampleBuffer2>())
m_userDefSampleBuffer(std::make_shared<SampleBuffer>())
{
setSampleExact( true );
connect( &m_waveModel, SIGNAL(dataChanged()),
@@ -214,7 +214,7 @@ void LfoController::loadSettings( const QDomElement & _this )
auto buffer = gui::SampleLoader::createBufferFromFile(_this.attribute("userwavefile"));
// TODO C++20: Deprecated, use std::atomic<std::shared_ptr> instead
std::atomic_store(&m_userDefSampleBuffer, std::shared_ptr<const SampleBuffer2>(std::move(buffer)));
std::atomic_store(&m_userDefSampleBuffer, std::shared_ptr<const SampleBuffer>(std::move(buffer)));
updateSampleFunction();
}

2
src/core/Oscillator.cpp
View File

@@ -182,7 +182,7 @@ void Oscillator::generateFromFFT(int bands, sample_t* table)
normalize(s_sampleBuffer.data(), table, OscillatorConstants::WAVETABLE_LENGTH, 2*OscillatorConstants::WAVETABLE_LENGTH + 1);
}
std::unique_ptr<OscillatorConstants::waveform_t> Oscillator::generateAntiAliasUserWaveTable(const SampleBuffer2* sampleBuffer)
std::unique_ptr<OscillatorConstants::waveform_t> Oscillator::generateAntiAliasUserWaveTable(const SampleBuffer* sampleBuffer)
{
auto userAntiAliasWaveTable = std::make_unique<OscillatorConstants::waveform_t>();
for (int i = 0; i < OscillatorConstants::WAVE_TABLES_PER_WAVEFORM_COUNT; ++i)

12
src/core/Sample.cpp
View File

@@ -1,5 +1,5 @@
/*
* Sample.cpp - State for container-class SampleBuffer2
* Sample.cpp - State for container-class SampleBuffer
*
* Copyright (c) 2023 saker <sakertooth@gmail.com>
*
@@ -30,7 +30,7 @@
namespace lmms {
Sample::Sample(const QString& audioFile)
: m_buffer(std::make_shared<SampleBuffer2>(audioFile))
: m_buffer(std::make_shared<SampleBuffer>(audioFile))
, m_startFrame(0)
, m_endFrame(m_buffer->size())
, m_loopStartFrame(0)
@@ -39,7 +39,7 @@ Sample::Sample(const QString& audioFile)
}
Sample::Sample(const QByteArray& base64, int sampleRate)
: m_buffer(std::make_shared<SampleBuffer2>(base64, sampleRate))
: m_buffer(std::make_shared<SampleBuffer>(base64, sampleRate))
, m_startFrame(0)
, m_endFrame(m_buffer->size())
, m_loopStartFrame(0)
@@ -48,7 +48,7 @@ Sample::Sample(const QByteArray& base64, int sampleRate)
}
Sample::Sample(const sampleFrame* data, int numFrames, int sampleRate)
: m_buffer(std::make_shared<SampleBuffer2>(data, numFrames, sampleRate))
: m_buffer(std::make_shared<SampleBuffer>(data, numFrames, sampleRate))
, m_startFrame(0)
, m_endFrame(m_buffer->size())
, m_loopStartFrame(0)
@@ -56,7 +56,7 @@ Sample::Sample(const sampleFrame* data, int numFrames, int sampleRate)
{
}
Sample::Sample(std::shared_ptr<const SampleBuffer2> buffer)
Sample::Sample(std::shared_ptr<const SampleBuffer> buffer)
: m_buffer(buffer)
, m_startFrame(0)
, m_endFrame(m_buffer->size())
@@ -265,7 +265,7 @@ auto Sample::playbackSize() const -> int
: 0;
}
auto Sample::buffer() const -> std::shared_ptr<const SampleBuffer2>
auto Sample::buffer() const -> std::shared_ptr<const SampleBuffer>
{
const auto lock = std::shared_lock{m_mutex};
return m_buffer;

1581
src/core/SampleBuffer.cpp
View File

File diff suppressed because it is too large Load Diff

199
src/core/SampleBuffer2.cpp
View File

@@ -1,199 +0,0 @@
/*
* SampleBuffer2.cpp - container-class SampleBuffer2
*
* Copyright (c) 2005-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of LMMS - https://lmms.io
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program (see COPYING); if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
*/
#include "SampleBuffer2.h"
#include <QFile>
#include <QFileInfo>
#include <QIODevice>
#include <algorithm>
#include <array>
#include <iostream>
#include <memory>
#include <samplerate.h>
#include <shared_mutex>
#include <sndfile.h>
#include <stdexcept>
#include <string>
#include "AudioEngine.h"
#include "DrumSynth.h"
#include "Engine.h"
#include "PathUtil.h"
namespace lmms {
SampleBuffer2::SampleBuffer2(const sampleFrame* data, int numFrames, int sampleRate)
: m_data(data, data + numFrames)
, m_sampleRate(sampleRate)
{
}
SampleBuffer2::SampleBuffer2(const QString& audioFile)
{
if (audioFile.isEmpty()) { throw std::runtime_error{"Failure loading audio file: Audio file path is empty."}; }
auto resolvedFileName = PathUtil::toAbsolute(PathUtil::toShortestRelative(audioFile));
QFileInfo{resolvedFileName}.suffix() == "ds" ? decodeSampleDS(resolvedFileName) : decodeSampleSF(resolvedFileName);
}
SampleBuffer2::SampleBuffer2(const QByteArray& base64Data, int sampleRate)
: m_data(reinterpret_cast<const sampleFrame*>(base64Data.data()),
reinterpret_cast<const sampleFrame*>(base64Data.data()) + base64Data.size() / sizeof(sampleFrame))
, m_sampleRate(sampleRate)
{
}
void swap(SampleBuffer2& first, SampleBuffer2& second) noexcept
{
using std::swap;
swap(first.m_data, second.m_data);
swap(first.m_audioFile, second.m_audioFile);
swap(first.m_sampleRate, second.m_sampleRate);
}
void SampleBuffer2::decodeSampleSF(const QString& audioFile)
{
SNDFILE* sndFile = nullptr;
auto sfInfo = SF_INFO{};
// Use QFile to handle unicode file names on Windows
auto file = QFile{audioFile};
if (!file.open(QIODevice::ReadOnly))
{
throw std::runtime_error{
"Failed to open sample " + audioFile.toStdString() + ": " + file.errorString().toStdString()};
}
sndFile = sf_open_fd(file.handle(), SFM_READ, &sfInfo, false);
if (sf_error(sndFile) != 0)
{
throw std::runtime_error{"Failure opening audio handle: " + std::string{sf_strerror(sndFile)}};
}
auto buf = std::vector<sample_t>(sfInfo.channels * sfInfo.frames);
sf_read_float(sndFile, buf.data(), buf.size());
sf_close(sndFile);
file.close();
auto result = std::vector<sampleFrame>(sfInfo.frames);
for (int i = 0; i < static_cast<int>(result.size()); ++i)
{
if (sfInfo.channels == 1)
{
// Upmix from mono to stereo
result[i] = {buf[i], buf[i]};
}
else if (sfInfo.channels > 1)
{
// TODO: Add support for higher number of channels (i.e., 5.1 channel systems)
// The current behavior assumes stereo in all cases excluding mono.
// This may not be the expected behavior, given some audio files with a higher number of channels.
result[i] = {buf[i * sfInfo.channels], buf[i * sfInfo.channels + 1]};
}
}
m_data = result;
m_audioFile = audioFile;
m_sampleRate = sfInfo.samplerate;
}
void SampleBuffer2::decodeSampleDS(const QString& audioFile)
{
auto data = std::unique_ptr<int_sample_t>{};
int_sample_t* dataPtr = nullptr;
auto ds = DrumSynth{};
const auto engineRate = Engine::audioEngine()->processingSampleRate();
const auto frames = ds.GetDSFileSamples(audioFile, dataPtr, DEFAULT_CHANNELS, engineRate);
data.reset(dataPtr);
auto result = std::vector<sampleFrame>(frames);
if (frames > 0 && data != nullptr)
{
src_short_to_float_array(data.get(), &result[0][0], frames * DEFAULT_CHANNELS);
}
else { throw std::runtime_error{"Decoding failure: failed to decode DrumSynth file."}; }
m_data = result;
m_audioFile = audioFile;
m_sampleRate = engineRate;
}
QString SampleBuffer2::toBase64() const
{
// TODO: Replace with non-Qt equivalent
const auto data = reinterpret_cast<const char*>(m_data.data());
const auto size = static_cast<int>(m_data.size() * sizeof(sampleFrame));
const auto byteArray = QByteArray{data, size};
return byteArray.toBase64();
}
auto SampleBuffer2::audioFile() const -> QString
{
return m_audioFile.value_or("");
}
auto SampleBuffer2::sampleRate() const -> sample_rate_t
{
return m_sampleRate;
}
auto SampleBuffer2::begin() const -> const_iterator
{
return m_data.begin();
}
auto SampleBuffer2::end() const -> const_iterator
{
return m_data.end();
}
auto SampleBuffer2::rbegin() const -> const_reverse_iterator
{
return m_data.rbegin();
}
auto SampleBuffer2::rend() const -> const_reverse_iterator
{
return m_data.rend();
}
auto SampleBuffer2::data() const -> const sampleFrame*
{
return m_data.data();
}
auto SampleBuffer2::size() const -> size_type
{
return m_data.size();
}
auto SampleBuffer2::empty() const -> bool
{
return m_data.empty();
}
} // namespace lmms

4
src/core/SampleClip.cpp
View File

@@ -125,10 +125,10 @@ QString SampleClip::sampleFile() const
void SampleClip::setSampleBuffer( SampleBuffer2* sb )
void SampleClip::setSampleBuffer( SampleBuffer* sb )
{
// TODO C++20: Deprecated, use std::atomic<std::shared_ptr> instead
auto buffer = std::shared_ptr<const SampleBuffer2>(sb);
auto buffer = std::shared_ptr<const SampleBuffer>(sb);
std::atomic_store(&m_sample, std::make_shared<Sample>(buffer));
updateLength();

6
src/core/SampleRecordHandle.cpp
View File

@@ -53,7 +53,7 @@ SampleRecordHandle::~SampleRecordHandle()
{
if( !m_buffers.empty() )
{
SampleBuffer2* sb;
SampleBuffer* sb;
createSampleBuffer( &sb );
m_clip->setSampleBuffer(sb);
}
@@ -111,7 +111,7 @@ f_cnt_t SampleRecordHandle::framesRecorded() const
void SampleRecordHandle::createSampleBuffer(SampleBuffer2** sampleBuf)
void SampleRecordHandle::createSampleBuffer(SampleBuffer** sampleBuf)
{
const f_cnt_t frames = framesRecorded();
// create buffer to store all recorded buffers in
@@ -130,7 +130,7 @@ void SampleRecordHandle::createSampleBuffer(SampleBuffer2** sampleBuf)
data_ptr += ( *it ).second;
}
// create according sample-buffer out of big buffer
*sampleBuf = new SampleBuffer2(data, frames, Engine::audioEngine()->inputSampleRate());
*sampleBuf = new SampleBuffer(data, frames, Engine::audioEngine()->inputSampleRate());
delete[] data;
}

6
src/core/audio/AudioSampleRecorder.cpp
View File

@@ -25,7 +25,7 @@
#include "AudioSampleRecorder.h"
#include "SampleBuffer2.h"
#include "SampleBuffer.h"
#include "debug.h"
@@ -70,7 +70,7 @@ f_cnt_t AudioSampleRecorder::framesRecorded() const
void AudioSampleRecorder::createSampleBuffer(SampleBuffer2** sampleBuf)
void AudioSampleRecorder::createSampleBuffer(SampleBuffer** sampleBuf)
{
const f_cnt_t frames = framesRecorded();
// create buffer to store all recorded buffers in
@@ -90,7 +90,7 @@ void AudioSampleRecorder::createSampleBuffer(SampleBuffer2** sampleBuf)
data_ptr += ( *it ).second;
}
// create according sample-buffer out of big buffer
*sampleBuf = new SampleBuffer2(data, frames, sampleRate());
*sampleBuf = new SampleBuffer(data, frames, sampleRate());
delete[] data;
}

2
src/gui/LfoControllerDialog.cpp
View File

@@ -216,7 +216,7 @@ void LfoControllerDialog::askUserDefWave()
auto buffer = SampleLoader::createBufferFromFile(fileName);
// TODO C++20: Deprecated, use std::atomic<std::shared_ptr> instead
std::atomic_store(&sampleBuffer, std::shared_ptr<const SampleBuffer2>(std::move(buffer)));
std::atomic_store(&sampleBuffer, std::shared_ptr<const SampleBuffer>(std::move(buffer)));
if( fileName.isEmpty() == false )
{

12
src/gui/SampleLoader.cpp
View File

@@ -86,29 +86,29 @@ QString SampleLoader::openWaveformFile(const QString& previousFile)
previousFile.isEmpty() ? ConfigManager::inst()->factorySamplesDir() + "waveforms/10saw.flac" : previousFile);
}
std::unique_ptr<SampleBuffer2> SampleLoader::createBufferFromFile(const QString& filePath)
std::unique_ptr<SampleBuffer> SampleLoader::createBufferFromFile(const QString& filePath)
{
try
{
return std::make_unique<SampleBuffer2>(filePath);
return std::make_unique<SampleBuffer>(filePath);
}
catch (const std::runtime_error& error)
{
displayError(QString::fromStdString(error.what()));
return std::make_unique<SampleBuffer2>();
return std::make_unique<SampleBuffer>();
}
}
std::unique_ptr<SampleBuffer2> SampleLoader::createBufferFromBase64(const QString& base64, int sampleRate)
std::unique_ptr<SampleBuffer> SampleLoader::createBufferFromBase64(const QString& base64, int sampleRate)
{
try
{
return std::make_unique<SampleBuffer2>(base64.toUtf8().toBase64(), sampleRate);
return std::make_unique<SampleBuffer>(base64.toUtf8().toBase64(), sampleRate);
}
catch (const std::runtime_error& error)
{
displayError(QString::fromStdString(error.what()));
return std::make_unique<SampleBuffer2>();
return std::make_unique<SampleBuffer>();
}
}

21
src/gui/instrument/EnvelopeAndLfoView.cpp
View File

@@ -28,6 +28,7 @@
#include "EnvelopeAndLfoView.h"
#include "EnvelopeAndLfoParameters.h"
#include "SampleLoader.h"
#include "embed.h"
#include "Engine.h"
#include "gui_templates.h"
@@ -322,8 +323,9 @@ void EnvelopeAndLfoView::dropEvent( QDropEvent * _de )
QString value = StringPairDrag::decodeValue( _de );
if( type == "samplefile" )
{
m_params->m_userWave.setAudioFile(
StringPairDrag::decodeValue( _de ) );
auto buffer = SampleLoader::createBufferFromFile(StringPairDrag::decodeValue(_de));
// TODO C++20: Deprecated, use std::atomic<std::shared_ptr> instead
std::atomic_store(&m_params->m_userWave, std::shared_ptr<const SampleBuffer>(std::move(buffer)));
m_userLfoBtn->model()->setValue( true );
m_params->m_lfoWaveModel.setValue(static_cast<int>(EnvelopeAndLfoParameters::LfoShape::UserDefinedWave));
_de->accept();
@@ -332,9 +334,12 @@ void EnvelopeAndLfoView::dropEvent( QDropEvent * _de )
else if( type == QString( "clip_%1" ).arg( static_cast<int>(Track::Type::Sample) ) )
{
DataFile dataFile( value.toUtf8() );
m_params->m_userWave.setAudioFile( dataFile.content().
auto file = dataFile.content().
firstChildElement().firstChildElement().
firstChildElement().attribute( "src" ) );
firstChildElement().attribute("src");
auto buffer = SampleLoader::createBufferFromFile(file);
// TODO C++20: Deprecated, use std::atomic<std::shared_ptr> instead
std::atomic_store(&m_params->m_userWave, std::shared_ptr<const SampleBuffer>(std::move(buffer)));
m_userLfoBtn->model()->setValue( true );
m_params->m_lfoWaveModel.setValue(static_cast<int>(EnvelopeAndLfoParameters::LfoShape::UserDefinedWave));
_de->accept();
@@ -446,8 +451,6 @@ void EnvelopeAndLfoView::paintEvent( QPaintEvent * )
osc_frames *= 100.0f;
}
// userWaveSample() may be used, called out of loop for efficiency
m_params->m_userWave.dataReadLock();
float old_y = 0;
for( int x = 0; x <= LFO_GRAPH_W; ++x )
{
@@ -483,8 +486,7 @@ void EnvelopeAndLfoView::paintEvent( QPaintEvent * )
val = m_randomGraph;
break;
case EnvelopeAndLfoParameters::LfoShape::UserDefinedWave:
val = m_params->m_userWave.
userWaveSample( phase );
val = Oscillator::userWaveSample(m_params->m_userWave.get(), phase);
break;
}
if( static_cast<f_cnt_t>( cur_sample ) <=
@@ -499,7 +501,6 @@ void EnvelopeAndLfoView::paintEvent( QPaintEvent * )
graph_y_base + cur_y ) );
old_y = cur_y;
}
m_params->m_userWave.dataUnlock();
p.setPen( QColor( 201, 201, 225 ) );
int ms_per_osc = static_cast<int>( SECS_PER_LFO_OSCILLATION *
@@ -520,7 +521,7 @@ void EnvelopeAndLfoView::lfoUserWaveChanged()
if( static_cast<EnvelopeAndLfoParameters::LfoShape>(m_params->m_lfoWaveModel.value()) ==
EnvelopeAndLfoParameters::LfoShape::UserDefinedWave )
{
if( m_params->m_userWave.frames() <= 1 )
if (m_params->m_userWave->size() <= 1)
{
TextFloat::displayMessage( tr( "Hint" ),
tr( "Drag and drop a sample into this window." ),

2
src/gui/widgets/Graph.cpp
View File

@@ -28,7 +28,7 @@
#include "Graph.h"
#include "SampleLoader.h"
#include "StringPairDrag.h"
#include "SampleBuffer2.h"
#include "SampleBuffer.h"
#include "Oscillator.h"
namespace lmms