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

Merge pull request #406 from softrabbit/stable-0.4

Browse Source 
Drumsynth: make rendering use mixer samplerate instead of hard coded 44100
This commit is contained in:
Tobias Doerffel
2014-03-04 23:39:14 +01:00
parent 8027decdb0 fed2c6b4ac
commit fcf5c054ac
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/drumsynth.h
View File

@@ -28,11 +28,12 @@
#define _DRUMSYNTH_H__
#include <stdint.h>
#include "lmms_basics.h"
class DrumSynth {
public:
DrumSynth() {};
int GetDSFileSamples(const char *dsfile, int16_t *&wave, int channels);
int GetDSFileSamples(const char *dsfile, int16_t *&wave, int channels, sample_rate_t Fs);
private:
float LoudestEnv(void);

2
src/core/SampleBuffer.cpp
View File

@@ -593,7 +593,7 @@ f_cnt_t SampleBuffer::decodeSampleDS( const char * _f,
sample_rate_t & _samplerate )
{
DrumSynth ds;
f_cnt_t frames = ds.GetDSFileSamples( _f, _buf, _channels );
f_cnt_t frames = ds.GetDSFileSamples( _f, _buf, _channels, _samplerate );
if ( frames > 0 && _buf != NULL )
{

4
src/core/drumsynth.cpp
View File

@@ -46,7 +46,7 @@ using namespace std;
#define DWORD __u32
#define WAVE_FORMAT_PCM 0x0001
const int Fs = 44100;
// const int Fs = 44100;
const float TwoPi = 6.2831853f;
const int MAX = 0;
const int ENV = 1;
@@ -255,7 +255,7 @@ float DrumSynth::GetPrivateProfileFloat(const char *sec, const char *key, float
// an associative array or something once we have a datastructure to load in to.
// llama
int DrumSynth::GetDSFileSamples(const char *dsfile, int16_t *&wave, int channels)
int DrumSynth::GetDSFileSamples(const char *dsfile, int16_t *&wave, int channels, sample_rate_t Fs)
{
//input file
char sec[32];