Ben Loftis
c1166c9f63
fix thinko with split selections. also ignore follow_edits when we are splitting, because the playlist freeze and the newly added regions cause the playhead to jump to unexpected locations
2014-07-08 15:00:19 -05:00
Paul Davis
fcabd5d8ee
initial implementation of "bring all media into session folder". Incomplete but basically functional for audio files
2014-07-08 00:53:13 -04:00
Ben Loftis
db60bc86b8
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-07-06 12:57:36 -05:00
Ben Loftis
0b38d65dd0
new approach to selections which will help rationalize Split and similar functions. Object and Track selections are now mutually exclusive. a split will happen at (a) selection->regions (b) the intersection of edit_point and selection->tracks or (c) the region under the mouse, IFF nothing else is selected.
2014-07-05 20:47:43 -05:00
Ben Loftis
62c3638a42
further rationalization of the editor. after a split, ardour was switching the tool to object mode. this is the only place were ardour switched the tool for the user. that has been removed. Delete operation should not depend on the mouse mode, but rather the existence of selections. this solves the problem where you have selected regions in smart mode, but cant delete them because the mouse is in the top half (fange mode) of a track
2014-07-05 18:27:38 -05:00
Paul Davis
ba8898bd5f
add new regions created by split to selection after operation is complete
2014-07-03 19:43:35 -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
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
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
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
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
Robin Gareus
c52cb37bf2
suspend route redisplay for (rec-en, solo, mute and monitor) batch changes
2014-06-29 02:52:56 +02:00
Robin Gareus
4a7eb62bf8
use state Session::StateProtector
2014-06-28 22:02:20 +02:00
Paul Davis
c706b1c4bb
replace old implementation of Editor::_ensure_time_axis_view_is_visible() with the guts of Editor::ensure_track_is_visible(), then remove the latter.
...
Also change all users of ensure_track_is_visible() to use _ensure_time_axis_view_is_visible()
2014-06-27 10:49:05 -04:00
Robin Gareus
a3c378cf62
move utility functions into a dedicated namespace
2014-06-25 21:47:54 +02:00
Paul Davis
4b515c178c
remove unused code
2014-06-25 13:37:59 -04:00
Paul Davis
6998cb1f13
part two of: lock dialog MUST be a Gtk::Dialog so that it does not forward key (or other) events to the Editor
2014-06-25 12:10:56 -04:00
Paul Davis
036740b0c8
check UIConfig variable before restarting lock timeout
2014-06-25 11:34:58 -04:00
Paul Davis
d5ef8f5f1e
new timer-based GUI locking code
2014-06-25 08:28:36 -04:00
Paul Davis
1945260cd6
there's no me in proaudio
2014-06-24 12:48:24 -04:00
Paul Davis
6a4a294167
a bit more styling for that lock dialog
2014-06-24 11:26:21 -04:00
Paul Davis
a12f43fa46
add a modal lock dialog for better testing (and someone might find it useful, too)
2014-06-24 10:14:07 -04:00
Paul Davis
f147846863
add ability to save current action sensitivities and restore them, and to disable all action sensitivity.
...
This is needed to be able to lock the application fully on OS X, where the global menu bar would still allow interaction
even when a modal dialog is displayed.
2014-06-24 09:56:16 -04:00
Paul Davis
c30bda5173
a set of inter-related subtle changes to get vertical autoscrolling to work, or at least work better.
2014-06-17 08:08:14 -04:00
Paul Davis
9461fcb271
remove header file includes of now-removed gtk custom ruler
2014-06-12 00:18:58 -04:00
Paul Davis
18190eaa5e
clamp zoom level to show 3 days on a 4000 pixel wide screen; comment unused variable for now
2014-06-11 23:54:28 -04:00
Paul Davis
0c5dae881c
fix up fit-selected-tracks so that we are filling the trackview area, not the entire canvas (which now includes rulers)
2014-06-09 09:08:51 -04:00
Paul Davis
e0533e9dd7
more profound changes to canvas scrolling, in particular find appropriate ScrollGroup for Canvas::{window,canvas}_to_{canvas,window}()
2014-06-03 16:13:12 -04:00
Paul Davis
24537477c4
fix up operation of Editor::temporal_zoom_to_frame() which had not been updated since samples_per_pixel was changed to an integer (framecnt_t)
2014-05-28 12:18:37 -04:00
Robin Gareus
a0037ee2d8
fixup freeze operation.
...
since rev. 1e3a955
2014-05-26 07:00:00 +02:00
Colin Fletcher
46fa5c9397
Don't clear the clipboard when deleting things
...
Deleting regions (or ranges, or anything) shouldn't affect the contents of
the clipboard - only CutCopyOp::Copy, CutCopyOp::Cut and CutCopyOp::Clear
should do that.
2014-05-16 01:03:37 +01:00
Colin Fletcher
d75c7151d4
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-05-07 19:46:24 +01:00
Paul Davis
38125d60c9
"sequence regions" operation (remove space between selected regions) added, c/o Thomas Brand
2014-04-29 00:11:05 -04:00
Paul Davis
343b06d8d3
dramatic change in logic and naming for operations related to adding a MIDI region on demand and cloning/unlinking
...
Existing code would cause data loss due to creation of two Source objects referring the same path, one with removable flags and one without. Careful code review suggested a variety of thinkos, function naming problems and other confusion that caused this. I have tried ot extensively comment what is going on with these operations, because it is one key area in which MIDI differs from audio: with audio, capture is the only way to add a new audio region, but for MIDI there are GUI input events that can add a new region.
2014-04-14 02:17:30 -04:00
Robin Gareus
87c777450b
prepare for the day when there can be TimeAxisView's that are not RouteTimeAxisViews.
2014-03-23 03:11:08 +01:00
Paul Davis
65b4308c84
first pass at quantizing vertical scroll to whole tracks.
...
Dragging regions vertically does the quantization BUT speed control is lacking and the region ends up on
a track that is still invisible ... to be fixed as the sun rises.
2014-03-21 07:02:32 -04:00
Paul Davis
977f2b35df
severe rationalization (still incomplete) of behaviour of cut + copy.
...
Quite a bit more to do here to make this as intuitive as it ought to be.
2014-02-26 10:51:38 -05:00
Paul Davis
c04285addf
convert canvas_event_frame() and window_event_frame() to canvas_event_sample() and window_event_sample() to go along with the convention adopted in cairocanvas code re: frames+samples
2014-02-26 08:43:53 -05:00
Paul Davis
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
Paul Davis
393ff40153
reduce the maximum horizontal zoom to 1 day @ 48kHz == 1600 pixels, to try to stop memory allocation issues when zoomed out further
2013-12-31 15:19:39 -05:00
Paul Davis
ea1ccb869a
fix merge with master
2013-10-31 13:16:51 -04:00
Robin Gareus
98f53d11b3
fix midi quantization - part one
...
subtract offset if region was truncated at the beginning.
2013-10-23 01:25:46 +02:00
Paul Davis
664e715a00
merge from master
2013-10-22 15:29:44 -04:00
nick_m
5b62e88fbf
Unify editor / mixer ordering.
2013-10-21 00:19:43 +11:00
Paul Davis
e5888d3983
merge with master and fix 2 conflicts
2013-10-16 22:06:56 -04:00
John Emmas
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
John Emmas
f8574fc39d
'gtk2_ardour' - Add namespaces + casting where necessary + general bits of 'correctness' to keep MSVC happy
2013-10-03 09:06:56 +01:00
Paul Davis
960a47330a
switch from JACK_Slave to Engine_Slave
2013-09-19 17:34:23 -04:00
Robin Gareus
59a3b797d7
fix compiler warnings.
2013-08-08 15:26:16 -04:00
Robin Gareus
cd28d62b26
fix compiler warnings.
2013-07-28 20:32:52 +02:00
