ardour/livetrax
13
0
Fork 0
Code
25,229 Commits 1 Branch 1 Tag 199 MiB
b98969be94
Commit Graph

75 Commits

Author SHA1 Message Date
Robin Gareus
eb2af9e28d Remove some debug output (gtk2_ardour) 2017-08-06 14:50:45 +02:00
Tim Mayberry
7cb78301eb Use XMLNode::get/set_property API in Keyboard class 2017-04-19 09:36:56 +10:00
Robin Gareus
2513aad1ed Remove duplicate msg (load_keybindings also prints an info) 2017-04-01 19:16:12 +02:00
Robin Gareus
a57914ed50 Another fix to reset keybindings: 
Don't carry previously set global keybindings_path.
 2017-04-01 19:16:12 +02:00
Robin Gareus
3864f2c32c Version keybindings file. 
Allow to run both Ardour 5.5 and later (changed bindings name)
with the same config folder.

Like with .color files, custom .keys files won't be taken into account
when updating to a new version.

This is mostly a stopgap solution. Eventually we'll have to come up with a
merge&prune mechanism for bindings or maintain a separate version for
these files. Hopefully some better idea will come up...
 2017-02-17 00:59:48 +01:00
Robin Gareus
ff2f224d0c Add keyboard option reset 2016-12-31 19:36:15 +01:00
nick_m
f6eac26a98 Choose some non-overlapping defaults for User Interaction modifier keys. 2016-08-14 03:04:54 +10:00
nick_m
4eba9b8638 Resolve potential ambiguity between the constraint modifier and the copy modifier when beginning a drag. 2016-08-14 03:04:54 +10:00
nick_m
c62026b567 Ensure RelevantModifierKeyMask is updated on each modifier change. 
- fixes bug where changing prefs in User Interaction
	  only took effect on restart.
 2016-08-14 03:04:54 +10:00
Paul Davis
cf52d6e4b4 enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h 2016-07-14 14:45:23 -04:00
John Emmas
ec8a840b1a Fix bug 6833 in bugzilla 
http://tracker.ardour.org/view.php?id=6833

When searching for our keyboard bindings file, ArdourKeyboard::find_bindings_files() was trying to find files with the wrong extension:- "..keys" rather than ".keys" (note the extra period). Fortunately, some later code was masking the problem (so we were eventually finding the file correctly). However we might as well fix the problem here, just in case we ever need to call ArdourKeyboard::find_bindings_files() from somewhere else in the future.
 2016-05-08 12:06:12 +01:00
Paul Davis
17ace643e4 OMNIBUS COMMIT: prefer const XMLNode::property method (and provide a real one) 2016-05-04 23:09:45 -04:00
Paul Davis
56770ff0af change GTKOSX macro constant to use __APPLE__ instead 2016-02-22 15:31:25 -05:00
Paul Davis
6991a07902 remove all trace of SAE from source code. 
This had become incoherent over time, and posed a development hazard and burden going forward
 2016-02-22 15:31:24 -05:00
Paul Davis
589f2a1ab8 change suffix of keybinding files to ".keys" to avoid conflict with earlier versions. 
Move some code around that should never have been inside libs/ardour to begin with.
 2016-02-22 15:31:24 -05:00
Paul Davis
3ff925fedb change name of default bindings to us.bindings (and thus binding definitions to us.bindings.in) 
"us" indicates keyboard layout.
 2016-02-22 15:31:24 -05:00
Paul Davis
6e55812535 use Bindings API for binding replacement 2016-02-22 15:31:23 -05:00
Paul Davis
2c6799f247 changes to support new key bindings editor design 2016-02-22 15:31:23 -05:00
Paul Davis
a13a8da8ac switch all action registration/binding code over to new API. 
This removes the ability to change bindings via menus.

Still to come: saving modified bindings, and reworking the key editor
 2016-02-22 15:31:23 -05:00
Robin Gareus
c22a899c6d OSX copy/constraint mod tweak (amend 0675fe1) 2015-10-20 17:57:00 +02:00
nick_m
e6b35d2cdd Fix snap modifier logic (again). 2015-10-20 00:53:30 +11:00
nick_m
231acfe191 ArdourKeyboard - fix snap / delta logic for triple modifier combinations. 2015-10-20 00:53:30 +11:00
Paul Davis
4dc63966f0 globally remove all trailing whitespace from ardour code base. 
Paul Davis was responsible for introducing almost all of this.
 2015-10-04 14:51:05 -04:00
Robin Gareus
4a1f5c7f28 GUI part of memleak fixes 2015-09-12 20:05:46 +02:00
nick_m
9a55bcb04f Rekative snap - add comments 2015-05-24 01:10:06 +10:00
nick_m
ea8b5a970f Bring back contrained drag modifier with preference setting. 
- this should work as before, but when applied to a button 1 drag,
	  the constraint is in the first direction travelled.
 2015-05-23 05:36:03 +10:00
