Merge remote-tracking branch 'origin/stable-1.1'

Conflicts:
	data/locale/de.qm
	data/locale/de.ts

CMakeLists.txt

@@ -15,7 +15,7 @@ INCLUDE(FindPkgConfig)
 
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "0")
-SET(VERSION_PATCH "90")
+SET(VERSION_PATCH "91")
 #SET(VERSION_SUFFIX "")
 SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 IF(VERSION_SUFFIX)
@@ -660,6 +660,8 @@ SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
 SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
   \\\${unregisterExtension} \\\".mmp\\\" \\\"LMMS Project\\\"
   \\\${unregisterExtension} \\\".mmpz\\\" \\\"LMMS Project (compressed)\\\"
+  DeleteRegKey HKCR \\\"LMMS Project\\\"
+  DeleteRegKey HKCR \\\"LMMS Project (compressed)\\\"
   ")
 ELSE(WIN32)
 SET(CPACK_STRIP_FILES "bin/lmms;${PLUGIN_DIR}/*.so")

data/themes/default/style.css

@@ -1,7 +1,9 @@
 /********************
  * LMMS style sheet *
  ********************/
-QLabel {
+ 
+/* most foreground text items */
+QLabel, QTreeWidget, QListWidget, QGroupBox {
 	color: #e0e0e0;
 }
 
@@ -15,6 +17,18 @@ QMdiArea {
 
 AutomationEditor {
 	background-color: rgb(0, 0, 0);
+	color: #e0e0e0;
+	qproperty-vertexColor: #ff77af;
+	qproperty-gridColor: #808080;
+	
+	qproperty-graphColor: qlineargradient(spread:reflect,
+                     x1:0, y1:0, x2:0, y2:1,
+                     stop:0 rgba(153, 175, 255, 250),  stop:1 rgba(153, 175, 255, 100));
+	/*#99afff;*/
+	qproperty-scaleColor: qlineargradient(spread:reflect,
+                     x1:0, y1:0.5, x2:1, y2:0.5,
+                     stop:0 #333, stop:1 #202020);
+	/*rgb( 32, 32, 32 );*/
 }
 
 /* text box */
@@ -95,6 +109,10 @@ QMenu::indicator:selected {
 
 PianoRoll {
 	background-color: rgb(0, 0, 0);
+	qproperty-gridColor: rgb( 128, 128, 128 );
+	qproperty-noteModeColor: rgb( 255, 255, 255 );
+	qproperty-noteColor: rgb( 119, 199, 216 );
+	qproperty-barColor: #4afd85;
 }
 
 /* main toolbar oscilloscope - can have transparent bg now */
@@ -250,13 +268,10 @@ nStateButton {
 
 /* track background colors */
 trackContentWidget {
-	qproperty-darkerColor1: rgb( 50, 50, 50 );
-	qproperty-darkerColor2: rgb( 20, 20, 20 );
-	qproperty-darkerColor3: rgb( 15, 15, 15 );
-	qproperty-lighterColor1: rgb( 50, 50, 50 );
-	qproperty-lighterColor2: rgb( 40, 40, 40 );
-	qproperty-lighterColor3: rgb( 30, 30, 30 );
-	qproperty-gradMidPoint: 0.33;
+	qproperty-darkerColor: qlineargradient(x1:0, y1:0, x2:0, y2:1, 
+							stop:0 rgb( 50, 50, 50 ), stop:0.33 rgb( 20, 20, 20 ), stop:1 rgb( 15, 15, 15 ) );
+	qproperty-lighterColor: qlineargradient(x1:0, y1:0, x2:0, y2:1, 
+							stop:0 rgb( 50, 50, 50 ), stop:0.33 rgb( 40, 40, 40 ), stop:1 rgb( 30, 30, 30 ) );
 }
 
 
@@ -469,6 +484,19 @@ FxMixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushBut
 	font-size: 10px;
 }
 
+FxLine {
+	background: #5b6571;
+	color: #e0e0e0;
+	qproperty-backgroundActive: qlineargradient(spread:reflect, x1:0, y1:0, x2:1, y2:0, 
+								stop:0 #7b838d, stop:1 #6b7581 );
+}
+
+/* persistent peak markers for fx peak meters */
+fader {
+	qproperty-peakGreen: rgb( 74, 253, 133);
+	qproperty-peakRed: rgb( 255, 100, 100);
+}
+
 timeLine {
 	font-size: 8px;
 }
@@ -507,6 +535,7 @@ AutomationPatternView {
 
 /* bb-pattern */
 bbTCOView {
+	color: rgb( 128, 182, 175 ); /* default colour for bb-tracks, used when the colour hasn't been defined by the user */
 	qproperty-textColor: rgb( 255, 255, 255 );
 }
 

include/AutomationEditor.h

@@ -1,9 +1,9 @@
 /*
  * AutomationEditor.h - declaration of class AutomationEditor which is a window
- *                      where you can edit dynamic values in an easy way
+ *					  where you can edit dynamic values in an easy way
  *
  * Copyright (c) 2006-2008 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
- * 
+ *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _AUTOMATION_EDITOR_H
-#define _AUTOMATION_EDITOR_H
+#ifndef AUTOMATION_EDITOR_H
+#define AUTOMATION_EDITOR_H
 
 #include <QtCore/QMutex>
 #include <QtGui/QWidget>
@@ -50,6 +50,10 @@ class toolButton;
 class AutomationEditor : public QWidget, public JournallingObject
 {
 	Q_OBJECT
+	Q_PROPERTY( QColor gridColor READ gridColor WRITE setGridColor )
+	Q_PROPERTY( QColor vertexColor READ vertexColor WRITE setVertexColor )
+	Q_PROPERTY( QBrush scaleColor READ scaleColor WRITE setScaleColor )
+	Q_PROPERTY( QBrush graphColor READ graphColor WRITE setGraphColor )	
 public:
 	void setCurrentPattern( AutomationPattern * _new_pattern );
 
@@ -75,6 +79,15 @@ public:
 
 	void setPauseIcon( bool pause );
 
+	// qproperty access methods
+	QColor gridColor() const;
+	QBrush graphColor() const;
+	QColor vertexColor() const;
+	QBrush scaleColor() const;
+	void setGridColor( const QColor & c );
+	void setGraphColor( const QBrush & c );
+	void setVertexColor( const QColor & c );
+	void setScaleColor( const QBrush & c );
 
 public slots:
 	void update();
@@ -252,7 +265,10 @@ private:
 	void drawAutomationPoint( QPainter & p, timeMap::iterator it );
 	bool inBBEditor();
 
-
+	QColor m_gridColor;
+	QBrush m_graphColor;
+	QColor m_vertexColor;
+	QBrush m_scaleColor;
 
 	friend class engine;
 

include/FxLine.h

@@ -40,6 +40,7 @@ class FxLine : public QWidget
 {
 	Q_OBJECT
 public:
+	Q_PROPERTY( QBrush backgroundActive READ backgroundActive WRITE setBackgroundActive )
 	FxLine( QWidget * _parent, FxMixerView * _mv, int _channelIndex);
 	~FxLine();
 
@@ -54,10 +55,16 @@ public:
 	knob * m_sendKnob;
 	SendButtonIndicator * m_sendBtn;
 
+	QBrush backgroundActive() const;
+	void setBackgroundActive( const QBrush & c );
+
+	static const int FxLineHeight;
+
 private:
 	FxMixerView * m_mv;
 	LcdWidget* m_lcd;
 	int m_channelIndex;
+	QBrush m_backgroundActive;
 
 private slots:
 	void renameChannel();

include/FxMixer.h

@@ -140,6 +140,7 @@ private:
 
 	// make sure we have at least num channels
 	void allocateChannelsTo(int num);
+	QMutex m_sendsMutex;
 
 	void addChannelLeaf( int _ch, sampleFrame * _buf );
 

include/FxMixerView.h

@@ -22,11 +22,12 @@
  *
  */
 
-#ifndef _FX_MIXER_VIEW_H
-#define _FX_MIXER_VIEW_H
+#ifndef FX_MIXER_VIEW_H
+#define FX_MIXER_VIEW_H
 
 #include <QtGui/QWidget>
 #include <QtGui/QHBoxLayout>
+#include <QtGui/QStackedLayout>
 #include <QtGui/QScrollArea>
 
 #include "FxLine.h"
@@ -54,6 +55,7 @@ public:
 		FxLine * m_fxLine;
 		pixmapButton * m_muteBtn;
 		fader * m_fader;
+		EffectRackView * m_rackView;
 	};
 
 
@@ -94,7 +96,7 @@ public:
 	// make sure the display syncs up with the fx mixer.
 	// useful for loading projects
 	void refreshDisplay();
-
+	
 private slots:
 	void updateFaders();
 	void addNewChannel();
@@ -108,9 +110,12 @@ private:
 	QScrollArea * channelArea;
 	QHBoxLayout * chLayout;
 	QWidget * m_channelAreaWidget;
-	EffectRackView * m_rackView;
+	QStackedLayout * m_racksLayout;
+	QWidget * m_racksWidget;
 
 	void updateMaxChannelSelector();
+	
+	friend class FxChannelView;
 } ;
 
 #endif

include/Instrument.h

@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _INSTRUMENT_H
-#define _INSTRUMENT_H
+#ifndef INSTRUMENT_H
+#define INSTRUMENT_H
 
 #include <QtGui/QWidget>
 
@@ -101,7 +101,7 @@ public:
 
 	// sub-classes can re-implement this for receiving all incoming
 	// MIDI-events
-	inline virtual bool handleMidiEvent( const MidiEvent&, const MidiTime& = MidiTime() )
+	inline virtual bool handleMidiEvent( const MidiEvent&, const MidiTime& = MidiTime(), f_cnt_t offset = 0 )
 	{
 		return true;
 	}
@@ -119,13 +119,13 @@ public:
 
 	virtual bool isFromTrack( const track * _track ) const;
 
-
-protected:
 	inline InstrumentTrack * instrumentTrack() const
 	{
 		return m_instrumentTrack;
 	}
 
+
+protected:
 	// instruments may use this to apply a soft fade out at the end of
 	// notes - method does this only if really less or equal
 	// desiredReleaseFrames() frames are left

include/InstrumentPlayHandle.h

@@ -22,11 +22,12 @@
  *
  */
 
-#ifndef _INSTRUMENT_PLAY_HANDLE_H
-#define _INSTRUMENT_PLAY_HANDLE_H
+#ifndef INSTRUMENT_PLAY_HANDLE_H
+#define INSTRUMENT_PLAY_HANDLE_H
 
 #include "PlayHandle.h"
 #include "Instrument.h"
+#include "NotePlayHandle.h"
 
 
 class InstrumentPlayHandle : public PlayHandle
@@ -45,6 +46,32 @@ public:
 
 	virtual void play( sampleFrame * _working_buffer )
 	{
+		// if the instrument is midi-based, we can safely render right away
+		if( m_instrument->flags() & Instrument::IsMidiBased )
+		{
+			m_instrument->play( _working_buffer );
+			return;
+		}
+		
+		// if not, we need to ensure that all our nph's have been processed first
+		ConstNotePlayHandleList nphv = NotePlayHandle::nphsOfInstrumentTrack( m_instrument->instrumentTrack(), true );
+		
+		bool nphsLeft;
+		do
+		{
+			nphsLeft = false;
+			foreach( const NotePlayHandle * cnph, nphv )
+			{
+				NotePlayHandle * nph = const_cast<NotePlayHandle *>( cnph );
+				if( nph->state() != ThreadableJob::Done && ! nph->isFinished() )
+				{
+					nphsLeft = true;
+					nph->process();
+				}
+			}
+		}
+		while( nphsLeft );
+		
 		m_instrument->play( _working_buffer );
 	}
 

include/InstrumentTrack.h

@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _INSTRUMENT_TRACK_H
-#define _INSTRUMENT_TRACK_H
+#ifndef INSTRUMENT_TRACK_H
+#define INSTRUMENT_TRACK_H
 
 #include "AudioPort.h"
 #include "InstrumentFunctions.h"
@@ -71,10 +71,10 @@ public:
 
 	MidiEvent applyMasterKey( const MidiEvent& event );
 
-	virtual void processInEvent( const MidiEvent& event, const MidiTime& time = MidiTime() );
-	virtual void processOutEvent( const MidiEvent& event, const MidiTime& time = MidiTime() );
+	virtual void processInEvent( const MidiEvent& event, const MidiTime& time = MidiTime(), f_cnt_t offset = 0 );
+	virtual void processOutEvent( const MidiEvent& event, const MidiTime& time = MidiTime(), f_cnt_t offset = 0 );
 	// silence all running notes played by this track
-	void silenceAllNotes();
+	void silenceAllNotes( bool removeIPH = false );
 
 	bool isSustainPedalPressed() const
 	{
@@ -160,6 +160,8 @@ public:
 	{
 		return &m_baseNoteModel;
 	}
+	
+	int baseNote() const;
 
 	Piano *pianoModel()
 	{

include/MidiController.h

@@ -44,10 +44,10 @@ public:
 	virtual ~MidiController();
 
 	virtual void processInEvent( const MidiEvent & _me,
-					const MidiTime & _time );
+					const MidiTime & _time, f_cnt_t offset = 0 );
 
 	virtual void processOutEvent( const MidiEvent& _me,
-					const MidiTime & _time)
+					const MidiTime & _time, f_cnt_t offset = 0 )
 	{
 		// No output yet
 	}

include/MidiEventProcessor.h

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _MIDI_EVENT_PROCESSOR_H
-#define _MIDI_EVENT_PROCESSOR_H
+#ifndef MIDI_EVENT_PROCESSOR_H
+#define MIDI_EVENT_PROCESSOR_H
 
 #include "MidiEvent.h"
 #include "MidiTime.h"
@@ -42,8 +42,8 @@ public:
 	}
 
 	// to be implemented by inheriting classes
-	virtual void processInEvent( const MidiEvent& event, const MidiTime& time = MidiTime() ) = 0;
-	virtual void processOutEvent( const MidiEvent& event, const MidiTime& time = MidiTime() ) = 0;
+	virtual void processInEvent( const MidiEvent& event, const MidiTime& time = MidiTime(), f_cnt_t offset = 0 ) = 0;
+	virtual void processOutEvent( const MidiEvent& event, const MidiTime& time = MidiTime(), f_cnt_t offset = 0 ) = 0;
 
 } ;
 

include/Mixer.h

@@ -229,7 +229,7 @@ public:
 		return m_playHandles;
 	}
 
-	void removePlayHandles( track * _track );
+	void removePlayHandles( track * _track, bool removeIPHs = true );
 
 	bool hasNotePlayHandles();
 

include/NotePlayHandle.h

@@ -94,7 +94,7 @@ public:
 	/*! Returns whether playback of note is finished and thus handle can be deleted */
 	virtual bool isFinished() const
 	{
-		return m_released && framesLeft() <= 0;
+		return m_released && framesLeft() <= 0 && m_scheduledNoteOff < 0;
 	}
 
 	/*! Returns number of frames left for playback */
@@ -264,6 +264,7 @@ private:
 											// played after release
 	f_cnt_t m_releaseFramesDone;			// number of frames done after
 											// release of note
+	f_cnt_t m_scheduledNoteOff;			// variable for scheduling noteoff at next period
 	NotePlayHandleList m_subNotes;			// used for chords and arpeggios
 	volatile bool m_released;				// indicates whether note is released
 	bool m_hasParent;

include/PianoRoll.h

@@ -53,6 +53,10 @@ class toolButton;
 class PianoRoll : public QWidget, public SerializingObject
 {
 	Q_OBJECT
+	Q_PROPERTY( QColor gridColor READ gridColor WRITE setGridColor )
+	Q_PROPERTY( QColor noteModeColor READ noteModeColor WRITE setNoteModeColor )
+	Q_PROPERTY( QColor noteColor READ noteColor WRITE setNoteColor )
+	Q_PROPERTY( QColor barColor READ barColor WRITE setBarColor )
 public:
 	/*! \brief Resets settings to default when e.g. creating a new project */
 	void reset();
@@ -93,7 +97,16 @@ public:
 	}
 
 	void setPauseIcon( bool pause );
-
+	
+	// qproperty acces functions
+	QColor gridColor() const;
+	void setGridColor( const QColor & _c );
+	QColor noteModeColor() const;
+	void setNoteModeColor( const QColor & _c );
+	QColor noteColor() const;
+	void setNoteColor( const QColor & _c );
+	QColor barColor() const;
+	void setBarColor( const QColor & _c );
 
 protected:
 	virtual void closeEvent( QCloseEvent * _ce );
@@ -110,7 +123,7 @@ protected:
 
 	int getKey( int _y ) const;
 	static inline void drawNoteRect( QPainter & _p, int _x, int _y,
-					int  _width, note * _n );
+					int  _width, note * _n, const QColor & noteCol );
 	void removeSelection();
 	void selectAll();
 	void getSelectedNotes( NoteVector & _selected_notes );
