smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-03 20:29:35 +01:00
Code Issues Projects Releases Wiki Activity
13502 commits 104 branches 145 tags 319 MiB
Commit graph

566 commits

Author SHA1 Message Date
VKamyshniy
596e3b9140 [Summary] Progressing MASTER UI and occasional cleanup 2014-07-16 00:12:14 +03:00
VKamyshniy
44dcd48be4 [Summary] Progressing MASTER UI 2014-07-15 00:44:46 +03:00
VKamyshniy
3833e3b627 Merge branch 'master' of git.waves.com:waves/tracks 2014-07-04 18:04:39 +03:00
VKamyshniy
ebe7c829e4 [Summary] XML-izing MIXER STRIP UI 2014-07-04 18:00:45 +03:00
nikolay
f28dcaa77f [Summary] Implementation of the AUTO LOCK TIMER and minor improvement of session_lock_dialog 
[Review] GZharun
 2014-07-03 17:52:57 +03:00
Paul Davis
385629b8c3 add timer-based trigger for locking. 
Also changed the lock dialog to be a normal Gtk::Dialog because ArdourDialog forwards events to the Editor.
Not sure if this is true for WavesDialog at present.
 2014-06-25 08:37:10 -04:00
Paul Davis
c7e7940364 add Editor::lock() and Editor::unlock() and the to-be-replaced Lock dialog from Ardour 2014-06-25 08:00:11 -04:00
Valeriy Kamyshniy
b25e95ef60 [Summary] Adding ZOOM TOOL actions. 
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 464697]
 2014-06-03 20:24:00 -04:00
Valeriy Kamyshniy
0089053814 [Summary] Rearranging transport toolbar and other tools in editor window 
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 461983]
 2014-05-20 09:12:48 -05:00
Valeriy Kamyshniy
5f65b603ad [Summary] Rearranging transport toolbar and other tools in editor window 
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 461669]
 2014-05-19 17:28:29 -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
210689572b [P4/git history rebuild] further changes related to this codebase missing Ardour canvas autoscroll commits. Hopefully to be undone later by commits from a merge by Paul and Grygorii 2014-05-27 21:19:58 -04:00
Paul Davis
4f7d94ea67 latest tweaks to autoscroll: symmetrical boundary on both sides, stop runaway scrolling, and more 2014-03-21 09:49:35 -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
5cbb60d339 fix display of time selection rect(s) when switching mouse modes 2014-02-26 10:50:51 -05:00
Paul Davis
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
Paul Davis
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
Paul Davis
d23c2499bf rationalize, consolidate and make work dbl-click editing for regions and markers, as part of the Drag model rather than discretely 2014-01-27 10:09:58 -05:00
Paul Davis
b2895eaa50 fix visibility of punch and loop rects. 
They used to be in the time_line_group but this is regularly cleared of all its members (which were assumed to be time lines).
 2014-01-26 14:04:23 -05: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
ea1ccb869a fix merge with master 2013-10-31 13:16:51 -04:00
Colin Fletcher
abb05680b4 Make double-click on marker pop up rename dialogue. 2013-10-25 17:03:45 +01:00
Colin Fletcher
89193dc40b Add a double-click handler for items in the editor window. 2013-10-25 17:03:45 +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
Colin Fletcher
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
Paul Davis
c222acecaa fix #5609 (import with 1 track per channel mis-associates tracks + channels) 
when using ImportDistinctChannels, correctly name regions so that playlists for each channel/track
are also named differently, and thus reloaded properly when the session is reloaded.
 2013-08-08 15:24:15 -04:00
Colin Fletcher
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
Paul Davis
d5209cb4bf fix #5609 (import with 1 track per channel mis-associates tracks + channels) 
when using ImportDistinctChannels, correctly name regions so that playlists for each channel/track
are also named differently, and thus reloaded properly when the session is reloaded.
 2013-07-23 11:29:10 -04: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
e1b0f1bd0b merge with master 2013-05-04 22:41:10 -04:00
Paul Davis
40944574c6 the big rework of window management. probably not complete at thsi point, but this is mostly functional 2013-05-04 22:02:05 -04:00
Paul Davis
e2f0c5f91e merge resolution with master 2013-05-02 20:21:54 -04:00
Paul Davis
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
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
54bf06e63c Merge branch 'master' into cairocanvas 2013-04-26 14:20:11 -04:00
Paul Davis
db34831b18 redesign toggling of editor/mixer stacking to use Gtkmm2ext::VisibilityTracker 2013-04-26 14:12:52 -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
Robin Gareus
5cac4a6885 vtl: get rid of unused "bar" inside the ruler 2013-04-17 02:27:17 +02:00
Robin Gareus
1227f2b73e vtl: get rid of one more unnecessary canvas-group 2013-04-17 02:27:06 +02: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