nick_m
224b85d038 Appease Our Dear Leader 2015-05-22 02:31:25 +10:00
nick_m
b7348bf4f5 Fix excessive use of logic. 2015-05-22 02:20:51 +10:00
nick_m
eaf49f02ff Fix up modifier behaviour 
- its now possible to use snap modifiers in combination with others
	  afaict this hasn't worked for some time.

	- use "contains" rather than "equals" during drag. Still uncertain
	   about this wrt beginning a drag. for now they are all "equals".

	- probably solve the "snap modifier modifier" problem using
	  ArdourKeyboard::indicates_snap () and friend.
 2015-05-22 02:12:58 +10:00
nick_m
186736043c Move ui-centric modifiers into ArdourKeyboard, set some bad defaults. 
- Also makes "Mod4" Appear as "Windows" and adds new combination
	"Alt-Windows" to the dropdown.
	- Attempt to set a pair of default snap modifiers (without
	knowing what it actually is for OSX)
	- Copy modifier now saves
	- Snap modifier modifier problem still remains.
 2015-05-21 05:32:23 +10:00
Paul Davis
6cadefcb19 use lower-case PROGRAM_NAME for user bindings file name 2014-07-10 11:01:21 -04:00
Ben Loftis
555a5d6348 lots of keybinding changes. added a new action to allow removing markers at the playhead location. numpad now allows you to access marks higher than 9. to locate to a marker, use the numpad decimal to start and end the operation - for example press .19. to locate to marker 19. also added alternate bindings for redo, delete, and several other alternates that will be needed in subsequent commits. tab is not working, using either Tab or nabla in the binding.in file 2014-07-03 17:50:14 -05:00
Tim Mayberry
cd12698b9c Rename PBD::find_file_in_search_path to just PBD::find_file 
saves a bit of typing and not necessary if you look at how it is used.
 2014-06-25 12:40:10 -04:00
Tim Mayberry
218b63cc37 Use std::string and Glib::build_filename in gtk2_ardour 
git-svn-id: svn://localhost/ardour2/branches/3.0@12903 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-23 05:09:46 +00:00
Tim Mayberry
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
Paul Davis
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
4bd5287980 Save user key bindings to the right place. Fixes #3773. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8854 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-02-15 13:48:50 +00:00
Paul Davis
44f4b84551 finalize PROGRAM_NAME change for ardour3 
git-svn-id: svn://localhost/ardour2/branches/3.0@6759 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-03-15 02:31:27 +00:00
David Robillard
b5148d93d5 Add keyboard shortcut to tooltip text where possible. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6657 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-02-09 00:50:24 +00:00
Paul Davis
7703f0a76a move generic parts of Keyboard into gtkmm2ext. imperfectly done, but makes modifiers available in libgtkmm2ext now 
git-svn-id: svn://localhost/ardour2/branches/3.0@6288 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-04 22:51:32 +00:00
Paul Davis
67601c6c50 fix stupid MIDI::Manager design to properly handle multiple MIDI ports with the same "device" specification 
git-svn-id: svn://localhost/ardour2/branches/3.0@6079 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-13 19:50:39 +00:00
Paul Davis
ff9ddf5100 tidy up (a bit) locations editing widget ; use pixbuf/string code from 2.0;remove edit point clock 
git-svn-id: svn://localhost/ardour2/branches/3.0@6074 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-12 20:39:53 +00:00
David Robillard
20eb826764 Use info stream for infoey things. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5867 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-22 20:36:38 +00:00
David Robillard
bc56eb8bd7 Fix unused parameter warnings since GCC apparently doesn't feel like listening to -Wno-unused-parameter 
git-svn-id: svn://localhost/ardour2/branches/3.0@5835 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-21 00:15:42 +00:00
Paul Davis
8713667ec1 rework Stateful::set_state() patch to avoid default version argument 
git-svn-id: svn://localhost/ardour2/branches/3.0@5787 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-15 18:56:11 +00:00
Carl Hetherington
79f91c7a20 Part 1 of loading 2.X sessions; some things work, some things don't, hacks a-plenty. 
LOADING 2.X SESSIONS WITH THIS COMMIT IN PLACE WILL (PROBABLY) CORRUPT THE .ardour FILE,
MAKING THE SESSION UNLOADABLE ON 2.X AND LOSING INFORMATION.

So don't do that unless you make a backup of the session file first.



git-svn-id: svn://localhost/ardour2/branches/3.0@5786 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-15 00:57:55 +00:00
David Robillard
bb9cc45cd2 Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. 
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red.  I don't know the emacs equivalent...


git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-14 16:10:01 +00:00
Paul Davis
8aa1dfca05 visual state patches from 2.X 
git-svn-id: svn://localhost/ardour2/branches/3.0@5712 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-01 20:52:07 +00:00
Paul Davis
3845af6ce9 lots of MIDI editing stuff. to be explained on the website when its done 
git-svn-id: svn://localhost/ardour2/branches/3.0@5596 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-27 03:09:30 +00:00
Carl Hetherington
b65f8073ba Fix some unused parameter warnings. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5403 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-07-21 15:55:17 +00:00