@@ -352,6 +365,11 @@ private:
 
 	friend class engine;
 
+	// qproperty fields
+	QColor m_gridColor;
+	QColor m_noteModeColor;
+	QColor m_noteColor;
+	QColor m_barColor;
 
 signals:
 	void positionChanged( const MidiTime & );

include/RemotePlugin.h

@@ -52,7 +52,7 @@
 #include <process.h>
 #endif
 
-#include <Qt/qglobal.h>
+#include <QtCore/QtGlobal>
 
 #if QT_VERSION >= 0x040400
 #include <QtCore/QSystemSemaphore>
@@ -75,7 +75,7 @@
 
 #ifdef USE_QT_SHMEM
 
-#include <Qt/qglobal.h>
+#include <QtCore/QtGlobal>
 
 #if QT_VERSION >= 0x040400
 #include <QtCore/QSharedMemory>

include/SendButtonIndicator.h

@@ -11,22 +11,23 @@
 class FxLine;
 class FxMixerView;
 
-class SendButtonIndicator : public QLabel {
-	public:
-		SendButtonIndicator( QWidget * _parent, FxLine * _owner,
-							 FxMixerView * _mv);
+class SendButtonIndicator : public QLabel 
+{
+public:
+	SendButtonIndicator( QWidget * _parent, FxLine * _owner,
+						 FxMixerView * _mv);
 
-		virtual void mousePressEvent( QMouseEvent * e );
-		void updateLightStatus();
+	virtual void mousePressEvent( QMouseEvent * e );
+	void updateLightStatus();
 
-	private:
+private:
 
-		FxLine * m_parent;
-		FxMixerView * m_mv;
-		QPixmap qpmOn;
-		QPixmap qpmOff;
+	FxLine * m_parent;
+	FxMixerView * m_mv;
+	static QPixmap * s_qpmOn;
+	static QPixmap * s_qpmOff;
 
-		FloatModel * getSendModel();
+	FloatModel * getSendModel();
 };
 
 #endif // SENDBUTTONINDICATOR_H

include/bb_track.h

@@ -39,7 +39,7 @@ class TrackContainer;
 class bbTCO : public trackContentObject
 {
 public:
-	bbTCO( track * _track, unsigned int _color = 0 );
+	bbTCO( track * _track );
 	virtual ~bbTCO();
 
 	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
@@ -49,13 +49,24 @@ public:
 		return( "bbtco" );
 	}
 
-	inline unsigned int color() const
+	unsigned int color() const
 	{
-		return( m_color );
+		return( m_color.rgb() );
 	}
-	inline static unsigned int defaultColor()
+	
+	QColor colorObj() const
 	{
-		return qRgb( 128, 182, 175 );
+		return m_color;
+	}
+
+	void setColor( const QColor & c )
+	{
+		m_color = QColor( c );
+	}
+
+	void setUseStyleColor( bool b )
+	{
+		m_useStyleColor = b;
 	}
 
 	int bbTrackIndex();
@@ -63,7 +74,8 @@ public:
 	virtual trackContentObjectView * createView( trackView * _tv );
 
 private:
-	unsigned int m_color;
+	QColor m_color;
+	bool m_useStyleColor;
 
 
 	friend class bbTCOView;
@@ -91,6 +103,7 @@ protected slots:
 	void resetName();
 	void changeName();
 	void changeColor();
+	void resetColor();
 
 
 protected:
@@ -144,6 +157,26 @@ public:
 		m_disabledTracks.removeAll( _track );
 	}
 
