hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

disabled undo/redo of track/TCO addition/removal as not mature yet and causes unneccessary crashes (closes #2014439, #2100407)

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1620 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-09-16 22:53:28 +00:00
parent 2214b49009
commit 2831e9f6f0
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,5 +1,10 @@
2008-09-16 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* 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

8
src/core/track.cpp
View File

@@ -897,9 +897,9 @@ trackContentWidget::~trackContentWidget()
void trackContentWidget::addTCOView( trackContentObjectView * _tcov )
{
trackContentObject * tco = _tcov->getTrackContentObject();
QMap<QString, QVariant> map;
/* QMap<QString, QVariant> 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<QString, QVariant> map;
/* QMap<QString, QVariant> 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();

12
src/gui/track_container_view.cpp
View File

@@ -122,9 +122,9 @@ void trackContainerView::loadSettings( const QDomElement & _this )
trackView * trackContainerView::addTrackView( trackView * _tv )
{
QMap<QString, QVariant> map;
/* QMap<QString, QVariant> 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<QString, QVariant> map;
/* QMap<QString, QVariant> 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
}