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
f4a9c02b1d
Use selection->regions instead of Editor::get_regions_from_selection()
...
Remove Editor::get_regions_from_selection(), and use selection->regions
directly in the few places it was called.
2013-04-03 17:04:04 +01:00
0c3e840700
videotimline
...
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
d915650939
fix get_regions_after() -- used by videotimeline
2013-03-13 20:28:14 +01:00
8584c29933
tweak font/style stuff for the labels used on the left side of rulers
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-24 13:17:36 +00:00
17cbb458e7
fix restore of snap mode (confusion caused by existence of internal/preinternal snap modes)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13878 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-18 15:56:41 +00:00
46d884ff16
amend to prev commit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13790 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-05 14:13:25 +00:00
3ced169911
14:03 < prokoudine> "GERMAN SCIENTIST DEMYSTIFIED ENGLISH CAPITALIZATION"
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13789 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-05 14:07:00 +00:00
72393f101b
allow region list selection of whole file regions to select every instance of a region that has any source relationship with that whole file region (from a logic feature that came up while writing the manual)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13779 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-04 22:46:51 +00:00
54ce76e8fd
remove "edit" property from track/bus groups; use "select" property which should force region selection to propagate, and then rely on "edit-applies-to-selection"
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13734 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-26 17:50:29 +00:00
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
ab90b7809a
typo that led to incorrect tempo based ruler stuff ... thanks, valgrind
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-11 17:29:31 +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
ba8953605d
fix duplicate, and clarify its behaviour in smart mode; includes a fix for TimeSelection::length() which didn't account for "no selection" in its return value
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13607 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-06 15:59:01 +00:00
67e842bf4c
remove debugging/analysis output
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13589 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-02 02:12:39 +00:00
Ben Loftis
f77763020b
edit operations should depend on the existence of an explicit range, NOT the mouse mode. this produces less confusion to the user. For an edit (such as delete) the selection should be based on this priority: explicit range selection, ojbect (region) selection, and then implicit range ( i.e. mouse-to-marker)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13563 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-28 17:07:35 +00:00
b286b45ea8
adjust the way we use a pair of iterators into the tempo map so that the iterators are always local to the scope where they are used, which fixes at least one tempo-map related crash; also fix correct setting of join-object-range parameter, where the property wasn't actually used
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13559 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-27 22:48:59 +00:00
12fadcc43e
try another fix for the crash created by rev 13547
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13554 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-27 13:21:21 +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
Ben Loftis
beb3ec2d7a
Always Play Range is now Follow Edits, and is based on Mixbus implementation. Added menu item. Follow Edits button replaces Auto Play; removed the connector between play and play-range. Some Smart Mode changes came along for the ride but will be cleaned up shortly
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13537 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-20 19:43:43 +00:00
Ben Loftis
6b6ef35f3e
new button look
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13511 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-16 19:27:39 +00:00
5cdc9239e0
move internal edit button away from mouse mode buttons by a small distance, and change its tooltip to match website terminology
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13509 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-15 19:36:09 +00:00
98834c0532
remove a bunch of cerr output and/or convert to use error<<
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13477 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 15:11:07 +00:00
86e16e723e
Revert "fix small screen mode width"
...
This reverts commit e963a8dbc1d71aa78bed9407bafd7f8948db9712.
git-svn-id: svn://localhost/ardour2/branches/3.0@13449 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 13:43:12 +00:00
e3a010ff69
fix small screen mode width
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 13:31:13 +00:00
82fb1acf2a
break out of step editing if a session goes away; do nothing in Editor::located() if the session has gone away
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13229 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-10 15:19:58 +00:00
760ccbabfb
add -Wpointer-arith -Wcast-qual -Wcast-align and others to compile flags, and fix const cast warnings generated by new flags
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13124 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-08-10 15:57:09 +00:00
4f77bf201e
make more or less all LHS treeviews use the same style
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13056 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-20 01:47:27 +00:00
deb202b1f7
comment out some unused parameter arguments
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12999 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-09 19:43:29 +00:00
Carl Hetherington
c1d4f87471
Fix crash on trying to snap to markers when there aren't
...
any (#4988 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@12989 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-04 21:53:44 +00:00
Carl Hetherington
25e5bfd17e
Rename Editor::duplicate_dialog to Editor::duplicate_range
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-04 21:31:06 +00:00
958c63bd18
minor cleanups from 12952
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12956 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-28 14:32:26 +00:00
11415b49be
first pass at the big rethink of managing sort order keys for editor and mixer. this appears to work, but remote control IDs are not yet correct (frequently off by one because of the presence of the master bus in the editor)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12953 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-27 22:57:06 +00:00
Carl Hetherington
098f0157df
Allow new idle visual changer calls to be requested while
...
the current changer is executing; fixes #4567 .
git-svn-id: svn://localhost/ardour2/branches/3.0@12934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 00:07:45 +00:00
3287d5534d
use the pane watcher to prevent the nastiness that occurs when the RHS editor list is dragged so that the pane handle "vanishes" into the tabs. this used to only be a problem on OS X, but a variation of the problem is there on X11 too ( fixes #4410 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12821 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-22 16:48:56 +00:00
Carl Hetherington
3c7f6a4a4c
Unify clamping of frames-per-unit values during zoom; should help with #3514 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-20 14:14:27 +00:00
Carl Hetherington
0fba3e073c
Remove indirected method calls.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12795 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-20 14:14:22 +00:00
Carl Hetherington
95377c141c
Hacky fix for track height step losing 'grip' on the
...
track being resized (#4503 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@12747 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-17 16:57:21 +00:00
Rodrigo Severo
f9ed2ced4a
Much simplier implementation of: "Show Toolbar" act immediately, i.e., even when already maximized, changing this toggle changes whenever toolbar is shown or not.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12695 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-13 04:21:46 +00:00
b0fdefb7af
maximise-editor patch from Rodrigo:
...
* makes "View >> Toolbar When Maximized" act immediately, i.e., even when already maximized changing this toggle changes whenever toolbar is shown or not;
* renames "Toolbar When Maximized" to "Show Toolbar" as it acts whenever editor has maximized space or not.
git-svn-id: svn://localhost/ardour2/branches/3.0@12668 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-12 04:20:13 +00:00
Carl Hetherington
fc77252d51
Slightly unpleasant hack to stop control points being
...
unselected when you ctrl-drag a selected point in order to
do a push drag.
git-svn-id: svn://localhost/ardour2/branches/3.0@12502 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-31 14:39:48 +00:00
Carl Hetherington
d33c0d96fb
Patch from colinf to avoid splitting unselected regions
...
on the same track as a selected region; also make no
selection = all tracks button work (#4831 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@12459 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-27 19:36:27 +00:00
6fa6514cfd
Remove over 500 unnecessary includes (including 54 of session.h).
...
It's slightly possible that this causes trivial build failures on different
configurations, but otherwise shouldn't cause any problems (i.e. no actual
changes other than include/naming/namespace stuff). I deliberately avoided
removing libardour-config.h since this can mysteriously break things, though a
few of those do seem to be unnecessary.
This commit only targets includes of ardour/*.h. There is also a very large
number of unnecessary includes of stuff in gtk2_ardour; tackling that should
also give a big improvement in build time when things are modified.
git-svn-id: svn://localhost/ardour2/branches/3.0@12420 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 06:09:29 +00:00
8d5065bc32
remove, convert, comment several cerr statements
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12378 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-22 12:57:05 +00:00
Carl Hetherington
c3508622f4
Use Later / Earlier in descriptions of nudging and some playhead movements, instead of Forward / Backward ( #4879 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12314 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-16 23:03:47 +00:00
ec2dc36215
fix bork-age of the fade in/out context menu introduced by mistake yesterday
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-16 14:20:12 +00:00
38dd633fc6
fix for crash caused by re-using the same image in the fade context menu
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12298 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-15 20:45:02 +00:00
a98fa4bc61
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 21:30:36 +00:00
dc9fb4a033
rename images used for fades to indicate that they are fades, not xfades (new images for xfades to come)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12244 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-10 19:29:22 +00:00
c6d983bda5
incorrect but visible context menu for xfades
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12243 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-10 19:14:11 +00:00
7bc425fd0d
framework for handling events on the xfade rects
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-08 17:13:59 +00:00
Carl Hetherington
ecb500572d
Remove a couple of uses of the word Route in the UI.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12117 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-28 15:25:59 +00:00
ae2e8c6765
MCP: ctrl-select toggle selections status, analogous to GUI op
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12102 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-26 22:10:32 +00:00
ec97b8e58d
MCP: lots of good stuff - recenable bug fixed, cursor keys for vertical scroll work, loop button lights/unlightspan pots don't adjust if there is no panner, etc.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12093 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-26 03:46:18 +00:00
ec1ef5d6b5
remove the apparently unnecessary "ui_bind()" macro from entire source base
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 12:58:19 +00:00
Carl Hetherington
a2897ecef6
Fairly major change to the way in which crossfades are handled;
...
they are now done with region fades, rather than separate objects.
After this commit, Ardour will try to convert your session files
to the new crossfade format, but will make a backup in your
session folder first.
If you have works in progress using Ardour 3 it is
***STRONGLY RECOMMENDED*** that you back up session files before
updating to this commit.
git-svn-id: svn://localhost/ardour2/branches/3.0@11986 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-16 16:32:22 +00:00
8f7fa7d93b
MCP: timeout display of value when altering with fader or pot; range ops on strip buttons should work; select logic may be broken
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11959 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-13 16:11:55 +00:00
bef3ea1adc
MCP: F1-7 jump to a given view; F8 closes any currently open dialog; in zoom mode, up/down alter vertical track height of all tracks; option-up/down alters selected track heights
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11858 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-09 18:53:51 +00:00
57a046804c
MCP: different meter debug trace; initial support for track selection
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11852 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-09 16:15:55 +00:00
e2d62d9af4
allow ControlProtocols to call for undo/redo in GUI; make MCP use this
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11851 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-09 15:50:38 +00:00
89aed48f92
MCP: possible support for metering
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11842 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-09 00:03:35 +00:00
Carl Hetherington
7f417fb44f
Remove unused ustring version of url_decode(). Rework
...
the other version to be a bit simpler, avoiding #4800 .
git-svn-id: svn://localhost/ardour2/branches/3.0@11771 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-01 14:30:06 +00:00
Carl Hetherington
d8ee15df1a
Reshow time selection when zooming in object-range mode
...
(#4678 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@11754 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-25 12:12:08 +00:00
685d8ffba7
save nudge clock value; don't reset the nudge clock mode when loading a session (possibly some finessing required here, since presumably mode and value should be per-session and are saved in the session instant.xml anyway)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11721 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-17 14:10:44 +00:00
Carl Hetherington
d7829cf96a
Remove a little unused code.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11678 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-14 11:17:14 +00:00
c52c2b7368
forward-port some fixes from a2
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11630 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-09 17:15:25 +00:00
5d82179323
fix up a substantial mess with the operation of toggle-zoom and related actions, partially caused by XMLNode semantics fixed in a previous commit, but partially caused by issues fixed here
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-07 02:11:59 +00:00
ed62609e80
support a grid of beats/64 and beats/128
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11490 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-14 22:15:25 +00:00
671ec99bac
(1) remove magic number voodoo when saving zoom focus/snap settings to instant.xml etc. (this has a minor breaking-behaviour for existing sessions etc (2) keep track of grid type/settings in and out of note edit mode and switch back and forth, thus allowing independent grids while working at the note or region level
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-13 14:34:21 +00:00
b46dfe726a
add tooltip for nudge clock
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11461 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-06 18:41:31 +00:00
aeb4617b1d
tweak "joined" buttons to have no border color
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11460 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-06 18:38:02 +00:00
1f0f5e89bb
separate header dependencies on button joiner, and make each button joiner look up the right color for the type of buttons it contains
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11440 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 18:49:43 +00:00
c21c9e6662
use button joiner for smart mode; polish up the visuals on the joiner a bit
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 18:31:10 +00:00
Carl Hetherington
452672f78f
Make crossfade convert-to-full and activate/deactivate work across edit groups ( #4658 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11413 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-01 01:07:52 +00:00
Carl Hetherington
34881407e7
Make crossfade active state and length changes undo-able.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11406 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-31 23:06:12 +00:00
Carl Hetherington
3b5787c461
Fix position of viewport after a playhead drag outside the viewport (when following the playhead).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11399 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-31 19:24:26 +00:00
f56bbe2799
fix inconsistent display on selection clocks when in join-object-range mode, and fix restore of that mode from session state via new ActionManager::set_toggle_action()
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11366 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-27 19:05:03 +00:00
33c61757fc
promote Playlist::RegionList to ARDOUR::RegionList; fix timefx on multiple regions, even regions of mixed type. this mostly involved some trivial code changes but to make the code simpler and less error prone, the API switched away from using RegionSelection (list of regionviews that catches regionviews vanishing) and used RegionList (lists of regions, no semantics) instead.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11362 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-27 16:29:01 +00:00
d707fa06b7
dramatically simplify maximi[sz]ation code, ripping out all the old pane sizing stuff that seems to be a left over from gtk1 (!)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11344 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-25 03:03:25 +00:00
Carl Hetherington
bf8dbbaca7
Fix warning about getting tempo map for frame -1; stop
...
session files with left-frame=-1 causing the same
problem on reload (#4654 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@11339 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 20:48:08 +00:00
Carl Hetherington
a072327145
Tidy up RegionLayeringOrderEditor a bit. Add GPL boilerplate. Make it respect edit groups ( #3432 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11324 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 01:31:42 +00:00
Carl Hetherington
6918bba170
Use the same criteron to sensitize the choose-top-region menu item as to decide whether to open it or not, to prevent a sensitive menu item that does nothing.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11322 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 00:53:18 +00:00
efab36a85e
new mouse mode (Draw (notes)); switch into internal mode when draw is selected; notably improve use of dbl-click to enter and exist internal/note edit mode
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11269 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-19 15:23:51 +00:00
Carl Hetherington
b9a9d8d047
Use a few shared_ptrs to make things slightly neater.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11156 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-04 13:56:09 +00:00
2a200bdc0e
return two iterators into the Bars|Beats list of the tempo map rather than making a copy; use iterators in the GUI
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11146 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-03 18:43:58 +00:00
69c7dac1a1
new approach to tempo/meter: compute and store the entire map (every bar|beat point), thus enabling us to use the same computation to set the BBT points AND the metric markers (tempo + meter) on the audio timeline. It is known that snapping to the BBT grid doesn't work correctly right now, but this probably caused by the separate code in TempoMap::round_to_type() and i'll dig into that tomorrow. Note that the Bar|beat point list is evaluated "lazily" - we'll never store more than anyone actually needs to display or know, other than 1 minute's worth starting from frame zero
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11129 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-02 04:04:14 +00:00
ccc93c4aef
centralize use of "from-context-menu" in Editor::get_preferred_edit_position(), and use it when pasting as well
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11118 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 17:28:05 +00:00
6df1d06f8b
fix logic for context-menu-mouse-dependent actions so that if the edit point is not the mouse, we still use the edit point even from the context menu. klar?
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11117 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 16:21:10 +00:00
Carl Hetherington
b177514930
Revert internals of the last layering-related commit, and go back a slightly-cleaned-up version of how it was before. Remove all layering modes; only option now is add-is-higher. Move-add-higher could easily be re-added if anyone uses it.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11111 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-29 22:14:15 +00:00
Carl Hetherington
6304261b98
Re-work layering in possibly debatable ways. Sketchy docs in doc/layering.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 01:42:49 +00:00
75a3964c10
add a new name for the region-layering-editor-action that tells us we were started from a context menu; dialog does not position correctly on first show... grrr. should end fix of #4588 , mostly
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11083 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 23:38:56 +00:00
e0cf3b6354
more fun and games with meter and the tempo map: rename Meter::beats_per_bar() to Meter::divisions_per_bar() so that its clear(er) on what it is actually returning; use Meter::divisions_per_bar() in more (all?) places that need it; fix up dragging meter marks by removing the relevant meter section from the map while we drag; operator<< for some tempo-related objects
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-13 02:46:36 +00:00
d23a6de077
fix for most (all? we can dream ...) issues involved in #4399 (editing multiply-applies operations to playlists used more than once), and as a side-issue, fix playlist selection which broke when we hid Diskstreams inside Tracks by using orig_track_id() rather than orig_diskstream_id()
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10968 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 19:20:15 +00:00
186283a3c4
fix, or at least improve, management of the editor toolbar when maximising editing space
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10936 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 15:48:24 +00:00
50aee54219
remove visible "sound notes" button,add Config parameter to control this (which then saves the state the user selected), add control to the prefs dialog
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 14:23:32 +00:00
Carl Hetherington
60fa99a34d
Remove hopelessly inadequate attempt at last_item_entered
...
and ask the canvas where we are instead. Should fix #4532 .
git-svn-id: svn://localhost/ardour2/branches/3.0@10907 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-05 20:47:53 +00:00
96ae97ddcb
preparations for using ardour's own keybinding system for the editor (not actually used)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10841 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-30 15:29:53 +00:00
Carl Hetherington
23964284a4
Hopefully fix some i18n bugs ( #3565 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-28 19:46:30 +00:00
e70249ab65
Pack toolbar combo boxes with expand=false and remove size kludges.
...
Turns out gtk these days sizes combo boxes with precisely enough space if
packed to not expand, none of this mess is necessary any more.
git-svn-id: svn://localhost/ardour2/branches/3.0@10790 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-23 08:35:41 +00:00
792df333a2
fix some issues with delta clocks, while introducing a couple more since the clock can now show +ve and -ve offsets, but -ve ones computed incorrectly for timecode and BBT
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10681 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 18:06:16 +00:00
b25fbc8a95
all new implementation of audio clocks, with entirely new editing model. not entirely finished, but lookable, and usable
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10662 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-17 22:49:13 +00:00
e2757229a7
provide link-editor-and-mixer-selection option. gui implementation is slightly hacky because of the implicit endless loop that the link creates
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10624 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 19:33:09 +00:00
Carl Hetherington
e827bb2bff
Repair thinko in previous commit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10612 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 13:30:55 +00:00
Carl Hetherington
b426e7d5e4
Tidy a couple of minor things up.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10607 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 02:06:09 +00:00
1e8a26a8c6
tweak up spacing+sizing in editor toolbar
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-11 17:35:22 +00:00
f96ccb1958
ardour-button-ize zoom buttons; move MIDI panic button to transport bar
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10528 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-10 18:04:34 +00:00
6449c2e5c8
more ardour-button-ization; fix transparency of selection rects; use "correct" cursors when entering and leaving selection rect handles; color tweaks for a few buttons
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10527 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-10 15:25:01 +00:00
Carl Hetherington
c0b59854ff
Trim includes.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10357 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-31 21:16:32 +00:00
Carl Hetherington
db429c2362
Some limited control of mixer strip component
...
visibility.
git-svn-id: svn://localhost/ardour2/branches/3.0@10341 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-29 20:08:48 +00:00
Carl Hetherington
abedf1fae3
Save marker selection state in instant.xml ( #4203 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10245 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-20 00:05:31 +00:00
4085309cdb
make Stateful::_id private and provide appropriate methods to set it, and use them throughout ardour
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10222 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-18 13:18:47 +00:00
Carl Hetherington
c84057d047
Add a couple of missing ellipses to menu items.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10215 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-18 00:24:29 +00:00
Carl Hetherington
3f6ec53ba3
Tidy up style of a few toggle buttons ( #4319 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10097 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-19 21:14:59 +00:00
Carl Hetherington
6ab6ad5bb7
Remove unused button.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10096 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-19 21:14:50 +00:00
ae5f278202
make control protocol's SelectByRID signal work, thus enabling MIDI binding maps to use function="select" with an argument; fix minor bug in previous commit
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9991 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-14 17:11:33 +00:00
Carl Hetherington
982bfd08db
Add context menu for control points.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9890 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-17 20:10:31 +00:00
Carl Hetherington
8786d5c9c2
Fix vertical pane resizing during fullscreen/unfullscreen
...
(#4119 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@9889 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-17 18:22:43 +00:00
32fc1f8ed9
use string_is_affirmative(), not direct test for "yes"
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9841 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-11 20:23:45 +00:00
10cb0a7646
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-07 00:37:13 +00:00
Carl Hetherington
757d9565ca
Remove erroneous assert which I added earlier.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9786 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-02 22:34:36 +00:00
Carl Hetherington
cd17e05e3a
Fix some set-but-not-used variable warnings from gcc 4.6
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9783 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-02 17:16:46 +00:00
83f385d263
audio clock switchover part2: remove most egregious include-time dependency on audio_clock.h, and alter API for a few utilities along the way
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9673 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 17:50:37 +00:00
ed626628b5
Delete trailing whitespace
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 17:00:29 +00:00
Carl Hetherington
c07ed4b848
Fix a couple of uninitialised variables (should fix #4059 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9582 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 10:17:16 +00:00
Carl Hetherington
f89c285bcc
Tinker with text related to clean-up.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9459 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-02 23:21:53 +00:00
Carl Hetherington
988348185e
Separate verbose cursor out into its own class and clean up the API. Fixes #4010 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9455 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-02 13:38:16 +00:00
Carl Hetherington
4f9b75c8a2
Remove unnecessary refresh_location_display_s method. Speed up marker loading somewhat by only setting up marker labels once after load. Fix check on visible status of the location UI so that it is built when opened rather than on load. The location UI is still extremely slow to build with a couple of thousand markers. This fixes #3958 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9414 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-23 02:00:23 +00:00
Carl Hetherington
28c53d0f92
Cleanup some more gint -> bools.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9374 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-19 10:43:43 +00:00
Carl Hetherington
128980ffd6
Fix the return type for the edit_controls_button_release signal handler. Make a click in the empty space below track controls clear the track selection ( #3993 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9371 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-19 10:18:21 +00:00
Carl Hetherington
62909b1ba2
Remove unused signal.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9365 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-18 13:41:26 +00:00
Carl Hetherington
80abf7693e
Remove extend-range-to-{start,end}-of-region and replace with move-range-{start,end}-to-{previous,next}-region boundary after discussions with Chris. Seems to make more sense, and works without the need for a region selection, which is fiddly to adjust when one is in range mode.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9360 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-17 13:55:41 +00:00
Carl Hetherington
b999368186
Put relief on all toolbar buttons for consistency ( #3967 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9355 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-16 11:02:29 +00:00
Carl Hetherington
33cd347529
Fix crash due to _over_region_trim_target not being updated when a RegionView disappears ( #3956 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9332 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-07 23:14:04 +00:00
3d21df3a15
do not set icon list *and* default icon list, which results in a GTK warning when the per-window icon(s) are found to be already realized because they are the same as the default set
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9277 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-04 12:47:40 +00:00
7ad031503c
hide/rearrange stuff affected by last commit only if Profile->get_small_screen() is true
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9215 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-26 21:03:42 +00:00
b691ba816f
goodbye toggle buttons for autoplay, autoinput, click and autoreturn; move nudge stuff up to transport bar; reduces minimum width quite a bit (still big though)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-26 20:11:28 +00:00
b88c773894
when leaving internal edit mode, if the current mode is range ("draw") and it wasn't before we entered internal edit mode, flip back to whatever it was before we entered
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9102 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-08 01:55:50 +00:00
92578ddef5
show internal edit mode status correctly on session load
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9101 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-08 01:49:13 +00:00
Carl Hetherington
eabe5b31f8
Hide/Remove to apply to the track selection.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9090 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-07 13:05:45 +00:00
d08e3b94c5
basic adoption of new mouse binding facility
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9063 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-04 03:10:48 +00:00
29558bd272
restore oddly-commented out (by me) restoration of editor geometry from saved settings. appears to fix most issues with pane sizing in addition to the obvious one of window size
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9059 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-03 19:25:56 +00:00
1ea01b7257
revert to using our own icons for zoom in/out/full, but rescale them to be a little bigger
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9039 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-02 18:22:19 +00:00
Carl Hetherington
b461bc1dc1
Put some up/down buttons to the right of the summary. Might help with #3786 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9021 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-02 00:30:19 +00:00
Carl Hetherington
115a150470
Make track shrink / expand bindable actions ( #3695 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9017 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-01 23:25:55 +00:00
Carl Hetherington
794980557f
Decide whether to show crossfade and choose-top-region menus based on the mouse position rather than the edit point. I think this is marginally more intuitive.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8980 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-27 16:43:48 +00:00
Carl Hetherington
f9bf2aa8ec
Fix show/hide of group tabs on session load ( #3790 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8920 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-22 00:11:32 +00:00
7635a20a75
c&p debug
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8918 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-21 03:58:17 +00:00
Carl Hetherington
13232d03f3
Modify route _processor list set up so that the logic for placing `invisible' processors (e.g. internal returns etc.) is in one place. Add option to get pre-fade listen from before or after pre-fade processors ( #3781 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8903 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-20 00:55:32 +00:00
Carl Hetherington
6117b74bb9
Make sense of parameter to tav_zoom_step match up with coarser as used for temporal zoom.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8896 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-17 22:35:42 +00:00
Carl Hetherington
4569f40a38
Prevent erroneous splitting icons in the editor mixer strip's processor box.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8816 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-10 02:44:56 +00:00
Carl Hetherington
a7c26a87e3
Remove Gtk::manage from the popup region menu item so that it doesn't get destroyed when its parent menu is cleared (patch from Lincoln). Fixes #3753 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8724 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-06 17:17:59 +00:00
Carl Hetherington
66c9e166f8
Update summary when a region is removed.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8622 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-30 13:24:41 +00:00
Carl Hetherington
5b5c576286
Re-offer region context menu even when in note mode, as selections made out of note mode are now preserved again.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8612 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-29 19:01:49 +00:00
Carl Hetherington
d3229b548b
Fix problems when using the same menu item in both the track and xfade context menus. Fixes #3725 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-29 18:25:10 +00:00
314f0d91d3
a radically new approach to sizing the track header layout that now allows ardour to shrink dramatically in vertical height. current lower limit is about 763 pixels WITH the editor mixer strip, and something much, much smaller without it
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8608 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-29 14:48:59 +00:00
Carl Hetherington
184d5167db
Remove duplicated code.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8553 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-19 23:05:30 +00:00
Carl Hetherington
5f13eb411e
Patch from Lincoln to fix rhythm ferret in various ways ( #3715 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8542 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-19 18:35:11 +00:00
Carl Hetherington
1e8586742e
Fix session range location by hooking into the undo system. Fixes #3654 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-19 17:38:56 +00:00
Carl Hetherington
58b207b190
Rename Frames ruler to Samples.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8529 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-18 12:51:02 +00:00
Carl Hetherington
756ffc26bf
Tidy up the ruler code slightly.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8528 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-18 01:16:05 +00:00
Carl Hetherington
e137f66303
Remove unused methods.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8484 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-09 15:10:16 +00:00