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

Integrate changes into Graph

Browse Source
This commit is contained in:
sakertooth
2023-08-27 20:24:38 -04:00
parent d3ecea38f3
commit 253ce15416
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,8 +26,9 @@
#include <QPainter>
#include "Graph.h"
#include "SampleLoader.h"
#include "StringPairDrag.h"
#include "SampleBuffer.h"
#include "SampleBuffer2.h"
#include "Oscillator.h"
namespace lmms
@@ -588,21 +589,16 @@ void graphModel::setWaveToNoise()
QString graphModel::setWaveToUser()
{
auto sampleBuffer = new SampleBuffer;
QString fileName = sampleBuffer->openAndSetWaveformFile();
QString fileName = gui::SampleLoader::openWaveformFile();
if( fileName.isEmpty() == false )
{
sampleBuffer->dataReadLock();
auto sampleBuffer = gui::SampleLoader::createBufferFromFile(fileName);
for( int i = 0; i < length(); i++ )
{
m_samples[i] = sampleBuffer->userWaveSample(
i / static_cast<float>( length() ) );
m_samples[i] = Oscillator::userWaveSample(sampleBuffer.get(), i / static_cast<float>(length()));
}
sampleBuffer->dataUnlock();
}
sharedObject::unref( sampleBuffer );
emit samplesChanged( 0, length() - 1 );
return fileName;
};