912f07b919
mingw build fixes (tested with i686-w64-mingw32 on linux-x86_64)
2014-03-04 15:25:58 +01:00
5568026387
'gtk2_ardour' - Harmonize '__WIN32__', 'OS_WIN32' etc, etc. Use 'PLATFORM_WINDOWS' instead
2013-10-14 17:00:28 +01: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
cff174b541
move rate_as_string() from EngineControl to utils.cc
2013-09-23 21:35:17 -04:00
b362ff220c
major rearrangement of startup/session loading code
...
first-time user code remains in ArdourStartup
session selection/setup moved to SessionDialog
many other cleanups, logic improvements, and so forth to the overall session loading process.
Not 100% finished yet.
2013-09-23 14:41:52 -04:00
19bb2b33a8
Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
...
Conflicts (hopefully resolved):
gtk2_ardour/marker.cc
gtk2_ardour/midi_region_view.h
gtk2_ardour/region_gain_line.h
gtk2_ardour/utils.cc
gtk2_ardour/video_image_frame.cc
gtk2_ardour/wscript
libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
5e0e41e068
Merge branch 'master' into cairocanvas
2013-09-16 22:11:50 -04:00
fb45fdc052
fix conflicts and merge with master
2013-09-16 22:11:06 -04:00
61b98d3e9f
check for an existing PublicEditor instance AFTER attempting to handle a key press in a window that has called relay_key_press(), so that normal key handling works there (e.g. audio/MIDI setup)
2013-09-16 22:03:27 -04:00
7a30e63eaa
fix merge conflicts with master
2013-09-14 16:42:40 -04:00
4861eca974
Merge branch 'master' into windows
2013-09-13 11:55:56 -04:00
9a884535c3
prevent key press in pre-main-window dialog(s) from crashing the program because there is no editor window to forward key presses to
2013-09-12 14:39:17 -04:00
bb826f4bee
incomplete merge of master into windows (requires upcoming changes to master to be complete)
2013-09-12 11:28:50 -04:00
8ddd12a60d
Rename SearchPath class Searchpath
...
Windows headers define SearchPath which means we have to undefine it
where necessary. This is a pain and can be tricksy, so I feel renaming
the class slightly is the easiest solution.
2013-09-06 14:31:11 +10:00
7b18260175
get meter color from gtkrc style file
2013-08-08 15:25:40 -04:00
616f2a0370
fix conflicts after merge with master
2013-08-05 14:22:32 -04:00
6a436fd826
fix merge conflict from master
2013-07-31 20:11:15 -04:00
fbfa0acebe
remove compile errors (still will not link and JACKPortEngine is not close to done)
2013-07-30 23:26:46 -04:00
cd28d62b26
fix compiler warnings.
2013-07-28 20:32:52 +02:00
e469ce0961
get meter color from gtkrc style file
2013-07-24 22:05:24 +02:00
9db936ac26
Don't call pango_ft2* functions on windows
2013-07-13 08:30:27 -04:00
f47499f157
Use g_random_int instead of ::random for portability
2013-07-11 11:38:46 -04:00
645878db97
remove dead code (we have git) plus add a comment
2013-06-27 15:57:48 -04:00
6618c9e406
use HSV to pick random colors and avoid over-saturation or over-brightness
2013-06-27 15:51:57 -04:00
1b73ab2065
fixed const cast warning
2013-06-21 17:15:12 -04:00
f00b3b7f11
merge with master
2013-06-13 23:00:24 -04:00
5b7b56236b
move emulate_key_event() to utils
2013-06-10 01:54:55 +02:00
ec8d521e98
semi-fix xfade display, and reduce number of calls to Curve::get_vector() by a factor of two
2013-04-18 09:56:01 -04:00
aaea166135
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
Julien de Kozak
16f8fc0657
Fix some compilation warnings
2013-03-23 14:50:58 +01:00
8d783c3d4b
additional keycode for is-legal-as-numeric
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13622 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-08 20:21:54 +00:00
d082c2f208
accept decimal point as well
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13621 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-08 19:46:40 +00:00
7fdc582f19
locale debugging
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13620 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-08 19:33:48 +00:00
0c0b04ab5c
determine whether or not to accept comma or period as a numeric character based on locale settings (once per instance of ardour), related to #5027
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13481 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 18:05:09 +00:00
98834c0532
remove a bunch of cerr output and/or convert to use error<<
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13477 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 15:11:07 +00:00
760ccbabfb
add -Wpointer-arith -Wcast-qual -Wcast-align and others to compile flags, and fix const cast warnings generated by new flags
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13124 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-08-10 15:57:09 +00:00
05d80120bf
slightly more debugging for kbd accels
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13095 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-27 03:21:39 +00:00
a701365f38
comment code that stopped the keybd accel activation pathway if Keyboard::some_magic_widget_has_focus() is true. this was OS X only and (a) appears to be unnecessary (b) stops accels from working in windows that still handle some key events
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13094 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-27 03:12:52 +00:00
105caf23da
Use std::string instead of PBD::sys::path in pbd/search_path.h, pbd/file_utils.h and ardour/session_dir.h
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12829 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:06:54 +00:00
Carl Hetherington
d7551a8f08
Escape angled brackets in playlist names for tooltips.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12672 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-12 14:19:35 +00:00
6fa6514cfd
Remove over 500 unnecessary includes (including 54 of session.h).
...
It's slightly possible that this causes trivial build failures on different
configurations, but otherwise shouldn't cause any problems (i.e. no actual
changes other than include/naming/namespace stuff). I deliberately avoided
removing libardour-config.h since this can mysteriously break things, though a
few of those do seem to be unnecessary.
This commit only targets includes of ardour/*.h. There is also a very large
number of unnecessary includes of stuff in gtk2_ardour; tackling that should
also give a big improvement in build time when things are modified.
git-svn-id: svn://localhost/ardour2/branches/3.0@12420 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 06:09:29 +00:00
813c5f0af9
major rationalization of use of search paths. ardour now has just 4 functions used to define how external resources are located: ardour_config_search_path() (for system or user specific configuration data), ardour_data_search_path() (for machine, user and system independent data), ardour_dll_directory() (base directory where shared libraries are found) and user_config_directory(). These are now used throughout the code. the config, data and dll paths/directories can be overridden by environment variables. the user config dir is added as the first element of the first two search paths, and use selectively when searching for a few other things.
...
This commit re-enabes ./waf install, and it is believed that it works fully at this point (more testing likely required)
git-svn-id: svn://localhost/ardour2/branches/3.0@12326 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-18 17:24:06 +00:00
c52c2b7368
forward-port some fixes from a2
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11630 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-09 17:15:25 +00:00
Carl Hetherington
fd1ff3d753
Remove unused color_from_style / gc_from_style.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11618 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-07 14:40:33 +00:00
bb737997ae
move 2 other non-ardour-specific utility functions into gtkmm2ext
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10932 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 13:08:00 +00:00
604dd4fe64
show focus window in accels debugging
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-20 17:43:23 +00:00
3b588d1cef
remove code no longer needed for OSX accel handling
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10562 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-13 13:22:37 +00:00
Carl Hetherington
7d32cf3813
Give route groups their own colour, settable from the route
...
group dialogue. Americanise spelling of color in a few
places to avoid confusion. Fixes #4224 . Addresses parts
of #2650 and #4064 .
git-svn-id: svn://localhost/ardour2/branches/3.0@10030 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-30 09:48:53 +00:00
6f4e224f71
fix various MIDI keybindings that were lost due to a subtle change in keyboard event forwarding
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10010 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-19 14:47:41 +00:00
45d51d3aee
various fixes to MidiRegionView selection handling, key handling, drawing of ghost notes (contains a fix for #4263 ); shift-drag selections in MidiRegionViews now correctly add to the selection rather than replacing any existing one.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10000 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-17 12:46:42 +00:00
