final merge

1 files changed, 76 insertions, 2 deletions

diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index b13301ff..1a526f20 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,78 @@
+30.06.2012:
+         =======================================
+         * 2.0 tagged (rj)
+         =======================================
+         - Emergency crash fix: In automation popup midi control 'Clear' item. (Tim)
+           Cannot delete any actions from menu due to recent December PopupMenu fixes. 
+29.06.2012:
+         - Fixed file dialog: disable 'read configuration' for midi files. (Tim)
+         - Updated swedish translation (rj)
+         - reworked the REC button somewhat (rj)
+28.06.2012:
+         - External sync fixes: Now have user-selectable of clock filtering and quantization. (Tim)
+         - Fixed clicking tempo master does not update wave parts. Allow SC_MASTER to call canvas->partsChanged. (Tim)
+         - Fixed problems with recorded wave part and event sizes, and 'past end' indicator. (Tim)
+         - Don't resize or destroy wave events upon part resize. (Tim)
+         - Init support for controlling midi engine from Jack timebase master. Completely disabled for now. (Tim)
+26.06.2012:
+         - Added updated Czech translation from Pavel Fric[pavelfric@seznam.cz] (rj)
+23.06.2012:
+         - automation graphs: deletion with middle-click, fixed automation    (flo93)
+                              editing.
+18.06.2012:
+         - Removed printouts about no longer supported VST implementation,
+           use DSSI implementation instead (rj)
+         - Some preparations for 2.0 (rj)
+16.06.2012:
+         - MusE as Jack Timebase master: Corrected ticks_per_beat and bar_start_tick fields. (Tim) 
+         - Fixed bug by Geoff B and Flo: Changing a midi port device: We are only interested in altering 
+            tracks using the port being changed in the midi port list. And don't change channel. (Tim)
+15.06.2012:
+        * Sync fix: MusE now records tempo changes from externally clocked midi. (Tim)
+          Still experimental but non-intrusive: You will be asked at the end of recording if you  
+           want to transfer the recorded tempos to the master tempo graph. 
+          Tested OK so far with ALSA and Jack midi. Best results ATM may be when recording from 
+           position 0, not 'continuing' a recording or skipping 'fwd' or 'rew'. 
+          TODO: Record Jack timebase changes! Find patch someone sent years ago, likely still useful...
+11.06.2012:
+        - Finally! Audio controller playback has smooooth frame resolution even with large audio buffers. (Tim)
+          CtrlList::value() now accepts a nextFrame*, filled with next event frame, which the
+           plugin and dssi process use to determine the run sizes. 
+          Bonus! This processing is now guaranteed to be ALIGNED with user's chosen minimum control processing 
+           period in Settings. Before, it was occasionally going to 1, 2, 4 frame runs etc., was not good. 
+          TODO: Sorry, track audio/pan have no 'variable run length' support yet. Choppy with large buffers.
+                Tip: If a ping-pong effect is desired, try a plugin for now!
+        - Increased default minimum controller period from 64 to 256. Tests showed 256 is just fine, smooth.
+10.06.2012:
+        - Add midi-to-audio control popups to right-click automation menus. (Tim)
+        - Track list audio automation popup now can stay open, for colour and 'clear' items. (Tim)
+08.06.2012:
+        * Merge: From branch r2_0_extra. (Tim)
+        - More automation fixes. In AudioTrack::processAutomationEvents, optimize integer, bool, 
+           discrete controller types to avoid multiple dots on flat straight-line graph segments. (Tim)
+        - Replaced Song::controllerChange() with a lower-level 
+           CtrlList::guiUpdatePending()/clearGuiUpdatePending(). Checked and cleared in 
+           Song::beat() at the nice slow heartbeat rate instead of direct calls to QWidget::update().
+          This means ALL controls should update their graphs now, and at a more reasonable rate.  (Tim)
+        - ARVT_STOP automation events are also recorded now
+        - When clicking sliders in the plugin's native GUIs or the
+          mixer with SHIFT held down, straight lines are drawn (no
+          intermediate control points are recorded)
+          TODO: does not yet work for muse-native, but customized GUIs (flo)
+07.06.2012:
+        - More automation fixes. (Tim)
+06.06.2012:
+        - Another midi-to-audio mapper classes rewrite. (Tim)
+05.06.2012:
+        - Rewrote midi-to-audio control mapper classes. (Tim...)
+        - Added save and load midi-to-audio settings.
+        - Remap or remove mappers when rack items moved or removed.
+04.06.2012:
+        - Side branch r2_0_extra, copied from release_2_0:
+        * Feature: Midi control of audio paramters. (Tim)
+        - More important timing, accuracy fixes.
+03.06.2012:
+        - Merged documentation from local source to repository LaTeX document, 80% done (rj)
 27.05.2012:
         * Timing, resolution, accuracy, and automation fixes:  (Tim)
         - Ask audio driver for 'its' current system time instead of wallclock in utils.cpp:curTime(). 
@@ -154,7 +229,7 @@
            use it instead of setValue().  
 17.03.2012:
         - Custom columns can now either affect tick0 or song->cpos() (flo)
-        - hopefully fixed a big in the custom columns dialog (flo)
+        - hopefully fixed a bug in the custom columns dialog (flo)
 16.03.2012:
         - Custom columns now send their controller changes to the device
           automatically if appropriate (flo)
@@ -1612,7 +1687,6 @@
       * Renamed: Soft synth configuration changed to Synth configuration, as per patch from Geoff King (rj)
       * Fixed: Shortcuts with modifier keys wasn't working for global shortcuts, should be now (rj)
       * Added: Shortcuts for changing len of events, default Ctrl+Shift+Left/Right (rj)
->>>>>>> .r459
 10.08.2010
       * Fixed/Changed: Grid reacts to midi resolution change (rj)
 01.08.2010