+	static void setLastTCOColor( const QColor & c )
+	{
+		if( ! s_lastTCOColor )
+		{
+			s_lastTCOColor = new QColor( c );
+		}
+		else
+		{
+			*s_lastTCOColor = QColor( c );
+		}
+	}
+	
+	static void clearLastTCOColor()
+	{
+		if( s_lastTCOColor )
+		{
+			delete s_lastTCOColor;
+		}
+		s_lastTCOColor = NULL;
+	}
 
 protected:
 	inline virtual QString nodeName() const
@@ -158,6 +191,7 @@ private:
 	typedef QMap<bbTrack *, int> infoMap;
 	static infoMap s_infoMap;
 
+	static QColor * s_lastTCOColor;
 
 	friend class bbTrackView;
 

include/fader.h

@@ -45,8 +45,8 @@
  */
 
 
-#ifndef _FADER_H
-#define _FADER_H
+#ifndef FADER_H
+#define FADER_H
 
 #include <QtCore/QTime>
 #include <QtGui/QWidget>
@@ -61,6 +61,8 @@ class fader : public QWidget, public FloatModelView
 {
 	Q_OBJECT
 public:
+	Q_PROPERTY( QColor peakGreen READ peakGreen WRITE setPeakGreen )
+	Q_PROPERTY( QColor peakRed READ peakRed WRITE setPeakRed )
 	fader( FloatModel * _model, const QString & _name, QWidget * _parent );
 	virtual ~fader();
 
@@ -70,6 +72,10 @@ public:
 	void setPeak_R( float fPeak );
 	float getPeak_R() {	return m_fPeakValue_R;	}
 
+	QColor peakGreen() const;
+	QColor peakRed() const;
+	void setPeakGreen( const QColor & c );
+	void setPeakRed( const QColor & c );
 
 private:
 	virtual void contextMenuEvent( QContextMenuEvent * _me );
@@ -85,7 +91,7 @@ private:
 		float fRange = m_model->maxValue() - m_model->minValue();
 		float realVal = m_model->value() - m_model->minValue();
 
-		return height() - ( ( height() - m_knob.height() ) * ( realVal / fRange ) );
+		return height() - ( ( height() - ( *s_knob ).height() ) * ( realVal / fRange ) );
 	}
 
 	FloatModel * m_model;
