smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-31 19:07:43 +01:00
Code Issues Projects Releases Wiki Activity
15066 commits 103 branches 145 tags 318 MiB
Commit graph

148 commits

Author SHA1 Message Date
Paul Davis
c4be44fe6e move all marker/midi related code into Editor (since the visual elements in the GUI are all part of the Editor window, and populate/alter dropdowns as necessary. 
We connect to the PortManager signals to indicate when ports are connected/registered/disconnected/unregistered.

Still to do: ensure initial visual state is consistent with actual backend state
 2014-10-01 17:50:56 -04:00
Paul Davis
5bd1fad1be add members and methods for use displaying MIDI scene change activity 2014-10-01 17:50:55 -04:00
Paul Davis
6a5023c736 Functional: marker undo now works without deadlocks; overlapping skip 
ranges work as agreed with Igor.

Implementation: change semantics of Location signals, change Locations
API, fix Session to handle signals correctly, clean up use of
Locations::apply() to avoid deadlock
 2014-09-30 15:23:40 -04:00
Paul Davis
cffd50766a further pixel-by-pixel tweaks to deal with the fact that the skip bar is 1 pixel shorter than the marker bar 2014-09-24 12:38:29 -04:00
Paul Davis
01fa5ba3a2 use Waves' approach to GUI layout (pixel by pixel) to get vertical alignment in arrange area correct (or at least more correct) 2014-09-24 11:37:49 -04:00
Paul Davis
2e1417fe45 split apart loop bar and ruler so that we can have different event processing on them naturally. 
Checking mouse coordinates to decide what to do basically sucks. Plus expand explanatory comments a little.
 2014-09-23 22:42:32 -04:00
Paul Davis
0472453d94 many substantive changes in the handling of ARDOUR::Location, Markers and drags/clicks on Markers. 
It would have been nice to split this commit into parts, but it is all very interconnected and was not possible to
subdivide.
 2014-09-23 10:49:21 -04:00
Paul Davis
e29836232a add ::canvas_height_set() virtual method back to Marker, so we can track canvas height 2014-09-23 10:49:21 -04:00
Paul Davis
12e7de3f48 start moving responsibility for color management for Markers from Editor into Markers 2014-09-21 17:38:48 -04:00
Paul Davis
f6e9f26045 Markers now hold ptr-to-ARDOUR::Location where appropriate 2014-09-21 17:38:47 -04:00
Paul Davis
63abfea552 use new ARDOUR::Location signals in GUI 2014-09-19 22:50:50 -04:00
Paul Davis
42809db01d getting rulers/marker bars closer to PRD: add new ruler group, use new Marker API 2014-09-19 16:24:40 -04:00
Paul Davis
a95ec7ca5b various changes to accomodate skip markers (which span the entire range of an ARDOUR::Location) and to add drag-to-create-skip 2014-09-17 21:42:33 -04:00
Paul Davis
16fca5e6e4 remove old connections to (now) static Location signals 2014-09-17 16:29:36 -04:00
Ben Loftis
0e44be211c fix various loop-initiation faults 2014-09-17 07:06:05 -04:00
Paul Davis
908bffa5a1 use Marker::default_new_marker_prefix 2014-09-11 17:00:18 -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
87fa554ac9 initial redesign of canvas scrolling to facilitate independent x- and y-axis scrolling of specific groups within the canvas. 
This commit should cause no change in behaviour, but contains all the code and changes necessary
for the next step
 2014-08-17 13:37:16 -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
0e5ffd5784 eliminating dependency on JACK 
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 452245]
 2014-04-10 09:50:18 -05:00
John Emmas
21c32d68ef Move '++next' (when sorting marker labels) so there's absolutely no chance of incrementing it once it reaches the list end 2014-03-15 14:40:36 +00:00
Paul Davis
42e6353338 fix thinko when relabelling markers 2014-03-14 13:46:30 -04: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
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
ea1ccb869a fix merge with master 2013-10-31 13:16:51 -04:00
Colin Fletcher
8c26a2fab0 Don't allow loop, punch, or session range markers to be renamed. 
Don't allow loop, punch, or session range markers to be renamed, even when
double-clicked.
 2013-10-25 17:03:45 +01:00
Colin Fletcher
db0f2aad48 Mark session dirty when a marker is renamed. 2013-10-25 17:03:45 +01:00
Colin Fletcher
abb05680b4 Make double-click on marker pop up rename dialogue. 2013-10-25 17:03:45 +01: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
e2f0c5f91e merge resolution with master 2013-05-02 20:21:54 -04:00
Paul Davis
63e4c37def remove unnecessary sigc++ header 2013-04-30 13:50:44 -04:00
Paul Davis
d1a05240ef fix clamping of line and rect coordinates to avoid issues with cairo when drawing way outside a surface's dimensions; move various coordinate methods down to Canvas, because they don't require GTK information; make visible_area() a Canvas virtual method so that we don't have to cast to call it 2013-04-17 10:53:17 -04:00
Paul Davis
8877199ae0 leftmost_position => leftmost_sample, current_page_frames => current_page_samples 2013-04-12 11:21:12 -04:00
Paul Davis
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
Paul Davis
aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00
Paul Davis
31172d0c71 tweak recent change to marker context menu 
git-svn-id: svn://localhost/ardour2/branches/3.0@13826 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-10 14:07:46 +00:00
Paul Davis
3a7eeb17bc add/clarify "set range (location) from (range|region) selection" operation (on marker context menu 
git-svn-id: svn://localhost/ardour2/branches/3.0@13825 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-09 21:47:10 +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
Carl Hetherington
d54fb5f54e Add option to add new range marker from the context menu without needing the keyboard (#4378). 
git-svn-id: svn://localhost/ardour2/branches/3.0@12781 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-19 13:54:28 +00:00
Paul Davis
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
d9d0c6b0b3 Fix double separator on session range context menu. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11751 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-22 16:42:21 +00:00
Carl Hetherington
64425f77e7 Remove unused op parameter to temporal_zoom_by_frame. Add Zoom to Range option to range marker context menu (#4778). 
git-svn-id: svn://localhost/ardour2/branches/3.0@11750 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-22 16:41:44 +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
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
5f2690ac65 Remove unused method transport_marker_context_menu(). Allow 
loop / punch markers to be removed (#4379).


git-svn-id: svn://localhost/ardour2/branches/3.0@10210 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-10-16 21:58:29 +00:00
David Robillard
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
e0926ce2c6 Fix marker deletion from 9479 properly. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9481 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-05-05 12:45:24 +00:00
Carl Hetherington
35eecc5916 Remove LocationMarker from the editor's lists before deleting it, as the deletion causes the contents of the editor's list to be deselected. May be related to #3929. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9479 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-05-05 12:08:12 +00:00