Commit graph

195 commits

Author SHA1 Message Date
YPozdnyakov
501ecd3392 [Summary]: region fade, trim area rework 2014-12-15 15:16:43 +02:00
Nikolay
9a9f9eb878 [Summary] Allow to set waveform colour in the Preference Panel 2014-12-12 11:03:16 +02:00
Paul Davis
37170e234f remove loopbar as part one of refactoring ruler display and event management 2014-11-24 19:29:22 +02:00
GZharun
73709d1a04 [Summary] Added autoscroll support during track headers DnD operation 2014-09-09 17:20:44 +03:00
Paul Davis
92491ebebb add new skip bar, to allow start on skip functionality 2014-09-05 16:07:07 -04:00
Paul Davis
ee1c8b1b60 renamed the transport-marker bar/ruler as punch-loop bar for more clarity in its purpose. 2014-09-05 15:54:58 -04:00
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
267a628b96 [Summary] Delete old INFO panel upon the TOP BAR
[Reviewed] GZharun
2014-08-28 16:45:54 +03:00
Paul Davis
90502b200d scroll up/down by tracks uses top edge as "focal point"; fix some other nasty code details 2014-08-18 12:23:52 -04:00
Paul Davis
f246c98529 fix build after copy-n-paste/code change collision 2014-08-17 20:42:54 -04:00
Paul Davis
fca6419abf some code shuffling to make sure that cut mode always operates at the mouse location, with (maybe) the right regions 2014-08-17 20:42:47 -04:00
Paul Davis
d93526de76 add functionality for cut tool 2014-08-17 20:41:15 -04:00
Ben Loftis
a15ab33edf lots of keybinding changes. added a new action to allow removing markers at the playhead location. numpad now allows you to access marks higher than 9. to locate to a marker, use the numpad decimal to start and end the operation - for example press .19. to locate to marker 19. also added alternate bindings for redo, delete, and several other alternates that will be needed in subsequent commits. tab is not working, using either Tab or nabla in the binding.in file
Conflicts:
	gtk2_ardour/ardour_ui.cc
2014-08-17 20:35:46 -04:00
Robin Gareus
67c1322f0d add RAII DisplaySuspender 2014-08-17 19:49:03 -04:00
Paul Davis
91fa5f7b2a add commentary on why PublicEditor::{_,}ensure_time_axis_view_is_visible() both exist 2014-08-17 19:47:28 -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
Paul Davis
28fdc71d70 more canvas refactoring.
Remove Canvas::Layout, use Canvas::Container for the same purpose, move child-rendering into Item::render_children() so that it
could theoretically be used by any derived type.
2014-08-17 17:44:17 -04:00
Paul Davis
3be5f658ea use newly factored canvas in gtk2_ardour 2014-08-17 17:43:03 -04:00
Paul Davis
4d4851cffc a whole slew of changes related to centralizing and rationalizing cursor management.
Debugging output left in place to help address the reports that will come in as people test this more
2014-08-17 16:23:52 -04:00
Paul Davis
d9cee7a6d6 fix scrolling behaviour in track headers (event was stolen by rulers because event coordinates made it look as if the event happened there) 2014-08-17 15:24:46 -04:00
Paul Davis
91702c2702 forward scroll events from track control headers to the canvas, to get consistent scroll behaviour (whatever that behaviour is)
Conflicts:
	gtk2_ardour/editor.cc
2014-08-17 15:00:07 -04:00
Paul Davis
3af66ff917 remove useless groups from timebar area, clarify scroll group naming in editor 2014-08-17 13:38:50 -04:00
Paul Davis
893452b388 remove timebar canvas and just use a single canvas instead. This is just part one - lots of minor fixes to be done
Conflicts:
	gtk2_ardour/editor.cc
2014-08-17 13:38:30 -04:00
Robin Gareus
40ffd0600b towards region-trims preserving fade duration 2014-08-16 17:58:34 -04:00
Valeriy Kamyshniy
706f89993a [Summary] Making namespace WavesUI a class.
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 466991]
2014-06-12 18:19:50 -04:00
Valeriy Kamyshniy
387653e437 [Summary] Reordering TRACKS top bars
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 461662]
2014-05-19 16:30:55 -05:00
Grygorii Zharun
ce2a519afa [Summary] Merging from GIT
[Details] Starting point:
Mar 24 2014, 11:47 PM
Commit: 87184ab80d

Target point:
Commit: 59e6694405
Apr 16 2014, 4:01 PM

