Commit graph

611 commits

Author SHA1 Message Date
Paul Davis
2f77f2bc69 removed no-longer-used Editor::track_canvas_motion()
Conflicts:
	gtk2_ardour/editor.h
2014-08-17 19:27:11 -04:00
Paul Davis
c1213d0040 use new ruler dialog class for context clicks on ruler labels area
Conflicts:
	gtk2_ardour/editor.cc
2014-08-17 18:48:40 -04:00
Paul Davis
8473bd72e1 remove unused code
Conflicts:
	gtk2_ardour/editor_ops.cc
2014-08-17 18:45:50 -04:00
Paul Davis
28fdc71d70 more canvas refactoring.
Remove Canvas::Layout, use Canvas::Container for the same purpose, move child-rendering into Item::render_children() so that it
could theoretically be used by any derived type.
2014-08-17 17:44:17 -04:00
Paul Davis
3be5f658ea use newly factored canvas in gtk2_ardour 2014-08-17 17:43:03 -04:00
Paul Davis
dc757ab7c1 fix conflicts caused by XML-ization of old 2-canvas design 2014-08-17 17:40:48 -04:00
Paul Davis
ad67a36d7d more work on cursor tracking state 2014-08-17 16:24:38 -04:00
Paul Davis
4d4851cffc a whole slew of changes related to centralizing and rationalizing cursor management.
Debugging output left in place to help address the reports that will come in as people test this more
2014-08-17 16:23:52 -04:00
Paul Davis
41526eec44 do most of the work related to adding new anchored trim cursors (but debugging/analysis continues) 2014-08-17 15:25:36 -04:00
Paul Davis
d9cee7a6d6 fix scrolling behaviour in track headers (event was stolen by rulers because event coordinates made it look as if the event happened there) 2014-08-17 15:24:46 -04:00
Paul Davis
01b84f0ad0 remove no-longer-used code 2014-08-17 15:09:15 -04:00
Paul Davis
f28348ea91 add canvas rulers event dispatch and reinstate scrolling behaviour 2014-08-17 15:09:05 -04:00
Paul Davis
e02dac67b5 remove header file includes of now-removed gtk custom ruler 2014-08-17 15:07:44 -04:00
Paul Davis
59ccbc8774 use canvas rulers now instead of gtk widgets
Some bugs that exist in master are still present.

Conflicts:
	gtk2_ardour/editor.cc
	gtk2_ardour/editor.h
2014-08-17 15:07:20 -04:00
Paul Davis
5fea87ead6 make the icon set selector actually do something
Conflicts:
	gtk2_ardour/editor.cc
2014-08-17 15:04:16 -04:00
Paul Davis
91702c2702 forward scroll events from track control headers to the canvas, to get consistent scroll behaviour (whatever that behaviour is)
Conflicts:
	gtk2_ardour/editor.cc
2014-08-17 15:00:07 -04:00
Paul Davis
e81e6841ff rename Editor::_canvas_bottom_rect as Editor::_canvas_drop_zone; increase its size; remove debug message 2014-08-17 14:58:19 -04:00
Paul Davis
525f2893f9 fix problem with calls to Editor::trackview_by_y_position() when using motion events. The coordinate passed in was in canvas space and the method expected trackview space
To handle any further issues like this, I generalized and added an optional argument specifying that the canvas=>trackview transform is required, thus
centralizing where this done.
2014-08-17 14:56:50 -04:00
Paul Davis
983cbeba6f reinstate a canvas group where we reparent regions while dragging, so that they are always on top.
I mistakenly removed this during the onecanvas changes.
2014-08-17 14:49:44 -04:00
Paul Davis
e8e3460665 more profound changes to canvas scrolling, in particular find appropriate ScrollGroup for Canvas::{window,canvas}_to_{canvas,window}()
Conflicts:
	gtk2_ardour/editor_mouse.cc
2014-08-17 13:43:52 -04:00
Paul Davis
3af66ff917 remove useless groups from timebar area, clarify scroll group naming in editor 2014-08-17 13:38:50 -04:00
Paul Davis
893452b388 remove timebar canvas and just use a single canvas instead. This is just part one - lots of minor fixes to be done
Conflicts:
	gtk2_ardour/editor.cc
2014-08-17 13:38:30 -04:00
Paul Davis
cb9453b475 different approach to independent scrolling, involving ArdourCanvas::ScrollGroup
The idea now is that a scroll group item can be added to the canvas which will causes its children to scroll in either or both
directions (horizontal or vertical). There are few complications: the position() of the ScrollGroup is ambiguous depending
on whether you want it with scroll taken into account or not, so Item::canvas_position() was added, which defaults to
the same value as Item::position() but is overridden by ScrollGroup to return the position independent of scrolling. This
method is used when translating between item/canvas/window coordinate systems.

