Paul Davis
9c24d10862
Merge branch 'master' into ardour-merge
...
Conflicts:
gtk2_ardour/editor.cc
gtk2_ardour/editor_mouse.cc
gtk2_ardour/public_editor.h
gtk2_ardour/time_axis_view_item.cc
gtk2_ardour/time_axis_view_item.h
2014-08-28 10:58:49 -04:00
nikolay
055a841787
[Summary] Enable change track name when track is not recording
...
[Reviewed] GZharun
2014-08-28 16:46:59 +03:00
Paul Davis
31d500e3a9
Merge branch 'master' into ardour-merge
...
Conflicts:
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui2.cc
gtk2_ardour/editor.cc
gtk2_ardour/mixer_strip.cc
gtk2_ardour/route_time_axis.cc
gtk2_ardour/route_ui.h
gtk2_ardour/ui/audio_time_axis.xml
gtk2_ardour/ui/editor_mixer.xml
gtk2_ardour/ui/meter_strip.xml
gtk2_ardour/waves_button.cc
gtk2_ardour/waves_button.h
gtk2_ardour/waves_zoom_control.cc
gtk2_ardour/waves_zoom_control.h
2014-08-27 12:38:27 -04:00
Greg Zharun
bb5c74fa62
[Summary] Resolved DnD and track selection conflict on mouse button one release, refactored some tracks selection usecases according to PRD
2014-08-22 14:51:04 +03:00
GZharun
4d9d7b933e
[Summary] Resolved conflicts of track header DnD with other operations
2014-08-21 17:41:34 +03:00
GZharun
2a5f669c45
[Summary] DnD for track headers in editor, version 1.0
...
[Details] Track headers became reorder able by DnD
2014-08-21 12:22:53 +03:00
GZharun
4d83cff036
[Summary] Made master track number hidden correctly
...
[Details] Previous implementation was unsafe in terms of C++
2014-08-18 18:43:43 -04:00
GZharun
3fbee2bd6e
[Summary] Made master track number hidden correctly
...
[Details] Previous implementation was unsafe in terms of C++
2014-08-18 16:15:31 -04:00
Ben Loftis
cc55e42783
Cut and Copy should remember the white space at the end of a range.
...
This will be used when you paste with Ripple; it maintains the whitespace that you chose in the selection.
Also fix default setting of Dim contol by storing the default(normal) value for MPControl Controllables.
2014-08-18 12:42:30 -04:00
Paul Davis
10becc1411
add "fade range" operation, bound to alt-f at present by default
2014-08-17 21:00:59 -04:00
Paul Davis
c0118c76a7
add partial support for mute automation (playback does not work, data is not recorded in the session)
2014-08-17 20:32:13 -04:00
Colin Fletcher
92524e00ab
Ripple mode: fix undo of paste
...
Fix undo of region paste operations in ripple mode.
2014-08-17 20:31:20 -04:00
Robin Gareus
a17616f1da
move utility functions into a dedicated namespace
...
Conflicts:
gtk2_ardour/about.cc
gtk2_ardour/editor_ops.cc
2014-08-17 18:51:22 -04:00
Robin Gareus
b130dc032e
Do not allow to de/activate a track while the transport is rolling.
...
roll_delay and latency are only re-calculated when the transport is stopped.
de/activating a track is also not RT-safe.
Conflicts:
gtk2_ardour/mixer_strip.cc
gtk2_ardour/route_time_axis.cc
2014-08-17 17:53:50 -04:00
Colin Fletcher
ccb7a99b17
Ripple mode: ripple all after start of deleted range
...
When deleting a range in ripple mode, ripple everything after the start
point of that range backwards by the length of the range, so that
newly-created regions immediately at the range end move back to the range
start.
2014-08-16 16:49:32 -04:00
Colin Fletcher
9ae10442c3
Ripple mode: ripple when deleting ranges.
...
Make delete, cut and clear of a range ripple the appropriate playlists.
2014-08-16 16:48:56 -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
VKamyshniy
dfd4acfcd1
[Summary] Implementing Igor's change requests
2014-08-12 00:51:07 +03:00
GZharun
c61558b761
[Summary] Implemented correct behavior for Master Track in tracks list
...
[Details] Removed context menu item "Remove" for master track
Made master track unmovable in any case
2014-08-08 15:52:10 +03:00
GZharun
be91679fea
[Summary] By filtering redundant notifications which provoke heavy calls during tracks i/o reconnection, performance of the operations that require the reconnection was increased UP TO 60%.
2014-08-06 12:27:23 +03:00
nikolay
be0d2210cc
[Summary] Delete context menu in Track Header and Inspector
...
[Review] GZharun
2014-07-18 12:41:58 +03:00
VKamyshniy
9958f084e5
[Summary] Implementing TRACK Header and INSPECTOR UI
2014-07-08 12:12:12 +03:00
VKamyshniy
b38f8e6b94
[Summary[Summary] Implementing TRACK Header UI
2014-07-07 19:58:33 +03:00
VKamyshniy
3833e3b627
Merge branch 'master' of git.waves.com:waves/tracks
2014-07-04 18:04:39 +03:00
VKamyshniy
3d61950f8a
[Summary] Making the resizing of meters less dependent on the way they are created.
2014-06-26 17:41:45 +03:00
VKamyshniy
e60dea27f6
[Summary] Implementing TRACKS like MIXER VIEW (INSPECTOR)
2014-06-25 14:33:05 +03:00
Grygorii Zharun
ce2a519afa
[Summary] Merging from GIT
...
[Details] Starting point:
Mar 24 2014, 11:47 PM
Commit: 87184ab80d59e6694405
2014-04-18 04:21:54 -05:00
Valeriy Kamyshniy
37838afa1d
[P4/git history rebuild] some changes in track headers without a clear purpose, plus the usual question Stock:: replacement with fixed strings
2014-05-27 21:30:57 -04:00
Robin Gareus
2952ac05e6
fixed a few warnings from clang static analysis
2014-03-18 22:51:44 +01:00
Paul Davis
3020b224fa
Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there
2014-01-10 16:07:57 -05:00
Paul Davis
fa22520fd2
Merge branch 'master' into cairocanvas
2013-11-25 09:26:35 -05:00
Robin Gareus
9a50b56930
reset time-axis peak when meter-point changes - fixes #5771
2013-11-20 18:54:34 +01:00
Paul Davis
08b485db75
send enter events to EVERY newly entered item (ignore the bool return from the event handler); other canvas debugging aids;switch items_at_point() to use canvas coordinates
2013-11-03 10:07:00 -05:00
John Emmas
19bb2b33a8
Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
...
Conflicts (hopefully resolved):
gtk2_ardour/marker.cc
gtk2_ardour/midi_region_view.h
gtk2_ardour/region_gain_line.h
gtk2_ardour/utils.cc
gtk2_ardour/video_image_frame.cc
gtk2_ardour/wscript
libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
Paul Davis
c08b336292
Fix ambiguous type CheckMenuItem that is also defined via windows.h
2013-07-11 15:32:31 -04:00
Paul Davis
580520b12f
fix conflicts caused by meterbridge merge
2013-07-11 09:11:53 -04:00
Robin Gareus
2b53ac2e31
amend cb7bcb6d - locked-solo button style
2013-07-11 02:31:30 +02:00
Robin Gareus
92494b8965
queue axis resize if port-config changes
2013-07-10 20:48:42 +02:00
Robin Gareus
fbc324ee81
adjust-width/redraw track-header when meter changes
2013-07-10 15:27:09 +02:00
Robin Gareus
6d69567676
fix track-header: show meters the first time 'round.
2013-07-10 15:27:06 +02:00
Robin Gareus
aabe526df2
update track-header layout - proper padding around meters
2013-07-10 15:27:06 +02:00
Robin Gareus
2a534de272
double width of mono-meters in track-header
2013-07-10 15:27:04 +02:00
Robin Gareus
066b385c68
adjust padding of meters in time-axis view (still using border bg color)
2013-07-10 15:27:03 +02:00
Robin Gareus
363b646de9
add margin around meters in editor track header
2013-07-10 15:27:03 +02:00
Paul Davis
1c24a847dd
remove no-op "horizontal_position_changed()" method from StreamView and RouteTimeAxisView
2013-06-16 22:15:32 -04:00
Paul Davis
f00b3b7f11
merge with master
2013-06-13 23:00:24 -04:00
Robin Gareus
ce0aa96838
NOOP - use PBD's std::string to number functions
2013-06-08 09:03:26 +02:00
Paul Davis
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
Paul Davis
b05968fb4e
change frames_per_pixel to samples_per_pixel
2013-04-12 11:31:50 -04:00
Paul Davis
30968b8542
merge with master, including manual merge conflict resolution
2013-04-06 16:12:15 -04:00
