From 47885178432e388149d80ee3c9f0de1f7152b39c Mon Sep 17 00:00:00 2001
From: Paul Giblock <drfaygo@gmail.com>
Date: Sun, 25 May 2008 06:39:02 +0000
Subject: [PATCH] More controller clearing stuff

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1017 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog                                |  8 +++++---
 src/core/controller.cpp                  |  1 -
 src/core/song.cpp                        | 10 ++++++++--
 src/gui/widgets/controller_rack_view.cpp |  1 -
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8faa6fd78..ab0374160 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,11 +6,13 @@
 	* include/controller.h:
 	* include/song.h:
 	* include/lfo_controller.h:
-	* src/core/song.cpp:
 	* src/core/controller.cpp:
 	* src/core/lfo_controller.cpp:
-	Save and load controllers to project files.  Doesn't clear them on
-	load/new yet though
+	Save and load controllers to project files.
+
+	* src/core/song.cpp:
+	- Save and load controllers to project files.
+	- emit dataChanged() on clearProject() do we need this anywhere else?
 
 2008-05-24	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
diff --git a/src/core/controller.cpp b/src/core/controller.cpp
index f8cd0ca18..a9368e2d2 100644
--- a/src/core/controller.cpp
+++ b/src/core/controller.cpp
@@ -54,7 +54,6 @@ controller::controller( ControllerTypes _type, model * _parent ) :
 
 controller::~controller()
 {
-	printf("controller dtor\n");
 	s_controllers.remove( s_controllers.indexOf( this ) );
 
 	if( engine::getSong() )
diff --git a/src/core/song.cpp b/src/core/song.cpp
index 884233d07..35de2c262 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -48,6 +48,7 @@
 #include "bb_track.h"
 #include "bb_track_container.h"
 #include "config_mgr.h"
+#include "controller_rack_view.h"
 #include "embed.h"
 #include "envelope_and_lfo_parameters.h"
 #include "export_project_dialog.h"
@@ -729,12 +730,17 @@ void song::clearProject( void )
 		engine::getProjectNotes()->clear();
 	}
 
-	/*
+	// Move to function
 	while( !m_controllers.empty() )
 	{
 		delete m_controllers.last();
 	}
-	*/
+/*	if( engine::getControllerRackView() )
+	{
+		engine::getControllerRackView()->update();
+	}*/
+
+	emit dataChanged();
 
 	engine::getProjectJournal()->clearInvalidJournallingObjects();
 	engine::getProjectJournal()->clearJournal();
diff --git a/src/gui/widgets/controller_rack_view.cpp b/src/gui/widgets/controller_rack_view.cpp
index 81b450a76..6f657d3ec 100644
--- a/src/gui/widgets/controller_rack_view.cpp
+++ b/src/gui/widgets/controller_rack_view.cpp
@@ -168,7 +168,6 @@ void controllerRackView::update( void )
 	song * s = engine::getSong();
 //	QVector<bool> view_map( fxChain()->m_effects.size(), FALSE );
 
-	printf("rack view update %d\n", s->m_controllers.size());
 	setUpdatesEnabled( false );
 
 	int i = 0;