13
0
Commit Graph

912 Commits

Author SHA1 Message Date
5799cb8509 Fix edit point selector on Mixbus. 2014-11-18 02:53:27 -05:00
2fa6caad95 Support cut/copy/paste of several regions and lines at once.
The idea here is to do the reasonable thing, and copy objects of some
type (e.g. MIDI region, gain line) to tracks with a matching type.  The user
can override this with a track selection, which will be used straight-up.

Lost: ability to copy/paste lines across types, e.g. gain to pan.  This is
often questionable, but sometimes useful, so we will need to implement some
sort of "greedy mode" to make it possible.  Implementation simple, but not sure
what to do.  Perhaps this should only be possible if one automation track is
explicitly (i.e. via track selection) involved, and the types are at least
compatible-ish?
2014-11-16 22:35:45 -05:00
d63161426f Add "maybe" rounding modes for rounding only if necessary. 2014-11-16 22:35:45 -05:00
fd9ccc7058 Use an enum for RoundMode instead of magic numbers.
No functional changes in this one (for easier auditing), but towards having
round up/down only if necessary modes, rather than kludging around that
situation with a double round as we do currently.
2014-11-16 22:35:45 -05:00
55ce10f498 NULL pointer dereference? 2014-11-17 03:58:05 +01:00
4a17f9e941 round control-scroll offsets towards zero
fixes MCU "Locate called for negative sample position"
2014-11-15 19:41:15 +01:00
31acd96384 Implement "multi-paste" for notes, regions, and automation.
The idea here is that pasting several times to the same location doesn't make
sense.  Instead, the paste is appended past the last paste, snapped to the
grid.  This make it simple to replicate a given section a number of times,
simply by copying once and pasting several times.

This behaviour only appears when successive pastes are done to the same
location (whatever the edit point is).  When the paste point changes, the
"multi-paste" state is reset.

Boots 'n cats 'n boots 'n cats.
2014-11-14 20:04:19 -05:00
6b3a8915f3 add abort() to non-reached code
This cleans up a lot of false-positives in static analysis
and also helps compilers to optimize code paths in general.
(tagging the fatal stingstream operator as ‘noreturn’ is
far less trivial)
2014-11-14 11:30:08 +01:00
da4365255c fix typo in 58fec98a
the documentation was correct: “GTK+ uses G_PRIORITY_HIGH_IDLE + 10
for resizing operations, and G_PRIORITY_HIGH_IDLE + 20 for redrawing
operations.”  but the priority for the idle visual changer was wrong.

fixes, follow-playhead and zoom/scrolling under load (no idle)
2014-10-29 18:31:13 +01:00
f900711136 port changes to ARDOUR::Location and ARDOUR::Locations APIs from Tracks to Ardour.
Fixes deadlocks caused by mutex on Locations list, and clarifies the purposes and uses of the class-level and
object-level change-related signals.
2014-10-24 12:18:46 -04:00
5ff0c6b319 prevent negative playhead positions from entering code via serialized state 2014-10-22 17:07:11 -04:00
ba4d1cd1c1 remove "canvasvar_" from all functions related to obtaining values from ARDOUR_UI::config() 2014-10-21 22:58:58 -04:00
b73f725676 remove mouse zoom mode; bind z to zoom-to-range 2014-10-21 12:47:53 -04:00
58fec98a4d fix track height resizing on OSX.
If the transport is running, g_idle with G_PRIORITY_DEFAULT_IDLE is
never called.

TODO: check other g_idle functions in libs/gtkmm2ext
2014-10-21 13:20:17 +02:00
a1245de1ba track height fixes:
* retain [custom] track-height
  Editor::override_visible_track_count() is called repeatedly (for
  every change), there was a 50/50 chance of it saving the right value.

* adjust default for new sessions: use “Normal” track height until
  told otherwise.
2014-10-20 20:33:28 +02:00
8d8717800d add tearoff reattach for the editor 2014-10-16 13:44:36 -04:00
dc924db851 correctly connect to Location static signals 2014-09-17 09:37:39 -04:00
4e411dfd7b set the CairoWidget focus handler; reset focus when the mouse pointer leaves the Editor window 2014-09-16 12:46:39 -04:00
bb5cd8aa32 fix compiler warning 2014-09-15 14:09:12 -04:00
df19c576c7 fix a bunch of memory leaks 2014-09-11 03:04:11 +02:00
b81ceeaaa6 complete list from 68f0694ac0 2014-09-09 01:24:17 +02:00
68f0694ac0 remove arbitrary button sizing for edit mode buttons 2014-09-08 15:02:33 -05:00
3a75fab244 speed up session load (display updates) 2014-09-06 12:52:29 +02:00
936cb05989 update dropdown triangle 2014-08-30 18:26:03 +02:00
74f313dd6b Rationalize ArdourButton and lots of associated theming issues.
ArdourButtons now have a "pushed" animation.
The gradient is now implemented in the button, rather than providing 2 colors in the theme, which was burdensome.
Lots of code cleanup in ArdourButton.  Removed several unnecessary flags.
Refactor more stuff into route_ui.
2014-08-22 11:51:20 -05:00
b75b88a1eb Use text to specify combo box padding for better font/display tolerance.
Consistent mixer strip button height.

The latter works by setting all the button size request heights to the
calculated height of the alphabet.  Thus, all buttons of the same class will be
the same height regardless of their actual text.
2014-07-30 18:30:42 -04:00
c1616ccff6 Shrink minimum width a bit by using the same hpad for all toolbar selectors.
30 was already being used for some, and looks like more than enough padding,
for me.  Hopefully is enough everywhere.
2014-07-29 23:44:57 -04:00
564d8d7669 Consistent styling for toolbar buttons.
All the different looks here didn't seem to convey anything useful to me, and
looked sloppy.  I went with the style of the transport button.

It would be nice if we could style button elements like Inset in the
configuration, but this would require some work.
2014-07-29 23:39:01 -04:00
ed07c53210 clean up cruft in some config variables 2014-07-28 15:55:20 -05:00
02af7cb418 alternate layout with a full-height editor-mixer, for mixbus 2014-07-28 11:27:02 -05:00
b22e136887 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-07-23 11:31:06 -05:00
b69870dfe6 add Editor::trackviews_height() convenience function to determine height of trackview area of canvas; use to help fix set_visible_track_count(); don't consider hidden tracks in that function; add "Selected" to that selector menu 2014-07-15 18:09:04 -04:00
6386a5dd7a up/down scroll buttons on left of summary should move by tracks 2014-07-14 12:36:51 -04:00
62cab525f0 (Mixbus profile only) tentatively remove the Zoom and Cut tools, to save space in the toolbar and reduce some highly redundant functions 2014-07-14 10:08:55 -05:00
492c933a69 fix the visible_tracks_selector to show * when user tweaks a track height. various experimental tweaks to visible_tracks_selector and a new zoom_preset_selector for Mixbus. 2014-07-14 10:08:55 -05:00
b19e1a7985 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-07-14 10:08:55 -05:00
e078102bc6 size various ArdourDropdowns according to the pixel width, not character length, of their various strings 2014-07-09 22:41:29 -04:00
1b4a314d5d Revert "adjust horizontal-offset for snap/grid dropdown." Wrong fix for the problem.
This reverts commit c90d35c4a1.
2014-07-09 22:39:07 -04:00
c90d35c4a1 adjust horizontal-offset for snap/grid dropdown. 2014-07-10 02:06:51 +02:00
8eeb02fe75 add Editor::edit_mode_strings to allow for i18n; correctly size ArdourDropdowns using longest, translated strings 2014-07-09 16:48:36 -04:00
9f4a00fa89 add mixbus profile which removes the tearoffs 2014-07-09 15:12:05 -05:00
a32dbfa197 Revert "ardour loves narrow screens part one"
This reverts commit d3d83eac9d.
restore full-height of editor-mixer.
2014-07-09 21:47:12 +02:00
0be1555ba6 reduce space around TearOff Tickmarks 2014-07-09 21:47:12 +02:00
12d913893a shorten grid/snap label "Timecode" -> "TC" 2014-07-09 21:47:12 +02:00
ea311d4379 automatically set ArdourDropdown box width.
..according to longest text in English.
2014-07-09 21:47:11 +02:00
419570b740 ardour loves 1024px width screens
narrow mode toolbar for screens <= 1024px with
2014-07-09 19:40:43 +02:00
d3d83eac9d ardour loves narrow screens part one
move toolbar box above editor-canvas. Without-editor mixer
there is no change. With Editor-mixer it is now above the
mixer-strip.

This makes the toolbar [almost] fit on 1024px width.
2014-07-09 19:39:52 +02:00
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
67eaa62ee9 fix build after copy-n-paste/code change collision 2014-07-07 10:21:47 -04:00
d97199088b some code shuffling to make sure that cut mode always operates at the mouse location, with (maybe) the right regions 2014-07-07 10:13:26 -04:00
64404a16c1 remove all_group_active_button. if you want to operate on all tracks, choose select-all-tracks ( ctrl+t in the mnemonic bindings ). this is more explicit and allows safer use of the deselected-region-under-mouse operations 2014-07-07 08:46:25 -05:00
7ec397c019 add basics of Cut mouse mode, no functionality yet. Icon images are still required 2014-07-07 07:05:43 -04:00
6d97d72999 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-07-06 14:02:13 -05:00
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
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
ba33c6dab6 revert part of 0f1c7b1d71 which broke lots of stuff based on region selection 2014-07-03 15:51:06 -04:00
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
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
4c79d35838 remove unused "zoom range clock" from code as part of zoom simplifications 2014-07-02 14:56:36 -04:00
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
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
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
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
c52cb37bf2 suspend route redisplay for (rec-en, solo, mute and monitor) batch changes 2014-06-29 02:52:56 +02:00
77216ac468 add RAII DisplaySuspender 2014-06-28 23:22:15 +02:00
a3c378cf62 move utility functions into a dedicated namespace 2014-06-25 21:47:54 +02:00
298085eec2 use new ruler dialog class for context clicks on ruler labels area 2014-06-25 15:23:25 -04:00
b43d3fe8d7 add UIConfig variable for lock timer 2014-06-25 11:34:37 -04:00
d5ef8f5f1e new timer-based GUI locking code 2014-06-25 08:28:36 -04:00
a12f43fa46 add a modal lock dialog for better testing (and someone might find it useful, too) 2014-06-24 10:14:07 -04:00
becf857f48 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-06-18 10:24:59 -04:00
nick_m
46c158d8c6 Render tracks and regions to a background image in the editor summary.
Connect to editor's SelectionChanged signal to display corresponding region colour change.
2014-06-17 21:44:36 +10:00
f7844f4893 do most of the work related to adding new anchored trim cursors (but debugging/analysis continues) 2014-06-13 18:43:53 -04:00
7a0b2e1c18 fix scrolling behaviour in track headers (event was stolen by rulers because event coordinates made it look as if the event happened there) 2014-06-13 14:27:59 -04:00
79c30ab766 make rulers color-sensitive (e.g. theme manager editable, etc) 2014-06-12 01:07:58 -04:00
b73352880e use canvas rulers now instead of gtk widgets
Some bugs that exist in master are still present.
2014-06-11 23:54:28 -04:00
c56d309bd7 make the icon set selector actually do something 2014-06-10 14:39:28 -04:00
d59d26b89a change ::get_icon_path() and ::get_icon() to accept an "icon set" name to provide ability to use different sets of icons; use when creating MouseCursors 2014-06-10 14:39:28 -04:00
d36afa6b8b forward scroll events from track control headers to the canvas, to get consistent scroll behaviour (whatever that behaviour is) 2014-06-09 10:02:38 -04:00
92bb0e0d7f 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-06-08 14:41:29 -04:00
8487314069 introduce Drag::_trackview_only which indicates that all y-axis positions for the pointer during a drag should be relative to the top of the trackview group.
More or less all drags except for Cursor (playhead) and drags in the range marker bars have this true (which is the default value)
2014-06-08 11:26:32 -04:00
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
5696199daf remove timebar canvas and just use a single canvas instead. This is just part one - lots of minor fixes to be done 2014-06-03 16:10:27 -04:00
2d82446f59 set Gtk::RadioAction state on instant.xml load.
This should really be done in ArdourDropdown somehow.

Fixes issues introduced at b9708d5: If after session-load some
radio-item other than the first one is set active, it is
impossible to switch to the first.
e.g. set "Snap to Grid", Save Session, Load Session, trying to
switch to "Snap to None" fails until another mode is selected first.
2014-05-29 14:16:15 +02:00
918a0ac5f9 update x-fade context-menu 2014-05-29 07:49:26 +02:00
f226ed086b update fade icons 2014-05-28 22:23:42 +02:00
d96a6ed247 fix x-fade icons in context menu 2014-05-28 19:46:31 +02:00
356c1013ae change return type of Editor::axis_view_from_route() 2014-05-19 14:00:36 -04:00
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
6544df039b change location marker ruler text for get_trx() == true case 2014-05-01 07:53:46 -04:00
509159c3c6 first pass hiding/rearrangement of UI elements related to trx 2014-04-10 13:30:25 -04:00
4c2e846126 the FlatFace element is no longer relevant. instead it was being used for an inset jeweled look. changed name to match 2014-03-26 11:37:28 -05:00
4e5d977fb1 add back track shrink/expand buttons 2014-03-25 10:43:04 -04:00
200a67fba8 most of the support for save/restore of visible track count 2014-03-25 10:33:18 -04:00
7fac3674c3 actually resize track heights to follow visible-tracks choice 2014-03-25 09:02:31 -04:00
da36a8ee09 first part of switch from shrink/expand tracks to pyramix-style "pick number of visible tracks". function to follow shortly, this is the control widget part 2014-03-25 08:21:08 -04:00
c16a577a8d brownish zoom buttons 2014-03-25 06:36:09 -05:00
harrison
b9708d5f6b New theme for editor window using ArdourMenu 2014-03-23 18:11:42 -05:00
640bd36906 fix editor full-screen state when re-loading session 2014-03-21 15:21:09 +01:00
9df3157dfc big rework of scrolling, horizontal part considered almost 100% done.
Many more changes than I would typically like in a single commit, but this was all very intertwined.
Vertical scrolling using track-stepping still to follow.
2014-03-20 13:29:45 -04:00
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
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
b9185d2c07 Merge branch 'master' into cairocanvas 2014-01-17 09:25:03 -05:00
17309c41c3 use Glib URI utility function to generate a local filename from a URI, rather than hand-crafted code 2014-01-17 09:24:32 -05:00
b880a38152 Merge branch 'master' into cairocanvas 2013-12-28 14:00:20 -05:00
5bc8750f73 prevent 0-pointer dereference in editor_routes.cc - fixes #5794 2013-12-28 16:15:00 +01:00
85daa31ab5 all events propagate out of the canvas in canvas coordinates now, so revert changes in editor_drags.cc that worked around this not being the case 2013-10-31 16:43:35 -04:00
7ce86cec7d handle enter/leave items when zooming and scrolling occur 2013-10-31 03:10:18 -04:00
e5888d3983 merge with master and fix 2 conflicts 2013-10-16 22:06:56 -04:00
c2b2953f8c export video-range: add to context menu 2013-10-12 22:56:08 +02:00
fd23ebd088 Merge branch 'master' into cairocanvas 2013-09-17 21:23:30 -04:00
1740bbb966 correctly restore zoom focus state after restart (from nick mainsbridge) 2013-09-16 22:32:55 -04:00
7a30e63eaa fix merge conflicts with master 2013-09-14 16:42:40 -04:00
1da655c2eb Fix special handling of 'zoom vertical' scroll wheel modifier key.
gtkmm2ext/keyboard.cc has a special case to emit a signal on the key-up of
the modifier key used to adjust track heights in conjunction with the
scroll wheel, so that the same track continues to be resized even when
it's shrunk to no longer be under the mouse cursor. However, this code
assumed that the modifier key for this was <Shift>.

Fix it to use the event->state bit corresponding to
ScrollZoomVerticalModifier instead, and rename the relevant functions to
clarify that it's the 'zoom vertical' modifier key they're dealing with.

Partially fixes #5610.
2013-08-08 15:24:15 -04:00
1ab61b8564 major redesign of MIDI port heirarchy and management (part 2) 2013-08-07 22:22:11 -04:00
8e376f7a2a Fix special handling of 'zoom vertical' scroll wheel modifier key.
gtkmm2ext/keyboard.cc has a special case to emit a signal on the key-up of
the modifier key used to adjust track heights in conjunction with the
scroll wheel, so that the same track continues to be resized even when
it's shrunk to no longer be under the mouse cursor. However, this code
assumed that the modifier key for this was <Shift>.

Fix it to use the event->state bit corresponding to
ScrollZoomVerticalModifier instead, and rename the relevant functions to
clarify that it's the 'zoom vertical' modifier key they're dealing with.

Partially fixes #5610.
2013-07-23 16:42:34 +01:00
3031a99364 Merge branch 'master' into cairocanvas 2013-06-25 22:24:47 -04:00
2b74c955f1 fix zoom focus issue that was messing up zoom changes 2013-06-25 21:56:10 -04:00
Julien de Kozak
8af47234fb remove compilation warning 2013-06-23 13:37:50 +02:00
aaaeb958c1 switch samples_per_pixel to integer type 2013-06-18 23:02:54 -04:00
bebe2af95a merge with master 2013-05-08 14:48:28 -04:00
a902737db9 various changes to window visibility mgmt, including use of the mixbus2 code for toggling editor + mixer windows. no longer attempt to track changes made outside of ardour, which is a lost cause 2013-05-07 13:01:26 -04:00
e2f0c5f91e merge resolution with master 2013-05-02 20:21:54 -04:00
3973ce81b3 remove all of Gtk::Window::set_position (WIN_POS_MOUSE) for anything deriving from ArdourDialog or ArdourWindow; move the set_position() call into those classes' constructors, so that they are called before the windows are realized, and thus it actually works 2013-05-02 18:13:35 -04:00
81485faa83 remove CMT code - has not been used for years, and will become irrelevant with VTL and cairocanvas 2013-05-02 12:21:41 -04:00
54bf06e63c Merge branch 'master' into cairocanvas 2013-04-26 14:20:11 -04:00
db34831b18 redesign toggling of editor/mixer stacking to use Gtkmm2ext::VisibilityTracker 2013-04-26 14:12:52 -04:00
6f664c1f67 many pervasive changes primarily related to waveform drawing, particular content-dragging, colors, and more 2013-04-24 15:42:14 -04:00
f88cfdb478 remove Editor::redraw_measures to improve efficiency of tempo measure line redraws 2013-04-20 16:11:40 -04:00
96eee9e7a1 change UIConfig to use accessor/setter methods like RCConfig so that ParameterChanged methods can actually be emitted; add variable (over a small range) background shading for all TimeAxisViewItems 2013-04-16 23:46:22 -04:00
84fb0a8dce remove all XML related API from canvas. it may have been useful during development, but it is just a distraction - we will NEVER be saving or restoring canvas state via XML or any kind of serialized state 2013-04-15 21:57:08 -04:00
05caa9caa1 removal of sundry Adjustments and consolidation of scrolling around two editor-owned Adjustments 2013-04-13 07:29:49 -04:00
4e9108cd1e remove TimeAxisView::clip_to_viewport() and Editor::update_canvas_now() and Editor::flush_canvas() which should no longer be necessary with a sane canvas design 2013-04-12 18:01:44 -04:00
b05968fb4e change frames_per_pixel to samples_per_pixel 2013-04-12 11:31:50 -04:00
8877199ae0 leftmost_position => leftmost_sample, current_page_frames => current_page_samples 2013-04-12 11:21:12 -04:00
4258a34912 change all frame_to_pixel and pixel_to_frame to sample_to_pixel and pixel_to_sample 2013-04-12 11:15:45 -04:00
ecfd2a7455 remove all unit-based methods from (Public)Editor; rationalize Editor::event_frame() to clearly identify whether the passed-in GdkEvent has window units or canvas units (the latter will be true for all events that are handled by the canvas and then passed to Editor 2013-04-12 11:09:49 -04:00
f208593249 Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas 2013-04-11 22:54:22 -04:00
ee1f0520a8 many changes to get the cairo-canvas version much, much more functional. still problems with a lot of subtle and not-so-subtle issues 2013-04-11 20:19:22 -04:00
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
66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +02:00
30968b8542 merge with master, including manual merge conflict resolution 2013-04-06 16:12:15 -04:00
cd6cbba299 rename Route::is_hidden() to Route::is_auditioner() and Route::Hidden to Route::Auditioner. this has been the meaning of these terms for years now and it would be better to make it explicit 2013-04-06 16:04:02 -04:00
8eef4b1904 master merge; new files not added after initial cairocanvas patch application 2013-04-05 17:16:33 -04:00
07a505b1b2 lots of tweaking and adding debug output including operator<</dump(ostream&) methods to help visualize canvas structure 2013-04-05 11:27:26 -04:00
19bd641915 commit immediately post linking 2013-04-04 18:45:27 -04:00
aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00
ddfc047f0e Update region_ops.txt to match current behaviour, and fix a couple of comments.
Update region_ops.txt to better describe the current behaviour of
Editor::get_regions_from_selection_and_edit_point(), and fix a couple of
comments that still referred to the no-longer-existing 'edit' property of
route groups.
2013-04-03 23:21:53 +01:00
47efae83d1 Don't include unselected regions in edit grouped region operations.
Make Editor::get_regions_from_selection_and_entered() only return regions
that are actually selected or entered, not their unselected equivalents.
2013-04-03 18:21:12 +01:00
b49f2a10d2 Ignore track selection if there are any selected regions.
Make Editor::get_regions_from_selection_and_edit_point() only consider the
selected tracks when finding regions to operate on if there are no regions
selected, and never if the edit point is 'mouse'.
2013-04-03 17:29:34 +01:00