8f930477be
Merge branch 'master' into cairocanvas
2014-02-11 22:50:52 -05:00
b75fb503fb
list action-names as part of --bindings
2014-02-11 05:52:39 +01:00
0bab9d2822
fix crash at exit with '-b', '--bindings' option
2014-02-11 05:52:07 +01:00
a0abf608d6
replace a few creeping instances of the string "Ardour" with PROGRAM_NAME
2014-02-10 10:53:01 -05:00
2ba58dfe65
Merge branch 'master' into cairocanvas
2014-01-29 16:08:52 -05:00
41001ae702
prevent a strange crash while iterating over tracks (now, and maybe in the future)
2014-01-27 20:36:09 -05:00
7000afdc66
fix merge conflict with master
2014-01-23 13:41:20 -05:00
acc2fa2c7f
one less Conditional jump or move depends on uninitialised value(s)
2014-01-20 13:32:57 +01:00
658bb3ccd4
finished merge of cairocanvas with windows and windows+cc branches
2014-01-10 17:11:10 -05:00
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
84f55440a3
fix redrawing of canvas with an optimized build
...
Best guess right now is that optimization does something bad when ceil() is called twice on a very large dbl-precision number,
which results in a zero (empty) redraw area. Without the removal of the redundant ceil & floor functions, no expose events
would be delivered to the canvas in an optimized build during drags (and maybe more).
2013-12-23 15:35:49 -05:00
dc7878760d
vtl: do not lock audio [to video] when extracting audio-only.
2013-12-23 10:28:32 +01:00
59da788793
Merge branch 'master' into cairocanvas
2013-12-05 17:50:28 -05:00
2ba2a50dec
Merge branch 'master' into windows
2013-12-04 11:50:36 -05:00
ce7bfb489c
change "cpu" in cpu load backend functions
2013-12-04 11:48:31 -05:00
69df7763a1
switch from using Sleep/usleep to Glib::usleep() (and remember that we need to make Glib::usleep() actually work on windows one day)
2013-12-03 10:24:34 -05:00
efff843f05
Merge branch 'master' into windows
2013-11-26 10:25:55 -05:00
08371ae2cf
resolve merge with master (?)
2013-11-26 10:24:51 -05:00
fa22520fd2
Merge branch 'master' into cairocanvas
2013-11-25 09:26:35 -05:00
c1e8da2e60
Distinguish Save-as and Snapshot dialog window
2013-11-19 15:51:27 +01:00
ea1ccb869a
fix merge with master
2013-10-31 13:16:51 -04:00
nick_m
f2300164d7
Fix thinko in setting order hint.
2013-10-29 02:04:26 +11:00
5eaafaa3af
further fixes for NSM-based startup
...
Most, move initialization of Audio/MIDI setup window before NSM initialization, to make sure it is available if/when needed
2013-10-27 20:48:48 -04:00
632f5d5231
add error checking and return from attempted NSM-based initialization
2013-10-27 20:32:56 -04:00
nick_m
e80d66c908
Use add_route_dialog's transient_for() window to determine track selection for order_hint.
2013-10-26 02:37:45 +11:00
nick_m
be69bf15dd
New routes are placed after highest selected route.
2013-10-24 01:27:13 +11:00
d135c4dc3a
fix merge conflicts with master
2013-10-23 08:47:57 -04:00
664e715a00
merge from master
2013-10-22 15:29:44 -04:00
28525d7b69
Forward declare NSM_Client class in ardour_ui.h
...
nsm.h pulls in winsock2.h and with the mingw build and it causes endless
warnings from the compiler
2013-10-21 10:10:40 +10:00
b540d0e4bc
Fix check button handling in Memory Warning Dialog
2013-10-21 10:10:40 +10:00
53bf1a65e8
Fix two minor memory leaks in pending state dialog
2013-10-21 10:10:40 +10:00
58eaab0e42
fix compilation
2013-10-20 09:04:27 -04:00
e5888d3983
merge with master and fix 2 conflicts
2013-10-16 22:06:56 -04:00
fb313fb174
Merge branch 'master' into windows
2013-10-16 21:57:17 -04:00
75b933eadb
Merge remote-tracking branch 'remotes/origin/master' into windows+cc
2013-10-16 15:55:59 +01:00
fa03eee79e
make the startup -> session dialog flow more sensible for brand new users
2013-10-15 12:37:13 -04:00
69a8fc43e2
Merge branch 'master' into windows
2013-10-15 11:17:12 -04:00
e466ce40ad
Merge branch 'master' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
2013-10-14 19:31:22 +01:00
8a4a86eff4
'gtk2_ardour' - Harmonize '__WIN32__', 'OS_WIN32' etc, etc. Use 'PLATFORM_WINDOWS' instead
2013-10-14 17:05:42 +01:00
be8d06f848
post a dialog about a session being opened in read-only mode (if it happens)
2013-10-12 11:58:22 -04:00
b688dc802f
remove erroneous ` in string
2013-10-12 09:59:33 -04:00
57262331c1
don't use a possibly non-existent window as a transient parent when showing a dialog about engine failure
2013-10-11 15:58:51 -04:00
fa71d82dda
Merge branch 'windows' into windows+cc
2013-10-11 18:23:53 +01:00
a38c0efbe7
minor tweaks to audio/MIDI setup window
2013-10-10 21:07:17 -04:00
c4b20f1a20
nicely handle the (should-never-happen) case of no audio/MIDI backends being detected
2013-10-10 11:24:16 -04:00
2a6a16f980
merge with master, fixing conflicts in 3 wscript files
2013-10-09 14:00:42 -04:00
19ba3b8de7
fix some issues with window flow when session loading fails; shrink "New Session" button in session setup dialog
2013-10-08 12:18:27 -04:00
5d85b5257e
use new GtkUI design in ARDOUR_UI
2013-10-07 20:27:54 -04:00
d74255343e
fix up some aspects of loading from a cmdline session name
2013-10-06 16:32:02 -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
