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

less header-dependencies and moved some type-definitions

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1372 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-07-25 11:16:45 +00:00
parent fe55d0cdcc
commit 30756e7399
12 changed files with 78 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/mixer.h
View File

@@ -57,21 +57,6 @@ class audioPort;
const fpp_t DEFAULT_BUFFER_SIZE = 256;
const ch_cnt_t DEFAULT_CHANNELS = 2;
const ch_cnt_t SURROUND_CHANNELS =
#ifndef LMMS_DISABLE_SURROUND
4;
#else
2;
#endif
typedef sample_t sampleFrame[DEFAULT_CHANNELS];
typedef sample_t surroundSampleFrame[SURROUND_CHANNELS];
const Uint8 BYTES_PER_SAMPLE = sizeof( sample_t );
const Uint8 BYTES_PER_INT_SAMPLE = sizeof( int_sample_t );
const Uint8 BYTES_PER_FRAME = sizeof( sampleFrame );

17
include/oscillator.h
View File

@@ -28,15 +28,18 @@
#include "lmmsconfig.h"
#include <math.h>
#ifdef LMMS_HAVE_STDLIB_H
#include <stdlib.h>
#endif
#include "mixer.h"
#include "sample_buffer.h"
#include "lmms_constants.h"
#include "lmms_math.h"
#include "automatable_model.h"
class sampleBuffer;
class intModel;
class EXPORT oscillator
@@ -66,8 +69,8 @@ public:
} ;
oscillator( const intModel & _wave_shape_model,
const intModel & _mod_algo_model,
oscillator( const intModel * _wave_shape_model,
const intModel * _mod_algo_model,
const float & _freq,
const float & _detuning,
const float & _phase_offset,
@@ -154,8 +157,8 @@ public:
private:
const intModel & m_waveShapeModel;
const intModel & m_modulationAlgoModel;
const intModel * m_waveShapeModel;
const intModel * m_modulationAlgoModel;
const float & m_freq;
const float & m_detuning;
const float & m_volume;

6
include/sample_buffer.h
View File

@@ -29,7 +29,9 @@
#include <QtCore/QObject>
#include <QtCore/QRect>
#include "mixer.h"
#include <samplerate.h>
#include "export.h"
#include "interpolation.h"
#include "types.h"
#include "lmms_math.h"
@@ -72,7 +74,7 @@ public:
bool play( sampleFrame * _ab, handleState * _state,
const fpp_t _frames,
const float _freq = BaseFreq,
const float _freq,
const bool _looped = FALSE ) const;
void visualize( QPainter & _p, const QRect & _dr, const QRect & _clip );

16
include/types.h
View File

@@ -27,6 +27,7 @@
#define _TYPES_H
#include <limits>
#include "lmmsconfig.h"
typedef unsigned char Uint8;
typedef signed char Sint8;
@@ -74,4 +75,19 @@ struct valueRanges
} ;
const ch_cnt_t DEFAULT_CHANNELS = 2;
const ch_cnt_t SURROUND_CHANNELS =
#ifndef LMMS_DISABLE_SURROUND
4;
#else
2;
#endif
typedef sample_t sampleFrame[DEFAULT_CHANNELS];
typedef sample_t surroundSampleFrame[SURROUND_CHANNELS];
#endif