diff options
| author | David Robillard <d@drobilla.net> | 2008-02-02 17:22:04 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-02-02 17:22:04 +0000 |
| commit | 80c3677c837cc9eb432df3d65a34aba543fa7258 (patch) | |
| tree | ca23bb7e5bff6c35c151d73221002a9ce3abfe1a /gtk2_ardour/editor.h | |
| parent | 9f63ab9931e6478472853bdda58da47ea29ac125 (diff) | |
Merge with 2.0-ongoing R2988
git-svn-id: svn://localhost/ardour2/branches/3.0@2991 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor.h')
| -rw-r--r-- | gtk2_ardour/editor.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 56b0077b99..5b4e54f4f6 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1019,7 +1019,7 @@ class Editor : public PublicEditor void toggle_region_mute (); void toggle_region_lock (); void toggle_region_opaque (); - void toggle_region_position_lock (); + void set_region_lock_style (ARDOUR::Region::PositionLockStyle); void raise_region (); void raise_region_to_top (); void lower_region (); @@ -1028,7 +1028,7 @@ class Editor : public PublicEditor void split_region_at (nframes_t); void split_regions_at (nframes_t, RegionSelection&); void split_region_at_transients (); - void split_region_at_points (boost::shared_ptr<ARDOUR::Region>, std::vector<nframes64_t>&); + void split_region_at_points (boost::shared_ptr<ARDOUR::Region>, ARDOUR::AnalysisFeatureList&); void crop_region_to_selection (); void crop_region_to (nframes_t start, nframes_t end); void set_sync_point (nframes64_t, const RegionSelection&); @@ -1334,6 +1334,8 @@ class Editor : public PublicEditor void show_verbose_time_cursor (nframes_t frame, double offset = 0, double xpos=-1, double ypos=-1); void show_verbose_duration_cursor (nframes_t start, nframes_t end, double offset = 0, double xpos=-1, double ypos=-1); + double clamp_verbose_cursor_x (double); + double clamp_verbose_cursor_y (double); /* Canvas event handlers */ |