More controller clearing stuff

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1017 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Paul Giblock
2008-05-25 06:39:02 +00:00
parent 736a252b53
commit 4788517843
4 changed files with 13 additions and 7 deletions

View File

@@ -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>

View File

@@ -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() )

View File

@@ -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();

View File

@@ -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;