[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 453690]
2014-04-18 04:21:54 -05:00
Valeriy Kamyshniy
0e5ffd5784 eliminating dependency on JACK
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 452245]
2014-04-10 09:50:18 -05:00
Valeriy Kamyshniy
59fa78681b [P4/git history rebuild] more confusion caused by lack of Ardour canvas autoscroll commits. Hopefull undone by later commits from a merge by Paul and Grygorii 2014-05-27 21:29:52 -04:00
Paul Davis
65b4308c84 first pass at quantizing vertical scroll to whole tracks.
Dragging regions vertically does the quantization BUT speed control is lacking and the region ends up on
a track that is still invisible ... to be fixed as the sun rises.
2014-03-21 07:02:32 -04:00
Paul Davis
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
Paul Davis
84f55440a3 fix redrawing of canvas with an optimized build
Best guess right now is that optimization does something bad when ceil() is called twice on a very large dbl-precision number,
which results in a zero (empty) redraw area. Without the removal of the redundant ceil & floor functions, no expose events
would be delivered to the canvas in an optimized build during drags (and maybe more).
2013-12-23 15:35:49 -05:00
Robin Gareus
dc7878760d vtl: do not lock audio [to video] when extracting audio-only. 2013-12-23 10:28:32 +01:00
Paul Davis
e5888d3983 merge with master and fix 2 conflicts 2013-10-16 22:06:56 -04:00
Robin Gareus
c2b2953f8c export video-range: add to context menu 2013-10-12 22:56:08 +02:00
Paul Davis
aaaeb958c1 switch samples_per_pixel to integer type 2013-06-18 23:02:54 -04:00
Robin Gareus
11619a37bf Merge branch 'master' into cairocanvas
Conflicts:
	gtk2_ardour/editor_canvas.cc
	gtk2_ardour/imageframe_time_axis.cc
	gtk2_ardour/imageframe_time_axis.h
	gtk2_ardour/imageframe_time_axis_group.cc
	gtk2_ardour/imageframe_time_axis_group.h
	gtk2_ardour/imageframe_time_axis_view.cc
	gtk2_ardour/imageframe_time_axis_view.h
	gtk2_ardour/imageframe_view.cc
	gtk2_ardour/imageframe_view.h
	gtk2_ardour/marker_time_axis.cc
	gtk2_ardour/marker_time_axis.h
	gtk2_ardour/marker_time_axis_view.cc
	gtk2_ardour/marker_time_axis_view.h
	gtk2_ardour/marker_view.cc
	gtk2_ardour/marker_view.h
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/visual_time_axis.cc
	gtk2_ardour/visual_time_axis.h
	libs/canvas/canvas/circle.h
2013-06-14 21:09:24 +02:00
Robin Gareus
084af4727d remove cruft - old CMT imageframe* 2013-06-14 17:18:59 +02:00
Paul Davis
f00b3b7f11 merge with master 2013-06-13 23:00:24 -04:00
Robin Gareus
6b480bb2f7 vtl: make "Remove Video" insensitive if N/A 2013-06-13 00:58:19 +02:00
Paul Davis
bebe2af95a merge with master 2013-05-08 14:48:28 -04:00
Paul Davis
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
Paul Davis
e2f0c5f91e merge resolution with master 2013-05-02 20:21:54 -04:00
Paul Davis
d14f43ccf2 fix operation of right-click on selected MIDI note to bring up the note editor. this is still not really right long term, but it is better than displaying the channel selector 2013-05-02 15:16:56 -04:00
Paul Davis
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
Paul Davis
f88cfdb478 remove Editor::redraw_measures to improve efficiency of tempo measure line redraws 2013-04-20 16:11:40 -04:00
Paul Davis
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
Paul Davis
64c861a791 fix markers so that the blue line spans both canvases 2013-04-15 16:10:13 -04:00
Paul Davis
7e19053b88 Fix dragging objects on the canvas and remove redundant canvas groups
Delivery of fake motion events to the editor needed the event coordinates to be
in canvas space, as they are with "real" events. Editor and other objects had
many redundant groups from timbyr's work on gnomecanvas to scroll by moving
groups. We don't need this anymore with cairo-canvas (though possibly a
stationay background group for the canvas might be useful again one day as in
the SAE logo. Its implementation would be fairly different though, since we
would have to explicitly move the group on every scroll, since nothing else
ever moves on scroll).

Also tweaks to text item placement, and switch TimeAxisViewItem from
name_pixbuf to name_text, since ArdourCanvas::Text is already "pixbuf optimized".
2013-04-15 13:50:05 -04:00
Paul Davis
af4539f857 a few changes to fix region dragging, all related to coordinate system handling, which is now much simpler with the new canvas; more debugging output when asked for 2013-04-15 10:38:12 -04:00