Commit graph

269 commits

Author SHA1 Message Date
VKamyshniy
3157d4f5ea [Summary] Progressing the global tracks drop down. 2014-09-24 15:14:26 +03:00
Paul Davis
b6b8b892c2 add action and menu item to control use of skip playback 2014-09-17 16:29:37 -04:00
Paul Davis
2867fa20f3 add icons (with pre-rendered text) for add marker + global tracks button, tweak arrangement of upper right of arrange view, make add marker button work 2014-09-07 09:37:37 -04:00
Paul Davis
7219e57c2a add required action for skip bar, and make visible by default 2014-09-05 16:52:08 -04:00
Paul Davis
9c610f1368 enable punch bar display and remove duplicate lines 2014-09-05 14:17:04 -04:00
Paul Davis
250fe06ec7 add Editor::_tool_cut_button to refer to button defined in ui/editor_window.xml and connect it to cut/split tool functionality 2014-09-03 21:14:13 -04:00
Ben Loftis
7d0bfeadd8 Add some new zoom-to-selection actions, so zoom tool is less needed.
Reverse order of items in the zoom menus to match Ardour.
Consolidate the extra zoom math into a function;  this fixes a problem in zoom-to-session.
2014-08-18 12:42:16 -04:00
Ben Loftis
be2a3d6efc remove EditAtSelectedMarker for Mixbus, to match mb2. (also fix an existing thinko in the edit point selection actions) (oops: also fix previous track selection fix so that it pays attention to the selection property of the group) 2014-08-18 11:46:10 -04:00
Paul Davis
10becc1411 add "fade range" operation, bound to alt-f at present by default 2014-08-17 21:00:59 -04:00
Paul Davis
3b0ce4038e initial implementation of "bring all media into session folder". Incomplete but basically functional for audio files 2014-08-17 20:43:49 -04:00
Paul Davis
b18b3b850b add basics of Cut mouse mode, no functionality yet. Icon images are still required
Conflicts:
	gtk2_ardour/editor.cc
	gtk2_ardour/editor_actions.cc
2014-08-17 20:41:07 -04:00
Ben Loftis
2db9d6bc19 remove some cruft with previous commits. remove option link-region-and-track-selection since they are now exclusive, and rename select-all-regions to select-all-objects to match the implementation 2014-08-17 20:39:24 -04:00
Ben Loftis
2e3acae230 now that track and region selections are mutually exclusive, you need a separate action to select-all-tracks and select-all-regions. also, preserve region selection during a split, iff we are working on a region selection: only add the newly created regions, dont change anything else in the selection; leave that in control of the user 2014-08-17 20:38:04 -04:00
Ben Loftis
37bece765d Q and W jump between markers. this puts them right next to Tab which creates and deletes markers. numpad left/right arrows are an alternate action for this 2014-08-17 20:37:50 -04:00
Paul Davis
8ccc74b279 rename the action that cycles through edit modes, since there are more than two 2014-08-17 20:36:25 -04:00
Ben Loftis
a15ab33edf 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
Conflicts:
	gtk2_ardour/ardour_ui.cc
2014-08-17 20:35:46 -04:00
Ben Loftis
4dca4a7f7e start-range and finish-range should graphically show the range being created. also add bindings for comma and period in addition to existing bindings which require a numpad. the old ones are now alternates. all primary functionality should appear on the qwerrty, and the numpad should be considered an ergonomic redundant alternative if you have one 2014-08-17 20:34:30 -04:00
Ben Loftis
fa2f8876ea splice mode is undefined, undocumented, and buggy. ripple does most of what we want. remove splice for now. leave code because it may be revived later 2014-08-17 20:33:04 -04:00
Robin Gareus
a17616f1da move utility functions into a dedicated namespace
Conflicts:
	gtk2_ardour/about.cc
	gtk2_ardour/editor_ops.cc
2014-08-17 18:51:22 -04:00
Tim Mayberry
dbcc1f1d39 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.

Conflicts:
	gtk2_ardour/about.cc
	gtk2_ardour/session_dialog.cc
	libs/pbd/system_exec.cc