Note that the basic idea is that we MOVE the scroll group when a scroll happens. This mirrors what happens in the GnomeCanvas,
where Nick Mainsbridge came up with a great idea that allowed unification of the time bar and track canvases.
2014-08-17 13:37:27 -04:00
Paul Davis
60bb0b5f58 substantive changes to the logic and safety for naming of (audio/MIDI) sources, especially when created via import
Conflicts:
	libs/ardour/import.cc
2014-08-16 18:02:22 -04:00
Robin Gareus
40ffd0600b towards region-trims preserving fade duration 2014-08-16 17:58:34 -04:00
Robin Gareus
4e55433457 update x-fade context-menu 2014-08-16 17:56:09 -04:00
Paul Davis
c752167ccc change return type of Editor::axis_view_from_route() 2014-08-16 16:56:28 -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
e08ec37f69 "sequence regions" operation (remove space between selected regions) added, c/o Thomas Brand 2014-08-16 16:10:38 -04:00
Ben Loftis
cbddc02511 cherry-pick 6bcee4e9 then manually resolve conflicts (via git rerere) 2014-08-15 22:07:59 -04:00
harrison
c7d4ce1399 cherry-pick b9708d5f6b, then manually resolve conflicts (thanks git rerere) 2014-08-15 22:06:18 -04:00
nikolay
6809921555 [Summary] Session auto save
[Reviewed] GZharun
2014-08-13 15:17:51 +03:00
nikolay
6270ee768f [Summary] Added menu item "Delete selected tracks". Refactoring of the RouteUI::remove_this_route(). Bug fix in top bar (set menu items "Move this track up/down" not selectable in case of Master was selected).
[Reviewed] GZharun
2014-08-13 11:21:11 +03:00
GZharun
7a410d5a45 [Summary] Refactored master ui according to requirements
[Details] Changed global MUTE button
Made Master UI selectable
Refactored "show master bus in the inspector" usecases
2014-08-13 10:43:03 +03:00
VKamyshniy
65035584c9 [Summary] Adding the TRACKs specific meter bridge view. 2014-08-11 12:56:58 +03:00
nikolay
faf47b3b78 [Summary]
1. Changed Ardour's random color generator to Tracks's
MixerStrip::palette_random_color()
2) Apply selected color to all activated routes
MixerStrip::color_button_clicked (WavesButton *button)
3) Set black default color to new added tracks
[Review] GZharun
2014-08-08 13:13:04 +03:00
GZharun
d1413f60a6 [Summary] Implemented use case to show and select master bus on MasterLevelMeter click 2014-08-05 16:18:08 +03:00
GZharun
6acabf15ce [Summary] Implemented master bus use cases for inspector track view
[Details] 1. Made master bus shownable in inspector when no track selected in StereoOut, StereoOut mode has just been enabled, or there is no tracks at all in StereoOut.
2. Made master bus hidden in MultiOut mode in any case.
2014-08-04 14:35:13 +03:00
GZharun
6f215a3537 [Summary] Added new track creation by double click under the list of tracks. Removed New Track menu appearance on the right click on the same region 2014-08-01 10:45:28 +03:00
VKamyshniy
0f3f0d0a4a [Summary] Implementing synchronously changed tracks/busses selection in the editor and embedded mixer bridge view. 2014-07-29 09:29:40 +03:00
VKamyshniy
f2251dd1c2 [Summary] Progressing UI 2014-07-28 11:06:02 +03:00
VKamyshniy
0ef3ed02c1 [Summary] Progressing UI 2014-07-27 09:36:49 +03:00
nikolay
281394cf91 [Summary] Alt+Click on horizontal fader to set its value to default
[Review] Nobody
2014-07-22 15:21:08 +03:00
VKamyshniy
dd51b638bc [Summary] Progressing embedded meterbridge 2014-07-20 18:02:36 +03:00
VKamyshniy
a5caa2778b [Summary] Progressing TRACKS Meter Bridge (invented name = compact meter bridge) 2014-07-19 18:32:45 +03:00
VKamyshniy
596e3b9140 [Summary] Progressing MASTER UI and occasional cleanup 2014-07-16 00:12:14 +03:00
VKamyshniy
44dcd48be4 [Summary] Progressing MASTER UI 2014-07-15 00:44:46 +03:00
VKamyshniy
3833e3b627 Merge branch 'master' of git.waves.com:waves/tracks 2014-07-04 18:04:39 +03:00
VKamyshniy
ebe7c829e4 [Summary] XML-izing MIXER STRIP UI 2014-07-04 18:00:45 +03:00
nikolay
f28dcaa77f [Summary] Implementation of the AUTO LOCK TIMER and minor improvement of session_lock_dialog
[Review] GZharun
2014-07-03 17:52:57 +03:00