made 0.4.2 release

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms/stable-0.4@1963 0778d3d1-df1d-0410-868b-ea421aaaa00d

CMakeLists.txt

@@ -15,7 +15,7 @@ INCLUDE(FindPkgConfig)
 
 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "4")
-SET(VERSION_PATCH "1")
+SET(VERSION_PATCH "2")
 #SET(VERSION_SUFFIX "")
 SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 IF(VERSION_SUFFIX)

ChangeLog

@@ -1,3 +1,22 @@
+2008-12-19	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* CMakeLists.txt:
+	* README:
+	made 0.4.2 release
+
+	* plugins/vst_base/vst_plugin.h:
+	* plugins/vst_base/vst_plugin.cpp:
+	* plugins/vst_effect/vst_effect_control_dialog.cpp:
+	* plugins/vst_effect/vst_effect.cpp:
+	* plugins/vestige/vestige.cpp:
+	fixed crash when adding VST effects
+
+	* include/project_version.h:
+	* src/core/project_version.cpp:
+	fixed broken version comparing which indicated 0.x.y to be less than
+	0.x.y-patch - fixes messed up projects when loading files created
+	with LMMS 0.4.0
+
 2008-12-17	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* CMakeLists.txt:

README

@@ -1,4 +1,4 @@
-Linux MultiMedia Studio 0.4.1
+Linux MultiMedia Studio 0.4.2
 ==============================
 
 Copyright (c) 2004-2008 by LMMS-developers

include/project_version.h

@@ -47,7 +47,7 @@ public:
 
 inline bool operator<( const projectVersion & _v1, const char * _str )
 {
-	return( projectVersion::compare( _v1, projectVersion( _str ) ) < 0 );
+	return projectVersion::compare( _v1, projectVersion( _str ) ) < 0;
 }
 
 

plugins/vestige/vestige.cpp

@@ -222,6 +222,10 @@ bool vestigeInstrument::handleMidiEvent( const midiEvent & _me,
 void vestigeInstrument::closePlugin( void )
 {
 	m_pluginMutex.lock();
+	if( m_plugin )
+	{
+		delete m_plugin->pluginWidget();
+	}
 	delete m_plugin;
 	m_plugin = NULL;
 	m_pluginMutex.unlock();

plugins/vst_base/vst_plugin.cpp

@@ -159,7 +159,6 @@ vstPlugin::vstPlugin( const QString & _plugin ) :
 
 vstPlugin::~vstPlugin()
 {
-	delete pluginWidget();
 }
 
 

plugins/vst_base/vst_plugin.h

@@ -74,9 +74,9 @@ public:
 	void setParameterDump( const QMap<QString, QString> & _pdump );
 
 
-	inline QWidget * pluginWidget( void )
+	inline QWidget * pluginWidget( bool _top_widget = true )
 	{
-		if( m_pluginWidget )
+		if( _top_widget && m_pluginWidget )
 		{
 			if( m_pluginWidget->parentWidget() )
 			{

plugins/vst_effect/vst_effect.cpp

@@ -86,7 +86,7 @@ bool vstEffect::processAudioBuffer( sampleFrame * _buf, const fpp_t _frames )
 {
 	if( !isEnabled() || !isRunning () )
 	{
-		return( FALSE );
+		return false;
 	}
 
 	if( m_plugin )
@@ -180,9 +180,9 @@ extern "C"
 // neccessary for getting instance out of shared lib
 plugin * lmms_plugin_main( model * _parent, void * _data )
 {
-	return( new vstEffect( _parent,
+	return new vstEffect( _parent,
 		static_cast<const plugin::descriptor::subPluginFeatures::key *>(
-								_data ) ) );
+								_data ) );
 }
 
 }

plugins/vst_effect/vst_effect_control_dialog.cpp

@@ -35,10 +35,14 @@ vstEffectControlDialog::vstEffectControlDialog( vstEffectControls * _ctl ) :
 	effectControlDialog( _ctl )
 {
 	QVBoxLayout * l = new QVBoxLayout( this );
+	l->setMargin( 0 );
+	l->setSpacing( 0 );
+
 	_ctl->m_effect->m_plugin->showEditor( this );
-	QWidget * w = _ctl->m_effect->m_plugin->pluginWidget();
+	QWidget * w = _ctl->m_effect->m_plugin->pluginWidget( false );
 	if( w )
 	{
+		setWindowTitle( w->windowTitle() );
 		l->addWidget( w );
 	}
 }

src/core/project_version.cpp

@@ -4,6 +4,7 @@
  * project_version.cpp - compare versions in import upgrades
  *
  * 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
  *
@@ -42,7 +43,7 @@ int projectVersion::compare( const projectVersion & _v1,
 	n2 = _v2.section( '.', 0, 0 ).toInt();
 	if( n1 != n2 )
 	{
-		return( n1 - n2 );
+		return n1 - n2;
 	}
 
 	// Minor
@@ -50,7 +51,7 @@ int projectVersion::compare( const projectVersion & _v1,
 	n2 = _v2.section( '.', 1, 1 ).toInt();
 	if( n1 != n2 )
 	{
-		return( n1 - n2 );
+		return n1 - n2;
 	}
 
 	// Release
@@ -58,12 +59,24 @@ int projectVersion::compare( const projectVersion & _v1,
 	n2 = _v2.section( '.', 2 ).section( '-', 0, 0 ).toInt();
 	if( n1 != n2 )
 	{
-		return( n1 - n2 );
+		return n1 - n2;
 	}
 
 	// Build
-	return( QString::compare( _v1.section( '.', 2 ).section( '-', 1 ),
-				_v2.section( '.', 2 ).section( '-', 1 ) ) );
+	const QString b1 = _v1.section( '.', 2 ).section( '-', 1 );
+	const QString b2 = _v2.section( '.', 2 ).section( '-', 1 );
+
+	// make sure 0.x.y > 0.x.y-patch
+	if( b1.isEmpty() )
+	{
+		return 1;
+	}
+	if( b2.isEmpty() )
+	{
+		return -1;
+	}
+
+	return QString::compare( b1, b2 );
 }