less header-dependencies and moved some type-definitions

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1373 0778d3d1-df1d-0410-868b-ea421aaaa00d

CMakeLists.txt

@@ -304,7 +304,7 @@ ADD_FILE_DEPENDENCIES(lmmsconfig.h ${lmms_MOC_out})
 
 ADD_CUSTOM_COMMAND(OUTPUT ${ER_H} COMMAND ${BIN2RES} ARGS ${lmms_EMBEDDED_RESOURCES} > ${ER_H} DEPENDS ${BIN2RES})
 
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes -fno-exceptions ${CXXFLAGS}")
 IF(NOT WIN32)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 ENDIF(NOT WIN32)
@@ -416,3 +416,4 @@ SET(CPACK_PACKAGE_EXECUTABLES "lmms" "LMMS binary")
 SET(CPACK_SOURCE_GENERATOR "TBZ2")
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "lmms-${VERSION}")
 INCLUDE(CPack)
+

ChangeLog

@@ -1,4 +1,4 @@
-2008-07-25	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+2008-07-26	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* plugins/organic/organic.cpp:
 	* plugins/triple_oscillator/triple_oscillator.cpp:

cmake/modules/BuildPlugin.cmake

@@ -72,6 +72,7 @@ MACRO(BUILD_PLUGIN)
 	FOREACH(f ${PLUGIN_SOURCES})
 		ADD_FILE_DEPENDENCIES(${f} ${ER_H} ${plugin_MOC_out} ${plugin_UIC_out})
 	ENDFOREACH(f)
+#	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -i-static")
 	IF(LMMS_BUILD_WIN32)
 	        LINK_DIRECTORIES(${CMAKE_BINARY_DIR})
         	LINK_LIBRARIES(-llmms ${QT_LIBRARIES})

include/base64.h

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

include/instrument_track.h

@@ -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;
 
 

include/lmms_math.h

@@ -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
 
 
 

include/midi.h

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

include/serializing_object.h

@@ -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:

plugins/flp_import/CMakeLists.txt

@@ -2,4 +2,4 @@ INCLUDE(BuildPlugin)
 
 INCLUDE_DIRECTORIES(unrtf)
 
-BUILD_PLUGIN(flpimport flp_import.cpp flp_import.h MOCFILES EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png)
+BUILD_PLUGIN(flpimport flp_import.cpp flp_import.h)

plugins/stk/mallets/CMakeLists.txt

@@ -1,4 +1,5 @@
 INCLUDE(BuildPlugin)
 INCLUDE_DIRECTORIES(${STK_INCLUDE_DIR})
 LINK_LIBRARIES(${STK_LIBRARY})
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
 BUILD_PLUGIN(malletsstk mallets.cpp mallets.h MOCFILES mallets.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png)

src/core/serializing_object.cpp

@@ -76,3 +76,17 @@ void serializingObject::setHook( serializingObjectHook * _hook )
 }
 
 
+
+
+void serializingObject::saveSettings( QDomDocument & _doc, QDomElement & _this )
+{
+}
+
+
+
+
+void serializingObject::loadSettings( const QDomElement & _this )
+{
+}
+
+

src/tracks/instrument_track.cpp

@@ -101,11 +101,11 @@ instrumentTrack::instrumentTrack( trackContainer * _tc ) :
 								this, this ),
 	m_notes(),
 	m_baseNoteModel( 0, 0, KeysPerOctave * NumOctaves - 1, this ),
-        m_volumeModel( DefaultVolume, MinVolume, MaxVolume, 1.0f, this,
+        m_volumeModel( DefaultVolume, MinVolume, MaxVolume, this,
 							tr( "Volume" ) ),
-        m_panningModel( DefaultPanning, PanningLeft, PanningRight, 1.0f,
+        m_panningModel( DefaultPanning, PanningLeft, PanningRight,
 							this, tr( "Panning" ) ),
-	m_pitchModel( 0, -100, 100, 1, this, tr( "Pitch" ) ),
+	m_pitchModel( 0, -100, 100, this, tr( "Pitch" ) ),
 	m_effectChannelModel( 0, 0, NumFxChannels, this, tr( "FX channel" ) ),
 	m_instrument( NULL ),
 	m_soundShaping( this ),