ardour/livetrax
13
0
Fork 0
Code
13,392 Commits 1 Branch 1 Tag 194 MiB
5086cc3f49
Commit Graph

129 Commits

Author SHA1 Message Date
Paul Davis
97109672c7 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-06-03 16:09:06 -04:00
Paul Davis
68c5f05704 remove final reference to jack headers 2014-04-10 10:14:45 -04: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
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
ecd188d5e6 Add missing ellipsis on Edit menu item. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9372 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-04-19 10:18:34 +00:00
Carl Hetherington
5af8917460 Restore context menu to session markers. Fixes #3655. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8427 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-01-04 01:40:47 +00:00
Paul Davis
3fab3ead7d remove line parent member from Marker, part 3 
git-svn-id: svn://localhost/ardour2/branches/3.0@8361 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-29 13:48:25 +00:00
Carl Hetherington
a19e79f4f0 Fix crashes after removing markers. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8039 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-14 23:47:09 +00:00
Carl Hetherington
8496f57fd4 Prevent marker labels overlapping. Fixes #3535. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8015 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-12 22:51:54 +00:00
Carl Hetherington
af5bd3df30 Fix update of range marker names. Fixes #3533. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8012 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-12 18:53:15 +00:00
Carl Hetherington
4527566217 Visual tweaks to marker lines. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8011 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-11 15:21:37 +00:00
Carl Hetherington
fcfbd65268 Further fixes for #3529. Show marker lines the same colour as their marker; adjust height of lines. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8009 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-11 13:36:38 +00:00
Carl Hetherington
ba8b84eed1 Option to show lines below markers (#3529). 
git-svn-id: svn://localhost/ardour2/branches/3.0@7993 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-10 18:29:32 +00:00
Paul Davis
ede4ecbb00 megaopus patch #2 for today: remove nframes64_t and sframes_t from source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7792 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-17 18:20:37 +00:00
Paul Davis
10bdce85a0 megaopus commit: (1) add __STD_(LIMIT|FORMAT)_MACROS to command line flags for cc and c++ builds, remove them from source (2) add new Property::midi_data used by MidiRegion to signal that its (MIDI) contents have changed (3) massive switch from nframes_t to framepos_t/framecnt_t including removal of ARDOUR::max_frames (replaced by ARDOUR::max_frame{pos,cnt} (lots more to do but this set was driven by changes to the Diskstream API to use framepos_t 
git-svn-id: svn://localhost/ardour2/branches/3.0@7791 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-17 16:24:22 +00:00
Carl Hetherington
48063c15df Improve ctrl-click behaviour of automation points. Should fix #3385. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7584 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-10 01:52:49 +00:00
Carl Hetherington
5b520324ce Allow markers to be glued to bar/beat time. Fixes #1815. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7573 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-09 16:40:31 +00:00
Carl Hetherington
6f512fe1e9 Copy-edit. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7570 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-09 14:11:44 +00:00
Carl Hetherington
e8dc5539a0 Use a ticked Lock item for markers rather than Lock / Unlock. Fixes #2136. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7561 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-07 23:31:07 +00:00
Carl Hetherington
8e76b4944c Fix programming error on removing marker. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7088 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-05-09 23:31:07 +00:00
Carl Hetherington
8c423ea228 Small cleanups to dragging code. Fix assertion failure on dragging a regions' parent entry from the region list to the canvas (which may be #2811). Fixes to drags of regions onto and then back off canvas; should fix #3109. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7068 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-05-05 22:09:07 +00:00
Carl Hetherington
c2da4ec8f9 Prevent multiple tempo / meter changes being inserted at the same point 
on the timeline; adding a new change at the same time as an existing one
will replace the existing one.  Should prevent #769 from happening.

Some cleanups and tweaks to tempo / meter dialogues.  Desensitize Remove
menu option for those changes that can't be removed.



git-svn-id: svn://localhost/ardour2/branches/3.0@7045 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-05-02 23:14:43 +00:00