Paul Davis 7000afdc66 fix merge conflict with master

2014-01-23 13:41:20 -05:00

..

libsmf

Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there

2014-01-10 16:07:57 -05:00

Control.cpp

lots more fidgety work on automation. sort of works now, but undo/redo needs attention

2012-07-17 03:10:40 +00:00

ControlList.cpp

Fix for isnan using MinGW compiler

2013-09-06 14:30:45 +10:00

ControlSet.cpp

convert from Glib:: to Glib::Threads for all thread-related API

2012-07-25 17:48:55 +00:00

Curve.cpp

fixes for windows branch build failures under linux. still does not build on linux, now due to taglib changes

2013-07-31 20:08:43 -04:00

debug.cpp

dramatic overhaul of automation. too long to explain here. this work is not finished - write/touch passes do not correctly overwrite existing data because the semantics of ControlList::insert_iterator need clarification. more to follow

2012-07-13 21:05:45 +00:00

Event.cpp

fix evoral assignment operator (copy buffer)

2014-01-22 15:11:31 +01:00

i18n.h

add skeleton for i18n support

2011-08-11 15:57:48 +00:00

IdentityConverter.cpp

fix 64 bit template types

2014-01-12 20:01:12 -05:00

midi_util.cpp

Fix my name :)

2011-04-06 15:00:16 +00:00

MIDIEvent.cpp

remove incorrect and unnecessary template class declaration from Evoral (added recently)

2012-10-10 15:42:47 +00:00

Note.cpp

use musical_time_equal() test for equality when copying note data, not strict floating point equality. should fix #4609 (and maybe another one too)

2012-01-31 23:20:13 +00:00

Note.impl

'libs/evoral' - and add 'Note.impl' to the project

2014-01-13 12:47:21 +00:00

OldSMF.cpp

Fix my name :)

2011-04-06 15:00:16 +00:00

Sequence.cpp

Include evoral/Note.hpp before pbd/compose.h

2013-08-08 15:23:09 -04:00

SMF.cpp

'libs/evoral' - DLL visibility stuff and associated changes needed for building with MSVC. Currently includes debugging information and things that are just commented out until we have known compatibility with the other platforms (i.e. contains stuff to be removed at a later date)

2014-01-12 17:36:17 +00:00

SMFReader.cpp

Fix my name :)

2011-04-06 15:00:16 +00:00