@@ -103,9 +109,9 @@ private:
 	QTime m_lastPeakTime_L;
 	QTime m_lastPeakTime_R;
 
-	QPixmap m_back;
-	QPixmap m_leds;
-	QPixmap m_knob;
+	static QPixmap * s_back;
+	static QPixmap * s_leds;
+	static QPixmap * s_knob;
 
 	int m_moveStartPoint;
 	float m_startValue;
@@ -113,6 +119,8 @@ private:
 	static textFloat * s_textFloat;
 	void updateTextFloat();
 
+	QColor m_peakGreen;
+	QColor m_peakRed;
 } ;
 
 

include/track.h

@@ -278,15 +278,8 @@ class trackContentWidget : public QWidget, public JournallingObject
 	Q_OBJECT
 
 	// qproperties for track background gradients
-	Q_PROPERTY( QColor darkerColor1 READ darkerColor1 WRITE setDarkerColor1 )
-	Q_PROPERTY( QColor darkerColor2 READ darkerColor2 WRITE setDarkerColor2 )
-	Q_PROPERTY( QColor darkerColor3 READ darkerColor3 WRITE setDarkerColor3 )
-
-	Q_PROPERTY( QColor lighterColor1 READ lighterColor1 WRITE setLighterColor1 )
-	Q_PROPERTY( QColor lighterColor2 READ lighterColor2 WRITE setLighterColor2 )
-	Q_PROPERTY( QColor lighterColor3 READ lighterColor3 WRITE setLighterColor3 )
-
-	Q_PROPERTY( float gradMidPoint READ gradMidPoint WRITE setGradMidPoint )
+	Q_PROPERTY( QBrush darkerColor READ darkerColor WRITE setDarkerColor )
+	Q_PROPERTY( QBrush lighterColor READ lighterColor WRITE setLighterColor )
 
 public:
 	trackContentWidget( trackView * _parent );
