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

* fixed wrong config.h-inclusion and deprecated macro-names from config.h/lmmsconfig.h at various places - makes Vibed plugin work again

Browse Source 
* fixed plugin-instantiation for BitInvader and Vibed
* use int instead of Uint32 in graphModel
* various coding-style fixes



git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1170 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-06-24 22:21:31 +00:00
parent 21da0b432c
commit bdeac9eafe
14 changed files with 87 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/graph.h
View File

@@ -79,7 +79,7 @@ protected:
virtual void mouseReleaseEvent( QMouseEvent * _me );
protected slots:
void updateGraph( Uint32 _startPos, Uint32 _endPos );
void updateGraph( int _startPos, int _endPos );
void updateGraph( void );
private:
@@ -105,7 +105,7 @@ class EXPORT graphModel : public model
public:
graphModel( float _min,
float _max,
Uint32 _size,
int _size,
:: model * _parent,
bool _default_constructed = FALSE );
@@ -123,12 +123,12 @@ public:
return( m_maxValue );
}
inline Uint32 length( void ) const
inline int length( void ) const
{
return( m_samples.count() );
}
inline const float* samples( void ) const
inline const float * samples( void ) const
{
return( m_samples.data() );
}
@@ -136,9 +136,9 @@ public:
public slots:
void setRange( float _min, float _max );
void setLength( Uint32 _size );
void setLength( int _size );
void setSampleAt( Uint32 _samplePos, float _value );
void setSampleAt( int _samplePos, float _value );
void setSamples( const float * _value );
void setWaveToSine( void );
@@ -153,7 +153,7 @@ public slots:
signals:
void lengthChanged( void );
void samplesChanged( Uint32 startPos, Uint32 endPos );
void samplesChanged( int startPos, int endPos );
void rangeChanged( void );
private:

7
include/note_play_handle.h
View File

@@ -27,6 +27,7 @@
#ifndef _NOTE_PLAY_HANDLE_H
#define _NOTE_PLAY_HANDLE_H
#include "lmmsconfig.h"
#include "mixer.h"
#include "note.h"
#include "instrument.h"
@@ -55,7 +56,7 @@ public:
virtual ~notePlayHandle();
const float & frequency( void )
const float & frequency( void ) const
{
return( m_frequency );
}
@@ -250,7 +251,7 @@ public:
void processMidiTime( const midiTime & _time );
void resize( const bpm_t _new_bpm );
#if SINGERBOT_SUPPORT
#if LMMS_SINGERBOT_SUPPORT
int patternIndex( void )
{
return( m_patternIndex );
@@ -308,7 +309,7 @@ private:
// sub-note)
bool m_muted; // indicates whether note is muted
track * m_bbTrack; // related BB track
#if SINGERBOT_SUPPORT
#if LMMS_SINGERBOT_SUPPORT
int m_patternIndex; // position among relevant notes
#endif