summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2011-01-04 21:34:15 +0000
committerRobert Jonsson <spamatica@gmail.com>2011-01-04 21:34:15 +0000
commit76492eaa41d25fa4e7f65f884d21e7bef9849774 (patch)
tree11e671ec10053ae2685ffbc5536948442c97db98
parent217b37620cb47a9a6d9ae6c4027638d763e9df1b (diff)
disabled track arming again, didn't work right
-rw-r--r--muse2/ChangeLog1
-rw-r--r--muse2/muse/audio.cpp5
2 files changed, 3 insertions, 3 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 07ad91bd..12711b61 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -7,7 +7,6 @@
It's supposed to be a Qt3 function, but still supported.
- Enabled displaying of audio automation on tracks (rj)
- Added right-click on track ARM buttons, now enables/disables all tracks of it's kind (rj)
- - leave audio tracks ARMED after record, same as midi tracks (rj)
02.01.2011:
- Fixed arranger focussing problems again. (Tim)
Scratch setFocusProxy() fix of 31.12. Gave MusE a keyPress handler and pass it on to canvas.
diff --git a/muse2/muse/audio.cpp b/muse2/muse/audio.cpp
index da7a0af3..934a5387 100644
--- a/muse2/muse/audio.cpp
+++ b/muse2/muse/audio.cpp
@@ -1361,8 +1361,9 @@ void Audio::recordStop()
// song->setRecordFlag knows about it...
track->setRecFile(0); // flush out the old file
- song->setRecordFlag(track, false); // and re-arm the track
- song->setRecordFlag(track, true); // here
+ song->setRecordFlag(track, false); //
+ //track->setRecordFlag1(true); // and re-arm the track here
+ //song->setRecordFlag(track, true); // here
}
}
MidiTrackList* ml = song->midis();