@@ -312,25 +305,11 @@ public:
 
 	// qproperty access methods
 
-	QColor darkerColor1() const;
-	QColor darkerColor2() const;
-	QColor darkerColor3() const;
+	QBrush darkerColor() const;
+	QBrush lighterColor() const;
 
-	QColor lighterColor1() const;
-	QColor lighterColor2() const;
-	QColor lighterColor3() const;
-
-	float gradMidPoint() const;
-
-	void setDarkerColor1( const QColor & _c );
-	void setDarkerColor2( const QColor & _c );
-	void setDarkerColor3( const QColor & _c );
-
-	void setLighterColor1( const QColor & _c );
-	void setLighterColor2( const QColor & _c );
-	void setLighterColor3( const QColor & _c );
-
-	void setGradMidPoint( float _g );
+	void setDarkerColor( const QBrush & _c );
+	void setLighterColor( const QBrush & _c );
 
 public slots:
 	void update();
@@ -373,13 +352,8 @@ private:
 	QPixmap m_background;
 
 	// qproperty fields
-	QColor m_darkerColor1;
-	QColor m_darkerColor2;
-	QColor m_darkerColor3;
-	QColor m_lighterColor1;
-	QColor m_lighterColor2;
-	QColor m_lighterColor3;
-	float m_gradMidPoint;
+	QBrush m_darkerColor;
+	QBrush m_lighterColor;
 } ;
 
 

plugins/LadspaEffect/swh/alias_1407.c

