Commit graph

14504 commits

Author SHA1 Message Date
Ben Loftis
043b76569d fix the naming and behavior of always-play-range to match the button, which is follow-edits. when you select a range, the playhead should jump to the start of the range and begin to play the selection. BUT (unlike previous implementation) if the user wants to relocate the playhead, then that should be allowed. The user should always remain in charge of the playhead location. NOTE: your previous config setting will be invalidated. You must re-save a session to overwrite with the new config variable 2014-07-03 12:56:33 -05:00
Paul Davis
53a5f5d8ca actually do something in WaveView::region_resized() which is called whenever the region is resized; implement WaveView::set_region_start() which could be used by an xfade editor etc. 2014-07-03 10:00:12 -04:00
Ben Loftis
a1c8e67e50 add a method to cancel a pending play_range. this is needed when we are modifying the range with keyboard commands. 2014-07-02 17:35:38 -05:00
Ben Loftis
0f1c7b1d71 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-07-02 17:35:37 -05:00
Robin Gareus
007664c3db unique filenames across all searched folders 2014-07-02 23:36:06 +02:00
Robin Gareus
77e716943f round A/V offset to video-frames. 2014-07-02 23:36:06 +02:00
Paul Davis
3c2c048f40 reinstate same logic, slightly differently implementedm, for choosing range/object mode when pointer is in smart mode and in a track but not in a region 2014-07-02 16:23:46 -04:00
Paul Davis
3dbf37eab7 simplify zooming, remove Editor::clamp_samples_per_pixel(), fix getting "stuck" at max and min zoom levels 2014-07-02 15:53:24 -04:00
Paul Davis
4c79d35838 remove unused "zoom range clock" from code as part of zoom simplifications 2014-07-02 14:56:36 -04:00
Paul Davis
976f006cc0 display key name when debugging keyboard/accel stuff 2014-07-02 12:54:49 -04:00
Paul Davis
bc3559925a allow escape key to work 2014-07-02 12:54:49 -04:00
Ben Loftis
3047919833 remove implicit range. start-range and end-range work better. documentation changes coming soon 2014-07-02 09:18:31 -05:00
Ben Loftis
190542c1d0 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-07-01 16:43:00 -05:00
Colin Fletcher
960e5a3c7c Ripple mode: ripple all after start of first selected region
Ripple drags should affect all regions which start at or after the
beginning of the first selected region, not just those which start after
its end.
2014-07-01 20:43:34 +01:00
Colin Fletcher
264c62eb26 Ripple mode: remove debug output
Remove std::cerr output, and tidy up a couple of comments.
2014-07-01 20:43:34 +01:00
Paul Davis
3f112f17c0 remove debug output 2014-07-01 15:11:09 -04:00
Paul Davis
0a87bbc37b add partial support for mute automation (playback does not work, data is not recorded in the session) 2014-07-01 14:37:05 -04:00
Paul Davis
e3a6ea0273 give drop zone its own cursor-ability 2014-07-01 14:37:05 -04:00
Colin Fletcher
e5e12acc56 Merge branch 'ripple-mode-cc' into cairocanvas
Fix up merge conflicts in
	gtk2_ardour/editor_mouse.cc
	gtk2_ardour/editor_ops.cc

