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@1373 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-07-26 19:06:58 +00:00
parent 30756e7399
commit 1a2123f69d
12 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/base64.h
View File

@@ -51,6 +51,6 @@ namespace base64
QVariant decode( const QString & _b64,
QVariant::Type _force_type = QVariant::Invalid );
} ;
}
#endif

6
include/instrument_track.h
View File

@@ -180,9 +180,9 @@ private:
QList<notePlayHandle *> m_processHandles;
floatModel m_volumeModel;
floatModel m_panningModel;
floatModel m_pitchModel;
intModel m_volumeModel;
intModel m_panningModel;
intModel m_pitchModel;
intModel m_effectChannelModel;

13
include/lmms_math.h
View File

@@ -1,7 +1,7 @@
/*
* lmms_math.h - defines math functions
*
* Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -27,7 +27,17 @@
#define _LMMS_MATH_H
#ifdef __INTEL_COMPILER
#include <math.h>
// Equivalent to _x - floorf( _x )
static inline float fraction( const float _x )
{
return( _x - ( _x >= 0.0f ? floorf( _x ) : floorf( _x ) - 1 ) );
}
#else
// Equivalent to _x - floorf( _x )
static inline float fraction( const float _x )
@@ -36,6 +46,7 @@ static inline float fraction( const float _x )
static_cast<int>( _x ) - 1 ) );
}
#endif

2
include/midi.h
View File

@@ -58,7 +58,7 @@ enum MidiEventTypes
MidiActiveSensing = 0xFE,
MidiSystemReset = 0xFF,
// meta event - for midi files only
MidiMetaEvent = 0xFF,
MidiMetaEvent = 0xFF
} ;
enum MidiMetaEvents

12
include/serializing_object.h
View File

@@ -62,13 +62,13 @@ public:
protected:
// to be implemented by sub-objects
virtual void saveSettings( QDomDocument & _doc, QDomElement & _this )
{
}
virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
// {
// }
virtual void loadSettings( const QDomElement & _this )
{
}
virtual void loadSettings( const QDomElement & _this );
// {
// }
private: