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

* 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

plugins/audio_file_processor/audio_file_processor.cpp

@@ -114,7 +114,8 @@ void audioFileProcessor::playNote( notePlayHandle * _n, bool,
 						m_loopModel.value() ) == TRUE )
 	{
 		applyRelease( _working_buffer, _n );
-		getInstrumentTrack()->processAudioBuffer( _working_buffer, frames, _n );
+		getInstrumentTrack()->processAudioBuffer( _working_buffer,
+								frames,_n );
 	}
 }
 

plugins/bit_invader/bit_invader.cpp

@@ -161,8 +161,8 @@ bitInvader::bitInvader( instrumentTrack * _channel_track ) :
 			this, SLOT( lengthChanged( ) )
 			);
 
-	connect( &m_graph, SIGNAL( samplesChanged( Uint32, Uint32 ) ),
-			this, SLOT( samplesChanged( Uint32, Uint32 ) ) );
+	connect( &m_graph, SIGNAL( samplesChanged( int, int ) ),
+			this, SLOT( samplesChanged( int, int ) ) );
 
 }
 
@@ -234,7 +234,7 @@ void bitInvader::lengthChanged( void )
 }
 
 
-void bitInvader::samplesChanged( Uint32 _begin, Uint32 _end )
+void bitInvader::samplesChanged( int _begin, int _end )
 {
 	normalize();
 	//engine::getSongEditor()->setModified();
@@ -551,7 +551,7 @@ extern "C"
 {
 
 // neccessary for getting instance out of shared lib
-plugin * PLUGIN_EXPORT lmms_plugin_main( void * _data )
+plugin * PLUGIN_EXPORT lmms_plugin_main( model *, void * _data )
 {
 	return( new bitInvader( static_cast<instrumentTrack *>( _data ) ) );
 }

plugins/bit_invader/bit_invader.h

@@ -87,7 +87,7 @@ public:
 
 protected slots:
 	void lengthChanged( void );
-	void samplesChanged( Uint32, Uint32 );
+	void samplesChanged( int, int );
 
 	void normalize( void );
 

plugins/flp_import/flp_import.cpp

@@ -52,12 +52,9 @@
 #include "tempo_sync_knob.h"
 #include "track_container.h"
 #include "embed.h"
+#include "lmmsconfig.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_CTYPE_H
+#ifdef LMMS_HAVE_CTYPE_H
 #include <ctype.h>
 #endif
 

plugins/singerbot/singerbot.h

@@ -2,6 +2,8 @@
  * singerbot.h - declaration of class singerBot, a singing bot instrument plugin
  *
  * Copyright (c) 2007 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
+ * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -26,9 +28,7 @@
 #ifndef _SINGERBOT_H
 #define _SINGERBOT_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "lmmsconfig.h"
 
 #ifndef USE_3RDPARTY_LIBSRC
 #include <samplerate.h>
@@ -50,7 +50,7 @@ class singerBotView;
 
 class singerBot : public instrument
 {
-    Q_OBJECT
+	Q_OBJECT
 public:
 	singerBot( instrumentTrack * _track );
 	virtual ~singerBot();
@@ -69,7 +69,7 @@ public:
 	virtual pluginView * instantiateView( QWidget * _parent );
 
 	void setPlainText( const QString & _plain_text, bool _emitDataChanged = TRUE );
-    const QString & getPlainText();
+	const QString & getPlainText();
 
 private:
 	typedef struct
@@ -105,9 +105,9 @@ private:
 	void synth_read( handle_data * _hdata );
 
 	const char * addSuffix( const char * _s );
-    void showHandleData( handle_data * _hdata );
+	void showHandleData( handle_data * _hdata );
 
-    friend class singerBotView;
+	friend class singerBotView;
 
 } ;
 
@@ -123,10 +123,10 @@ public:
 
 public slots:
 	void viewTextChanged( void );
-    void modelTextChanged( void );
+	void modelTextChanged( void );
 
 private:
-    QTextEdit * m_lyrics;
+	QTextEdit * m_lyrics;
 
 } ;