2014-08-17 18:36:02 -04:00
Colin Fletcher
80f04cc298 Ripple mode: basic implementation
Add a value for Ripple to EditMode enum.

Add Ripple edit mode to edit mode dropdown, by adding it to the
Editor::build_edit_mode_menu() helper function, and remove the old code that
added items to the (now unused) Editor::edit_mode_strings.

Add the regions that should be affected by the drag to RegionDrag::_views so
that the drag carries them along automatically.

Use a copy of the RegionList in Playlist::core_ripple(), since bad things
happen when iterating over regions and they get moved around in the list.

Handle rippling in removal of regions from playlist.

When dragging in ripple mode, exclude all regions that lie before the
original start position of the selected regions being dragged from
rippling: this is what Mixbus does.

Make editor dragging respect snap-to settings, by using the existing
compute_x_delta() function, which did almost the right thing. Move setting
of _last_frame_position out of that function so all ripple-dragged regions
can move.

Ripple when dragging from region list: even though Mixbus doesn't do this, it
seems like a good idea.

Prevent multi-track selection being dragged across tracks, by making
RegionMotionDrag::y_movement_allowed() virtual, and overriding it in
RegionRippleDrag to forbid dragging of selections containing regions on more
than one track to dofferent tracks in ripple mode.

Remember which TimeAxisView a ripple-mode drag that's allowed cross-track
drags started from, so that the effect of rippling regions after any region
that's dragged off that track can be undone.
2014-08-16 16:36:03 -04:00
Paul Davis
a7f5d7a94d correctly set up ruler preferences for get_trx() == true case 2014-08-16 16:16:07 -04:00
Paul Davis
e08ec37f69 "sequence regions" operation (remove space between selected regions) added, c/o Thomas Brand 2014-08-16 16:10:38 -04:00
harrison
c7d4ce1399 cherry-pick b9708d5f6b, then manually resolve conflicts (thanks git rerere) 2014-08-15 22:06:18 -04:00
Paul Davis
149e6dcea6 add "lock" action to provide action-based access to Editor::lock() 2014-07-01 11:51:02 -04:00
Valeriy Kamyshniy
0089053814 [Summary] Rearranging transport toolbar and other tools in editor window
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 461983]
2014-05-20 09:12:48 -05:00
Valeriy Kamyshniy
13c6005d95 [Summary] Reordering TRACKS top bars
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 461616]
2014-05-19 08:59:24 -05:00
Grygorii Zharun
ce2a519afa [Summary] Merging from GIT
[Details] Starting point:
Mar 24 2014, 11:47 PM
Commit: 87184ab80d

Target point:
Commit: 59e6694405
Apr 16 2014, 4:01 PM

[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 453690]
2014-04-18 04:21:54 -05:00
Robin Gareus
bf0157a0f2 the forgotten second (amend to prev commit) 2014-02-25 12:01:14 -05:00
Robin Gareus
e3529b3b11 fix prev_snap_choice() key="3" binding 2014-02-25 12:01:13 -05:00
Paul Davis
d00dc6a706 various work to make loop/punch display work better (including fixes for bugs present in master also) 2014-01-27 21:27:13 -05:00
Paul Davis
f00b3b7f11 merge with master 2013-06-13 23:00:24 -04:00
Robin Gareus
d7e336e0f2 s/Framenumber/Frame number/ 2013-06-14 00:41:02 +02:00
Robin Gareus
6b480bb2f7 vtl: make "Remove Video" insensitive if N/A 2013-06-13 00:58:19 +02:00
Robin Gareus
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
Robin Gareus
66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +02:00
Paul Davis
8eef4b1904 master merge; new files not added after initial cairocanvas patch application 2013-04-05 17:16:33 -04:00
Paul Davis
aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00
Robin Gareus
1040801ffe vtl: video-monitor letterbox & orig-zoom to menu 2013-04-04 01:05:49 +02:00
Robin Gareus
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
Robin Gareus
0c3e840700 videotimline
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
Robin Gareus
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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