f00b3b7f11
merge with master
2013-06-13 23:00:24 -04:00
d7e336e0f2
s/Framenumber/Frame number/
2013-06-14 00:41:02 +02:00
6b480bb2f7
vtl: make "Remove Video" insensitive if N/A
2013-06-13 00:58:19 +02:00
6ae4f10437
Merge branch 'master' into cairocanvas
...
Conflicts:
gtk2_ardour/editor.h
gtk2_ardour/editor_canvas.cc
gtk2_ardour/wscript
2013-04-11 22:24:05 +02:00
66ee2c8e59
enable videotimeline by default
2013-04-11 19:49:48 +02:00
8eef4b1904
master merge; new files not added after initial cairocanvas patch application
2013-04-05 17:16:33 -04:00
aaea166135
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
1040801ffe
vtl: video-monitor letterbox & orig-zoom to menu
2013-04-04 01:05:49 +02:00
9301991f6e
vtl: video-monitor interaction
...
* Menu > View > Video Monitor -- bi-directional communication
with xjadeo for window-state and OSD.
* fix saving state on session close (wait for xjadeo to terminate)
2013-04-03 22:29:37 +02:00
0c3e840700
videotimline
...
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
5da4e2be2d
remove timecode subframe configuration
...
There is no actual use-case to set it to anything else than 100.
timecode subframes are only used for ruler marks and the snap to grid.
libtimecode is still /aware/ of the subframe setting.
git-svn-id: svn://localhost/ardour2/branches/3.0@13817 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-09 15:47:19 +00:00
1224fc0700
add cycle-zoom-focus and bind to "1" by default
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13658 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-13 16:20:37 +00:00
93b3a72cb8
remove debug output
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13626 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-08 21:03:19 +00:00
7b121f301c
locale/focus debug 3
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13625 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-08 20:43:06 +00:00
Ben Loftis
92e5a13fd4
several theme changes. changed drawing of rounded_rectangle to be more correct. operation and feel should be more consistent. rec-mute-solo buttons are now dull until enabled. this might be debatable. otherwise if it looks weird, try loading Window->Theme Manager and clicking Restore Defaults
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-06 20:48:44 +00:00
Ben Loftis
e63da83c53
tweak Smart Mode to be more like Mixbus. Smart mode is just a modifier on Object mode which provides Range selection in the top half of the waveform. probably lots of corner cases to clear up before its all over, but at least we can use Mixbus as a consistent target rather than making it all up again.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-26 22:43:10 +00:00
38c10a4d23
make range ruler visible by default - costs a few mm, saves confusion among new users
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13536 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-20 14:03:09 +00:00
60f85cac42
provide the ability to enable + disable tooltips
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13505 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-14 23:23:53 +00:00
3fa84d0caa
add alt-i as a binding in both the editor and mixer windows to toggle the state of MIDI input on the selected track(s); in the mixer this will also operate on the strip under the mouse. fixes #4838
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13475 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 02:19:04 +00:00
e43d91949b
more work on RID and editor/mixer order matching; when a track/bus is hidden in the GUI controlling RID, it gets a extremely large RID to prevent it showing up on a control surface (but ... for now ... is still visible in the other GUI, even if "sync order between mixer + editor" is enabled); change font in editor route list
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13054 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-19 22:35:43 +00:00
dd440c22c1
rename MIDI "Fork" operation to "Unlink from other copies"
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13053 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-17 14:10:45 +00:00
Carl Hetherington
25e5bfd17e
Rename Editor::duplicate_dialog to Editor::duplicate_range
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-04 21:31:06 +00:00
1f440fbfec
Remove unused or unnecessary header includes
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12905 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:09:51 +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
f1505b631d
substantive change to try to provide some rationality for region gain line visibility (and automation line visibility in general
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12478 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-29 18:30:10 +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
Carl Hetherington
e932cc7179
More tweaks to naming some actions ( #4879 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12319 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-17 11:02:42 +00:00
Carl Hetherington
c3508622f4
Use Later / Earlier in descriptions of nudging and some playhead movements, instead of Forward / Backward ( #4879 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12314 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-16 23:03:47 +00:00
Carl Hetherington
a2897ecef6
Fairly major change to the way in which crossfades are handled;
...
they are now done with region fades, rather than separate objects.
After this commit, Ardour will try to convert your session files
to the new crossfade format, but will make a backup in your
session folder first.
If you have works in progress using Ardour 3 it is
***STRONGLY RECOMMENDED*** that you back up session files before
updating to this commit.
git-svn-id: svn://localhost/ardour2/branches/3.0@11986 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-16 16:32:22 +00:00
8b03f1790a
fix twice-used name "Editor" for action group
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11706 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-16 16:50:35 +00:00
Ben Loftis
b4999fbc14
remove menu items from the keybindings dialog
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11654 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-12 19:24:16 +00:00
b02e95f201
make region gain line visibility global, not per-region
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11492 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-15 14:03:19 +00:00
ed62609e80
support a grid of beats/64 and beats/128
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11490 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-14 22:15:25 +00:00
671ec99bac
(1) remove magic number voodoo when saving zoom focus/snap settings to instant.xml etc. (this has a minor breaking-behaviour for existing sessions etc (2) keep track of grid type/settings in and out of note edit mode and switch back and forth, thus allowing independent grids while working at the note or region level
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-13 14:34:21 +00:00
c21c9e6662
use button joiner for smart mode; polish up the visuals on the joiner a bit
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 18:31:10 +00:00
2d015c0610
MIDI event list editor improvements, mostly to do with nagivation, but also edits are now applied across all selected notes. getting close to calling this done for 3.0
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11418 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-01 20:11:57 +00:00
f3624c1874
exit internal/note edit mode when clicking on anything that is not a MIDI region view or a note (or various modeless items like markers and the playhead)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11333 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 16:20:31 +00:00
24978033ef
tweak up the region context menu quite a bit
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11285 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-20 15:53:41 +00:00
efab36a85e
new mouse mode (Draw (notes)); switch into internal mode when draw is selected; notably improve use of dbl-click to enter and exist internal/note edit mode
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11269 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-19 15:23:51 +00:00
976e163406
make insert-patch-change from context menu use context click event for position ( fixes #4570 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11113 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 01:50:34 +00:00
75a3964c10
add a new name for the region-layering-editor-action that tells us we were started from a context menu; dialog does not position correctly on first show... grrr. should end fix of #4588 , mostly
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11083 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 23:38:56 +00:00
96ae97ddcb
preparations for using ardour's own keybinding system for the editor (not actually used)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10841 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-30 15:29:53 +00:00
Carl Hetherington
23964284a4
Hopefully fix some i18n bugs ( #3565 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-28 19:46:30 +00:00
Carl Hetherington
357faa72fb
Fix capitalisation.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10736 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 17:33:41 +00:00
Carl Hetherington
9355226fdf
Use the word Remove consistently for the remove regions
...
action, instead of the word Delete in the menu item and
Remove elsewhere.
git-svn-id: svn://localhost/ardour2/branches/3.0@10622 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 18:32:42 +00:00
Carl Hetherington
1362ac2046
Ellipsis on Quantize option.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10582 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-14 13:44:13 +00:00
f96ccb1958
ardour-button-ize zoom buttons; move MIDI panic button to transport bar
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10528 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-10 18:04:34 +00:00
6449c2e5c8
more ardour-button-ization; fix transparency of selection rects; use "correct" cursors when entering and leaving selection rect handles; color tweaks for a few buttons
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10527 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-10 15:25:01 +00:00
bd1d705498
add new editor actions for solo, mute, solo-isolate toggle (of selected tracks) for use by MIDI bindings
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9990 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-14 16:01:07 +00:00
