diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-05-02 20:21:54 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-05-02 20:21:54 -0400 |
| commit | e2f0c5f91e2579c41d8efc9495b6ebac31a61ba3 (patch) | |
| tree | b8a15778c018df9c3615d7a1b0d6cc41dfef6626 /gtk2_ardour/public_editor.h | |
| parent | c358e77e1e81a68fcb8b18cd71a31c38262b2af7 (diff) | |
| parent | 3973ce81b37a9ba6fcd2e7ff95ca730b0aa32252 (diff) | |
merge resolution with master
Diffstat (limited to 'gtk2_ardour/public_editor.h')
| -rw-r--r-- | gtk2_ardour/public_editor.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index d95b29d814..c76dd35196 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -288,6 +288,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible { virtual void add_to_idle_resize (TimeAxisView*, int32_t) = 0; virtual framecnt_t get_nudge_distance (framepos_t pos, framecnt_t& next) = 0; virtual Evoral::MusicalTime get_grid_type_as_beats (bool& success, framepos_t position) = 0; + virtual void edit_notes (TimeAxisViewItem&) = 0; virtual void queue_visual_videotimeline_update () = 0; virtual void toggle_ruler_video (bool) = 0; @@ -299,14 +300,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible { virtual void embed_audio_from_video (std::string, framepos_t n = 0) = 0; virtual void export_video () = 0; -#ifdef WITH_CMT - virtual void connect_to_image_compositor() = 0; - virtual void add_imageframe_time_axis(const std::string & track_name, void*) = 0; - virtual void add_imageframe_marker_time_axis(const std::string & track_name, TimeAxisView* marked_track, void*) = 0; - virtual void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) = 0; - virtual TimeAxisView* get_named_time_axis(const std::string & name) = 0; -#endif - virtual RouteTimeAxisView* get_route_view_by_route_id (const PBD::ID& id) const = 0; virtual void get_equivalent_regions (RegionView* rv, std::vector<RegionView*>&, PBD::PropertyID) const = 0; |