13
0
Commit Graph

18 Commits

Author SHA1 Message Date
3020b224fa 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
1676789907 fix merge conflicts from master 2013-12-12 10:06:59 -05:00
Nils Philippsen
e5ae775b42 don't use deprecated g_strcasecmp()
It's dependent on the current locale and deprecated, use
g_ascii_strcasecmp() instead.
2013-12-10 23:07:47 +01:00
e5888d3983 merge with master and fix 2 conflicts 2013-10-16 22:06:56 -04:00
300b484cf6 Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui.h
	gtk2_ardour/ardour_ui_options.cc
2013-10-06 11:56:03 +01:00
7f4ed54f53 'gtk2_ardour' - Some further casting 2013-10-06 10:50:45 +01:00
028cd5660f use g_strcasecmp() instead of strcasecmp() which doesn't exist with MSVC (some versions, at least) 2013-10-04 12:50:03 -04:00
4e84bc3a39 changes to get cairocanvas branch to build on OS X, with its stupid nil and Rect macros, plus some const_cast<> and unused variable fixes that should really be in master but will have to wait till we rebase master 2013-04-12 21:46:44 -04:00
4235e9a1a2 a variety of mostly unused parameter errors from OS X Lion's compiler
git-svn-id: svn://localhost/ardour2/branches/3.0@12148 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-02 20:29:46 +00:00
0938a42440 fixes for 98% of all the warnings/errors reported by OS X gcc on tiger
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-30 17:55:14 +00:00
ed626628b5 Delete trailing whitespace
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 17:00:29 +00:00
7874dd2b07 two small fixes from melvin ray herr for the step editor
git-svn-id: svn://localhost/ardour2/branches/3.0@9171 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-21 15:07:37 +00:00
b85b4d9e54 make ardour3 build and link on OS X (tiger, at least)
git-svn-id: svn://localhost/ardour2/branches/3.0@8018 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-13 05:14:48 +00:00
98d994f29c fix a variety of unused argument errors noted by gcc 4.3.2 on x86
git-svn-id: svn://localhost/ardour2/branches/3.0@7733 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-02 17:01:36 +00:00
1018368aef Fix spacey tabs...
http://ardour.org/development/styleguide


git-svn-id: svn://localhost/ardour2/branches/3.0@7542 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-04 21:50:57 +00:00
b1f5a6a68d a bunch of tweaks for the step entry process (computer keyboard input now works, for example)
git-svn-id: svn://localhost/ardour2/branches/3.0@7532 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-03 19:22:57 +00:00
bd69ec8b25 cairo-ify the PianoKeyboard widget
git-svn-id: svn://localhost/ardour2/branches/3.0@7531 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-03 15:06:55 +00:00
e0edca5a2a first, incomplete pass at step entry dialog, along with various SVG and PNG files for notes and dynamics notation
git-svn-id: svn://localhost/ardour2/branches/3.0@7529 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-02 21:52:21 +00:00