Also fix up compile errors.
2014-07-01 19:10:47 +01:00
Colin Fletcher
da65f3778c Fixes for ripple mode drag
Make undo of ripple mode dragging work a bit better, and hopefully prevent
rippled regions from jumping about when being dragged.
2014-07-01 18:46:13 +01:00
Colin Fletcher
cabd3783fe Ripple mode: fix undo of paste
Fix undo of region paste operations in ripple mode.
2014-07-01 18:38:14 +01:00
Colin Fletcher
83ae6beca5 Remove unused code
This code was changed to implement ripple mode, but meanwhile it was
removed altogether in cairocanvas. Remove it here too to simplify merging.
2014-07-01 18:38:13 +01:00
Paul Davis
23e7cf1019 merge with master.
Manually resolved conflicts in import.cc and session.cc
2014-07-01 09:46:18 -04:00
Robin Gareus
4244ea6546 left-align all pref/option labels for consistency. 2014-07-01 14:52:35 +02:00
Paul Davis
b47c20783d (hopefully) fix smart-mode breakage of xfade operations
We needed to set the selected regionview from a click when clicking on xfade items, but I also removed duplicate logic for some similar items
2014-06-30 19:18:34 -04:00
Paul Davis
dff73d34d9 move draggable playhead to editor tab of preferences 2014-06-30 19:18:34 -04:00
Robin Gareus
d790881a84 remove cruft 2014-06-30 22:58:09 +02:00
Robin Gareus
0ec4784c2b change default take-name 2014-06-30 22:58:08 +02:00
Paul Davis
e8fc8aa992 new UI config var to allow playhead to be optionally draggable (default is: yes, it can be dragged) 2014-06-30 16:32:38 -04:00
Paul Davis
d816c225a4 more extensive canvas debug message for canvas-enter-leave tracing 2014-06-30 16:32:01 -04:00
Paul Davis
79b9a044b8 add event-insensitivity to the list of conditions that causes a container to NOT add its children to the list of items-at-point 2014-06-30 16:31:31 -04:00
Paul Davis
7b8fd17719 make canvas drop sensitive to scroll events 2014-06-30 14:47:57 -04:00
Paul Davis
89f673a7a7 context click over a trim handle is semantically equivalent to a context click on the xfade 2014-06-30 13:58:46 -04:00
Paul Davis
5165bf241d new region base color 2014-06-30 13:58:46 -04:00
Paul Davis
416abf7f1c ensure that Editor::entered_track is reset during session deletion to avoid a crash when we explicitly unset it elsewhere 2014-06-30 13:58:46 -04:00
Robin Gareus
156f01cda6 fix bae86a2d - retain default values
set element values before calling update()
2014-06-30 19:01:28 +02:00
Robin Gareus
bae86a2d90 Disallow empty names for Groups, automatically enumerate them 2014-06-30 18:33:05 +02:00
Paul Davis
26ba90815b move Opaque and Mute into region Gain submenus (both main menu bar and context menus) 2014-06-30 11:16:18 -04:00
Paul Davis
1f695014b4 protect use of iterators across routeUI selection when operations change the selection (e.g. deletion) 2014-06-30 11:02:23 -04:00
Paul Davis
890ea91920 change default timeline item gradient depth and waveform gradient depth 2014-06-30 10:57:59 -04:00
Paul Davis
8b7a7a1943 always take verbose cursor clock mode from primary clock (finally!) 2014-06-30 10:47:49 -04:00
Paul Davis
87208333ef new default color for inactive group tab 2014-06-30 10:43:29 -04:00
Paul Davis
4eb565e0a9 verbose cursor text is always outlined 2014-06-30 10:39:41 -04:00
Paul Davis
5974f4730b allow Canvas::Text to have outline drawn in a contrasting color (based on actual color) 2014-06-30 10:39:26 -04:00
Paul Davis
471570705d move contrasting_text_color() into ArdourCanvas 2014-06-30 10:38:45 -04:00
Paul Davis
4c1f4011fd make verbose cursor respond dynamically to theme changes 2014-06-30 10:38:03 -04:00
Paul Davis
a0e399f7dd make inactive group tab color be themeable and update it dynamically 2014-06-30 10:14:06 -04:00
Paul Davis
4df566782c remove canvas cursor debug output 2014-06-30 09:20:26 -04:00
Paul Davis
a9b3361081 use Editor::effective_mouse_mode() inside Editor::button_selection(); clean up special-case of fade in/out handles and mouse mode 2014-06-30 09:17:03 -04:00
Paul Davis
33339090c3 invisible items/containers should not add their children to "items-at-point" 2014-06-30 08:32:26 -04:00