From 2831e9f6f0cdb9a556739de4a7634ae63cc8ceb2 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Tue, 16 Sep 2008 22:53:28 +0000 Subject: [PATCH] disabled undo/redo of track/TCO addition/removal as not mature yet and causes unneccessary crashes (closes #2014439, #2100407) git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1620 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 5 +++++ src/core/track.cpp | 8 ++++---- src/gui/track_container_view.cpp | 12 ++++++++---- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd8af65c8..f6b838acc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-09-16 Tobias Doerffel + * src/gui/track_container_view.cpp: + * src/core/track.cpp: + disabled undo/redo of track/TCO addition/removal as not mature yet and + causes unneccessary crashes (closes #2014439, #2100407) + * data/projects/cool_songs/Skiessi-TurningPoint.mmpz: * data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz: added two cool projects from Skiessi - more to come diff --git a/src/core/track.cpp b/src/core/track.cpp index 6320814d9..7e36a7c5f 100644 --- a/src/core/track.cpp +++ b/src/core/track.cpp @@ -897,9 +897,9 @@ trackContentWidget::~trackContentWidget() void trackContentWidget::addTCOView( trackContentObjectView * _tcov ) { trackContentObject * tco = _tcov->getTrackContentObject(); - QMap map; +/* QMap map; map["id"] = tco->id(); - addJournalEntry( journalEntry( AddTrackContentObject, map ) ); + addJournalEntry( journalEntry( AddTrackContentObject, map ) );*/ m_tcoViews.push_back( _tcov ); @@ -925,13 +925,13 @@ void trackContentWidget::removeTCOView( trackContentObjectView * _tcov ) _tcov ); if( it != m_tcoViews.end() ) { - QMap map; +/* QMap map; multimediaProject mmp( multimediaProject::JournalData ); _tcov->getTrackContentObject()->saveState( mmp, mmp.content() ); map["id"] = _tcov->getTrackContentObject()->id(); map["state"] = mmp.toString(); addJournalEntry( journalEntry( RemoveTrackContentObject, - map ) ); + map ) );*/ m_tcoViews.erase( it ); engine::getSong()->setModified(); diff --git a/src/gui/track_container_view.cpp b/src/gui/track_container_view.cpp index 148dd4883..b44dd4412 100644 --- a/src/gui/track_container_view.cpp +++ b/src/gui/track_container_view.cpp @@ -122,9 +122,9 @@ void trackContainerView::loadSettings( const QDomElement & _this ) trackView * trackContainerView::addTrackView( trackView * _tv ) { - QMap map; +/* QMap map; map["id"] = _tv->getTrack()->id(); - addJournalEntry( journalEntry( AddTrack, map ) ); + addJournalEntry( journalEntry( AddTrack, map ) );*/ m_trackViews.push_back( _tv ); m_scrollLayout->addWidget( _tv ); @@ -143,12 +143,12 @@ void trackContainerView::removeTrackView( trackView * _tv ) int index = m_trackViews.indexOf( _tv ); if( index != -1 ) { - QMap map; +/* QMap map; multimediaProject mmp( multimediaProject::JournalData ); _tv->getTrack()->saveState( mmp, mmp.content() ); map["id"] = _tv->getTrack()->id(); map["state"] = mmp.toString(); - addJournalEntry( journalEntry( RemoveTrack, map ) ); + addJournalEntry( journalEntry( RemoveTrack, map ) );*/ m_trackViews.removeAt( index ); @@ -302,6 +302,7 @@ void trackContainerView::clearAllTracks( void ) void trackContainerView::undoStep( journalEntry & _je ) { +#if 0 saveJournallingState( FALSE ); switch( _je.actionID() ) { @@ -331,6 +332,7 @@ void trackContainerView::undoStep( journalEntry & _je ) } } restoreJournallingState(); +#endif } @@ -338,6 +340,7 @@ void trackContainerView::undoStep( journalEntry & _je ) void trackContainerView::redoStep( journalEntry & _je ) { +#if 0 switch( _je.actionID() ) { case AddTrack: @@ -349,6 +352,7 @@ void trackContainerView::redoStep( journalEntry & _je ) RemoveTrack : AddTrack; break; } +#endif }