Merge branch 'stable-1.1'

Conflicts:
	plugins/DualFilter/DualFilterControls.cpp
	src/gui/PluginBrowser.cpp

src/core/ConfigManager.cpp

@@ -290,7 +290,13 @@ void ConfigManager::loadConfigFile()
 				node = node.nextSibling();
 			}
 
-			if( value( "paths", "artwork" ) != "" )
+			// don't use dated theme folders as they break the UI (i.e. 0.4 != 1.0, etc)
+			bool use_artwork_path = 
+				root.attribute( "version" ).startsWith( 
+					QString::number( LMMS_VERSION_MAJOR ) + "." + 
+					QString::number( LMMS_VERSION_MINOR ) );
+
+			if( use_artwork_path && value( "paths", "artwork" ) != "" )
 			{
 				m_artworkDir = value( "paths", "artwork" );
 				if( !QDir( m_artworkDir ).exists() )

src/core/SampleBuffer.cpp

@@ -957,6 +957,7 @@ void SampleBuffer::visualize( QPainter & _p, const QRect & _dr,
 	_p.drawPolyline( l, nb_frames / fpp );
 	_p.drawPolyline( r, nb_frames / fpp );
 	delete[] l;
+	delete[] r;
 }
 
 

src/gui/PianoRoll.cpp

@@ -70,6 +70,11 @@
 #include "TextFloat.h"
 
 
+#if QT_VERSION < 0x040800
+#define MiddleButton MidButton
+#endif
+
+
 typedef AutomationPattern::timeMap timeMap;
 
 

src/gui/PluginBrowser.cpp

@@ -29,6 +29,8 @@
 #include <QScrollArea>
 
 #include "PluginBrowser.h"
+#include <algorithm> // for std::sort
+
 #include "embed.h"
 #include "debug.h"
 #include "templates.h"

src/tracks/InstrumentTrack.cpp

@@ -87,7 +87,7 @@ const char * volume_help = QT_TRANSLATE_NOOP( "InstrumentTrack",
 
 const int INSTRUMENT_WIDTH	= 254;
 const int INSTRUMENT_HEIGHT	= INSTRUMENT_WIDTH;
-const int PIANO_HEIGHT		= 84;
+const int PIANO_HEIGHT		= 82;
 const int INSTRUMENT_WINDOW_CACHE_SIZE = 8;