@@ -240,7 +240,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (aliasDescriptor) {
 		free((LADSPA_PortDescriptor *)aliasDescriptor->PortDescriptors);
 		free((char **)aliasDescriptor->PortNames);

plugins/LadspaEffect/swh/allpass_1895.c

@@ -1346,7 +1346,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (allpass_nDescriptor) {
 		free((LADSPA_PortDescriptor *)allpass_nDescriptor->PortDescriptors);
 		free((char **)allpass_nDescriptor->PortNames);

plugins/LadspaEffect/swh/am_pitchshift_1433.c

@@ -455,7 +455,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (amPitchshiftDescriptor) {
 		free((LADSPA_PortDescriptor *)amPitchshiftDescriptor->PortDescriptors);
 		free((char **)amPitchshiftDescriptor->PortNames);

plugins/LadspaEffect/swh/amp_1181.c

@@ -233,7 +233,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (ampDescriptor) {
 		free((LADSPA_PortDescriptor *)ampDescriptor->PortDescriptors);
 		free((char **)ampDescriptor->PortNames);

plugins/LadspaEffect/swh/bandpass_a_iir_1893.c

@@ -277,7 +277,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (bandpass_a_iirDescriptor) {
 		free((LADSPA_PortDescriptor *)bandpass_a_iirDescriptor->PortDescriptors);
 		free((char **)bandpass_a_iirDescriptor->PortNames);

plugins/LadspaEffect/swh/bandpass_iir_1892.c

@@ -343,7 +343,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (bandpass_iirDescriptor) {
 		free((LADSPA_PortDescriptor *)bandpass_iirDescriptor->PortDescriptors);
 		free((char **)bandpass_iirDescriptor->PortNames);

plugins/LadspaEffect/swh/bode_shifter_1431.c

@@ -458,7 +458,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (bodeShifterDescriptor) {
 		free((LADSPA_PortDescriptor *)bodeShifterDescriptor->PortDescriptors);
 		free((char **)bodeShifterDescriptor->PortNames);

plugins/LadspaEffect/swh/bode_shifter_cv_1432.c

@@ -523,7 +523,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (bodeShifterCVDescriptor) {
 		free((LADSPA_PortDescriptor *)bodeShifterCVDescriptor->PortDescriptors);
 		free((char **)bodeShifterCVDescriptor->PortNames);

plugins/LadspaEffect/swh/butterworth_1902.c

@@ -741,7 +741,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (bwxover_iirDescriptor) {
 		free((LADSPA_PortDescriptor *)bwxover_iirDescriptor->PortDescriptors);
 		free((char **)bwxover_iirDescriptor->PortNames);

plugins/LadspaEffect/swh/chebstortion_1430.c

@@ -399,7 +399,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (chebstortionDescriptor) {
 		free((LADSPA_PortDescriptor *)chebstortionDescriptor->PortDescriptors);
 		free((char **)chebstortionDescriptor->PortNames);

plugins/LadspaEffect/swh/comb_1190.c

@@ -340,7 +340,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (combDescriptor) {
 		free((LADSPA_PortDescriptor *)combDescriptor->PortDescriptors);
 		free((char **)combDescriptor->PortNames);

plugins/LadspaEffect/swh/comb_1887.c

@@ -1352,7 +1352,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (comb_nDescriptor) {
 		free((LADSPA_PortDescriptor *)comb_nDescriptor->PortDescriptors);
 		free((char **)comb_nDescriptor->PortNames);

plugins/LadspaEffect/swh/comb_splitter_1411.c

@@ -341,7 +341,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (combSplitterDescriptor) {
 		free((LADSPA_PortDescriptor *)combSplitterDescriptor->PortDescriptors);
 		free((char **)combSplitterDescriptor->PortNames);

plugins/LadspaEffect/swh/const_1909.c

@@ -250,7 +250,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (constDescriptor) {
 		free((LADSPA_PortDescriptor *)constDescriptor->PortDescriptors);
 		free((char **)constDescriptor->PortNames);

plugins/LadspaEffect/swh/crossover_dist_1404.c

@@ -276,7 +276,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (crossoverDistDescriptor) {
 		free((LADSPA_PortDescriptor *)crossoverDistDescriptor->PortDescriptors);
 		free((char **)crossoverDistDescriptor->PortNames);

plugins/LadspaEffect/swh/dc_remove_1207.c

@@ -235,7 +235,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (dcRemoveDescriptor) {
 		free((LADSPA_PortDescriptor *)dcRemoveDescriptor->PortDescriptors);
 		free((char **)dcRemoveDescriptor->PortNames);

plugins/LadspaEffect/swh/decay_1886.c

@@ -325,7 +325,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (decayDescriptor) {
 		free((LADSPA_PortDescriptor *)decayDescriptor->PortDescriptors);
 		free((char **)decayDescriptor->PortNames);

plugins/LadspaEffect/swh/decimator_1202.c

@@ -335,7 +335,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (decimatorDescriptor) {
 		free((LADSPA_PortDescriptor *)decimatorDescriptor->PortDescriptors);
 		free((char **)decimatorDescriptor->PortNames);

plugins/LadspaEffect/swh/declip_1195.c

@@ -235,7 +235,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (declipDescriptor) {
 		free((LADSPA_PortDescriptor *)declipDescriptor->PortDescriptors);
 		free((char **)declipDescriptor->PortNames);

plugins/LadspaEffect/swh/delay_1898.c

@@ -1093,7 +1093,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (delay_nDescriptor) {
 		free((LADSPA_PortDescriptor *)delay_nDescriptor->PortDescriptors);
 		free((char **)delay_nDescriptor->PortNames);

plugins/LadspaEffect/swh/delayorama_1402.c

@@ -847,7 +847,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (delayoramaDescriptor) {
 		free((LADSPA_PortDescriptor *)delayoramaDescriptor->PortDescriptors);
 		free((char **)delayoramaDescriptor->PortNames);

plugins/LadspaEffect/swh/diode_1185.c

@@ -264,7 +264,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (diodeDescriptor) {
 		free((LADSPA_PortDescriptor *)diodeDescriptor->PortDescriptors);
 		free((char **)diodeDescriptor->PortNames);

plugins/LadspaEffect/swh/divider_1186.c

@@ -331,7 +331,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (dividerDescriptor) {
 		free((LADSPA_PortDescriptor *)dividerDescriptor->PortDescriptors);
 		free((char **)dividerDescriptor->PortNames);

plugins/LadspaEffect/swh/dj_eq_1901.c

@@ -674,7 +674,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (dj_eq_monoDescriptor) {
 		free((LADSPA_PortDescriptor *)dj_eq_monoDescriptor->PortDescriptors);
 		free((char **)dj_eq_monoDescriptor->PortNames);

plugins/LadspaEffect/swh/dj_flanger_1438.c

@@ -472,7 +472,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (djFlangerDescriptor) {
 		free((LADSPA_PortDescriptor *)djFlangerDescriptor->PortDescriptors);
 		free((char **)djFlangerDescriptor->PortNames);

plugins/LadspaEffect/swh/dyson_compress_1403.c

@@ -885,7 +885,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (dysonCompressDescriptor) {
 		free((LADSPA_PortDescriptor *)dysonCompressDescriptor->PortDescriptors);
 		free((char **)dysonCompressDescriptor->PortNames);

plugins/LadspaEffect/swh/fad_delay_1192.c

@@ -388,7 +388,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (fadDelayDescriptor) {
 		free((LADSPA_PortDescriptor *)fadDelayDescriptor->PortDescriptors);
 		free((char **)fadDelayDescriptor->PortNames);

plugins/LadspaEffect/swh/fast_lookahead_limiter_1913.c

@@ -703,7 +703,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (fastLookaheadLimiterDescriptor) {
 		free((LADSPA_PortDescriptor *)fastLookaheadLimiterDescriptor->PortDescriptors);
 		free((char **)fastLookaheadLimiterDescriptor->PortNames);

plugins/LadspaEffect/swh/flanger_1191.c

@@ -544,7 +544,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (flangerDescriptor) {
 		free((LADSPA_PortDescriptor *)flangerDescriptor->PortDescriptors);
 		free((char **)flangerDescriptor->PortNames);

plugins/LadspaEffect/swh/foldover_1213.c

@@ -255,7 +255,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (foldoverDescriptor) {
 		free((LADSPA_PortDescriptor *)foldoverDescriptor->PortDescriptors);
 		free((char **)foldoverDescriptor->PortNames);

plugins/LadspaEffect/swh/foverdrive_1196.c

@@ -234,7 +234,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (foverdriveDescriptor) {
 		free((LADSPA_PortDescriptor *)foverdriveDescriptor->PortDescriptors);
 		free((char **)foverdriveDescriptor->PortNames);

plugins/LadspaEffect/swh/freq_tracker_1418.c

@@ -319,7 +319,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (freqTrackerDescriptor) {
 		free((LADSPA_PortDescriptor *)freqTrackerDescriptor->PortDescriptors);
 		free((char **)freqTrackerDescriptor->PortNames);

plugins/LadspaEffect/swh/gate_1410.c

@@ -582,7 +582,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (gateDescriptor) {
 		free((LADSPA_PortDescriptor *)gateDescriptor->PortDescriptors);
 		free((char **)gateDescriptor->PortNames);

plugins/LadspaEffect/swh/giant_flange_1437.c

@@ -637,7 +637,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (giantFlangeDescriptor) {
 		free((LADSPA_PortDescriptor *)giantFlangeDescriptor->PortDescriptors);
 		free((char **)giantFlangeDescriptor->PortNames);

plugins/LadspaEffect/swh/gong_1424.c

@@ -947,7 +947,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (gongDescriptor) {
 		free((LADSPA_PortDescriptor *)gongDescriptor->PortDescriptors);
 		free((char **)gongDescriptor->PortNames);

plugins/LadspaEffect/swh/gong_beater_1439.c

@@ -400,7 +400,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (gongBeaterDescriptor) {
 		free((LADSPA_PortDescriptor *)gongBeaterDescriptor->PortDescriptors);
 		free((char **)gongBeaterDescriptor->PortNames);

plugins/LadspaEffect/swh/gsm_1215.c

@@ -493,7 +493,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (gsmDescriptor) {
 		free((LADSPA_PortDescriptor *)gsmDescriptor->PortDescriptors);
 		free((char **)gsmDescriptor->PortNames);

plugins/LadspaEffect/swh/gverb_1216.c

@@ -429,7 +429,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (gverbDescriptor) {
 		free((LADSPA_PortDescriptor *)gverbDescriptor->PortDescriptors);
 		free((char **)gverbDescriptor->PortNames);

plugins/LadspaEffect/swh/hard_limiter_1413.c

@@ -286,7 +286,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (hardLimiterDescriptor) {
 		free((LADSPA_PortDescriptor *)hardLimiterDescriptor->PortDescriptors);
 		free((char **)hardLimiterDescriptor->PortNames);

plugins/LadspaEffect/swh/harmonic_gen_1220.c

@@ -542,7 +542,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (harmonicGenDescriptor) {
 		free((LADSPA_PortDescriptor *)harmonicGenDescriptor->PortDescriptors);
 		free((char **)harmonicGenDescriptor->PortNames);

plugins/LadspaEffect/swh/hermes_filter_1200.c

@@ -1998,7 +1998,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (hermesFilterDescriptor) {
 		free((LADSPA_PortDescriptor *)hermesFilterDescriptor->PortDescriptors);
 		free((char **)hermesFilterDescriptor->PortNames);

plugins/LadspaEffect/swh/highpass_iir_1890.c

@@ -278,7 +278,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (highpass_iirDescriptor) {
 		free((LADSPA_PortDescriptor *)highpass_iirDescriptor->PortDescriptors);
 		free((char **)highpass_iirDescriptor->PortNames);

plugins/LadspaEffect/swh/hilbert_1440.c

@@ -316,7 +316,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (hilbertDescriptor) {
 		free((LADSPA_PortDescriptor *)hilbertDescriptor->PortDescriptors);
 		free((char **)hilbertDescriptor->PortNames);

plugins/LadspaEffect/swh/imp_1199.c

@@ -628,7 +628,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (impDescriptor) {
 		free((LADSPA_PortDescriptor *)impDescriptor->PortDescriptors);
 		free((char **)impDescriptor->PortNames);

plugins/LadspaEffect/swh/impulse_1885.c

@@ -257,7 +257,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (impulse_fcDescriptor) {
 		free((LADSPA_PortDescriptor *)impulse_fcDescriptor->PortDescriptors);
 		free((char **)impulse_fcDescriptor->PortNames);

plugins/LadspaEffect/swh/inv_1429.c

@@ -207,7 +207,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (invDescriptor) {
 		free((LADSPA_PortDescriptor *)invDescriptor->PortDescriptors);
 		free((char **)invDescriptor->PortNames);

plugins/LadspaEffect/swh/karaoke_1409.c

@@ -274,7 +274,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (karaokeDescriptor) {
 		free((LADSPA_PortDescriptor *)karaokeDescriptor->PortDescriptors);
 		free((char **)karaokeDescriptor->PortNames);

plugins/LadspaEffect/swh/latency_1914.c

@@ -259,7 +259,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (artificialLatencyDescriptor) {
 		free((LADSPA_PortDescriptor *)artificialLatencyDescriptor->PortDescriptors);
 		free((char **)artificialLatencyDescriptor->PortNames);

plugins/LadspaEffect/swh/lcr_delay_1436.c

@@ -733,7 +733,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (lcrDelayDescriptor) {
 		free((LADSPA_PortDescriptor *)lcrDelayDescriptor->PortDescriptors);
 		free((char **)lcrDelayDescriptor->PortNames);

plugins/LadspaEffect/swh/lowpass_iir_1891.c

@@ -280,7 +280,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (lowpass_iirDescriptor) {
 		free((LADSPA_PortDescriptor *)lowpass_iirDescriptor->PortDescriptors);
 		free((char **)lowpass_iirDescriptor->PortNames);

plugins/LadspaEffect/swh/ls_filter_1908.c

@@ -308,7 +308,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (lsFilterDescriptor) {
 		free((LADSPA_PortDescriptor *)lsFilterDescriptor->PortDescriptors);
 		free((char **)lsFilterDescriptor->PortNames);

plugins/LadspaEffect/swh/matrix_ms_st_1421.c

@@ -266,7 +266,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (matrixMSStDescriptor) {
 		free((LADSPA_PortDescriptor *)matrixMSStDescriptor->PortDescriptors);
 		free((char **)matrixMSStDescriptor->PortNames);

plugins/LadspaEffect/swh/matrix_spatialiser_1422.c

@@ -424,7 +424,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (matrixSpatialiserDescriptor) {
 		free((LADSPA_PortDescriptor *)matrixSpatialiserDescriptor->PortDescriptors);
 		free((char **)matrixSpatialiserDescriptor->PortNames);

plugins/LadspaEffect/swh/matrix_st_ms_1420.c

@@ -245,7 +245,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (matrixStMSDescriptor) {
 		free((LADSPA_PortDescriptor *)matrixStMSDescriptor->PortDescriptors);
 		free((char **)matrixStMSDescriptor->PortNames);

plugins/LadspaEffect/swh/mbeq_1197.c

@@ -885,7 +885,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (mbeqDescriptor) {
 		free((LADSPA_PortDescriptor *)mbeqDescriptor->PortDescriptors);
 		free((char **)mbeqDescriptor->PortNames);

plugins/LadspaEffect/swh/mod_delay_1419.c

@@ -318,7 +318,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (modDelayDescriptor) {
 		free((LADSPA_PortDescriptor *)modDelayDescriptor->PortDescriptors);
 		free((char **)modDelayDescriptor->PortNames);

plugins/LadspaEffect/swh/multivoice_chorus_1201.c

@@ -656,7 +656,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (multivoiceChorusDescriptor) {
 		free((LADSPA_PortDescriptor *)multivoiceChorusDescriptor->PortDescriptors);
 		free((char **)multivoiceChorusDescriptor->PortNames);

plugins/LadspaEffect/swh/notch_iir_1894.c

@@ -343,7 +343,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (notch_iirDescriptor) {
 		free((LADSPA_PortDescriptor *)notch_iirDescriptor->PortDescriptors);
 		free((char **)notch_iirDescriptor->PortNames);

plugins/LadspaEffect/swh/phasers_1217.c

@@ -1377,7 +1377,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (lfoPhaserDescriptor) {
 		free((LADSPA_PortDescriptor *)lfoPhaserDescriptor->PortDescriptors);
 		free((char **)lfoPhaserDescriptor->PortNames);

plugins/LadspaEffect/swh/pitch_scale_1193.c

@@ -327,7 +327,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (pitchScaleDescriptor) {
 		free((LADSPA_PortDescriptor *)pitchScaleDescriptor->PortDescriptors);
 		free((char **)pitchScaleDescriptor->PortNames);

plugins/LadspaEffect/swh/pitch_scale_1194.c

@@ -311,7 +311,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (pitchScaleHQDescriptor) {
 		free((LADSPA_PortDescriptor *)pitchScaleHQDescriptor->PortDescriptors);
 		free((char **)pitchScaleHQDescriptor->PortNames);

plugins/LadspaEffect/swh/plate_1423.c

@@ -401,7 +401,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (plateDescriptor) {
 		free((LADSPA_PortDescriptor *)plateDescriptor->PortDescriptors);
 		free((char **)plateDescriptor->PortNames);

plugins/LadspaEffect/swh/pointer_cast_1910.c

@@ -310,7 +310,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (pointerCastDistortionDescriptor) {
 		free((LADSPA_PortDescriptor *)pointerCastDistortionDescriptor->PortDescriptors);
 		free((char **)pointerCastDistortionDescriptor->PortNames);

plugins/LadspaEffect/swh/rate_shifter_1417.c

@@ -314,7 +314,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (rateShifterDescriptor) {
 		free((LADSPA_PortDescriptor *)rateShifterDescriptor->PortDescriptors);
 		free((char **)rateShifterDescriptor->PortNames);

plugins/LadspaEffect/swh/retro_flange_1208.c

@@ -581,7 +581,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (retroFlangeDescriptor) {
 		free((LADSPA_PortDescriptor *)retroFlangeDescriptor->PortDescriptors);
 		free((char **)retroFlangeDescriptor->PortNames);

plugins/LadspaEffect/swh/revdelay_1605.c

@@ -540,7 +540,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (revdelayDescriptor) {
 		free((LADSPA_PortDescriptor *)revdelayDescriptor->PortDescriptors);
 		free((char **)revdelayDescriptor->PortNames);

plugins/LadspaEffect/swh/ringmod_1188.c

@@ -632,7 +632,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (ringmod_2i1oDescriptor) {
 		free((LADSPA_PortDescriptor *)ringmod_2i1oDescriptor->PortDescriptors);
 		free((char **)ringmod_2i1oDescriptor->PortNames);

plugins/LadspaEffect/swh/satan_maximiser_1408.c

@@ -344,7 +344,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (satanMaximiserDescriptor) {
 		free((LADSPA_PortDescriptor *)satanMaximiserDescriptor->PortDescriptors);
 		free((char **)satanMaximiserDescriptor->PortNames);

plugins/LadspaEffect/swh/sc1_1425.c

@@ -473,7 +473,7 @@ void __attribute__((constructor)) swh_init() {
 	}
 }
 
-void _fini() {
+void  __attribute__((destructor)) swh_fini() {
 	if (sc1Descriptor) {
 		free((LADSPA_PortDescriptor *)sc1Descriptor->PortDescriptors);
 		free((char **)sc1Descriptor->PortNames);