diff options
Diffstat (limited to 'gtk2_ardour/public_editor.h')
| -rw-r--r-- | gtk2_ardour/public_editor.h | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index 375594f2bc..9a3f68da71 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -100,8 +100,8 @@ bool relay_key_press (GdkEventKey* ev, Gtk::Window* win); bool forward_key_press (GdkEventKey* ev); } -using ARDOUR::framepos_t; -using ARDOUR::framecnt_t; +using ARDOUR::samplepos_t; +using ARDOUR::samplecnt_t; /// Representation of the interface of the Editor class @@ -151,7 +151,7 @@ public: * Snap a value according to the current snap setting. * ensure_snap overrides SnapOff and magnetic snap */ - virtual void snap_to (ARDOUR::MusicFrame& first, + virtual void snap_to (ARDOUR::MusicSample& first, ARDOUR::RoundMode direction = ARDOUR::RoundNearest, bool for_mark = false, bool ensure_snap = false) = 0; @@ -202,13 +202,13 @@ public: virtual void separate_region_from_selection () = 0; virtual void transition_to_rolling (bool fwd) = 0; - virtual framepos_t pixel_to_sample (double pixel) const = 0; - virtual framepos_t playhead_cursor_sample () const = 0; - virtual double sample_to_pixel (framepos_t frame) const = 0; - virtual double sample_to_pixel_unrounded (framepos_t frame) const = 0; + virtual samplepos_t pixel_to_sample (double pixel) const = 0; + virtual samplepos_t playhead_cursor_sample () const = 0; + virtual double sample_to_pixel (samplepos_t sample) const = 0; + virtual double sample_to_pixel_unrounded (samplepos_t sample) const = 0; virtual Selection& get_selection () const = 0; - virtual bool get_selection_extents (framepos_t &start, framepos_t &end) const = 0; + virtual bool get_selection_extents (samplepos_t &start, samplepos_t &end) const = 0; virtual Selection& get_cut_buffer () const = 0; virtual void set_selection (std::list<Selectable*>, Selection::Operation) = 0; @@ -218,7 +218,7 @@ public: virtual void play_with_preroll () = 0; virtual void rec_with_preroll () = 0; virtual void rec_with_count_in () = 0; - virtual void maybe_locate_with_edit_preroll (framepos_t location) = 0; + virtual void maybe_locate_with_edit_preroll (samplepos_t location) = 0; virtual void goto_nth_marker (int nth) = 0; virtual void trigger_script (int nth) = 0; virtual void add_location_from_playhead_cursor () = 0; @@ -226,8 +226,8 @@ public: virtual void set_show_measures (bool yn) = 0; virtual bool show_measures () const = 0; virtual void remove_tracks () = 0; - virtual void set_loop_range (framepos_t start, framepos_t end, std::string cmd) = 0; - virtual void set_punch_range (framepos_t start, framepos_t end, std::string cmd) = 0; + virtual void set_loop_range (samplepos_t start, samplepos_t end, std::string cmd) = 0; + virtual void set_punch_range (samplepos_t start, samplepos_t end, std::string cmd) = 0; virtual void jump_forward_to_mark () = 0; virtual void jump_backward_to_mark () = 0; @@ -255,10 +255,10 @@ public: /** Import existing media */ virtual void do_import (std::vector<std::string> paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, - ARDOUR::MidiTrackNameSource, ARDOUR::MidiTempoMapDisposition, framepos_t&, + ARDOUR::MidiTrackNameSource, ARDOUR::MidiTempoMapDisposition, samplepos_t&, boost::shared_ptr<ARDOUR::PluginInfo> instrument=boost::shared_ptr<ARDOUR::PluginInfo>()) = 0; virtual void do_embed (std::vector<std::string> paths, Editing::ImportDisposition, Editing::ImportMode mode, - framepos_t&, + samplepos_t&, boost::shared_ptr<ARDOUR::PluginInfo> instrument=boost::shared_ptr<ARDOUR::PluginInfo>()) = 0; /** Open main export dialog */ @@ -276,8 +276,8 @@ public: virtual void register_actions () = 0; virtual void set_zoom_focus (Editing::ZoomFocus) = 0; virtual Editing::ZoomFocus get_zoom_focus () const = 0; - virtual framecnt_t get_current_zoom () const = 0; - virtual void reset_zoom (framecnt_t) = 0; + virtual samplecnt_t get_current_zoom () const = 0; + virtual void reset_zoom (samplecnt_t) = 0; virtual PlaylistSelector& playlist_selector() const = 0; virtual void clear_playlist (boost::shared_ptr<ARDOUR::Playlist>) = 0; virtual void new_playlists (TimeAxisView*) = 0; @@ -308,8 +308,8 @@ public: /** @return true if the playhead is currently being dragged, otherwise false */ virtual bool dragging_playhead () const = 0; - virtual framepos_t leftmost_sample() const = 0; - virtual framecnt_t current_page_samples() const = 0; + virtual samplepos_t leftmost_sample() const = 0; + virtual samplecnt_t current_page_samples() const = 0; virtual double visible_canvas_height () const = 0; virtual void temporal_zoom_step (bool coarser) = 0; virtual void ensure_time_axis_view_is_visible (TimeAxisView const & tav, bool at_top = false) = 0; @@ -321,7 +321,7 @@ public: virtual void select_topmost_track () = 0; virtual void prepare_for_cleanup () = 0; virtual void finish_cleanup () = 0; - virtual void reset_x_origin (framepos_t frame) = 0; + virtual void reset_x_origin (samplepos_t sample) = 0; virtual double get_y_origin () const = 0; virtual void reset_y_origin (double pos) = 0; virtual void set_visible_track_count (int32_t) = 0; @@ -329,17 +329,17 @@ public: virtual void remove_last_capture () = 0; virtual void maximise_editing_space () = 0; virtual void restore_editing_space () = 0; - virtual framepos_t get_preferred_edit_position (Editing::EditIgnoreOption = Editing::EDIT_IGNORE_NONE, bool from_context_menu = false, bool from_outside_canvas = false) = 0; + virtual samplepos_t get_preferred_edit_position (Editing::EditIgnoreOption = Editing::EDIT_IGNORE_NONE, bool from_context_menu = false, bool from_outside_canvas = false) = 0; virtual void toggle_meter_updating() = 0; - virtual void split_regions_at (ARDOUR::MusicFrame, RegionSelection&, bool snap) = 0; + virtual void split_regions_at (ARDOUR::MusicSample, RegionSelection&, bool snap) = 0; virtual void split_region_at_points (boost::shared_ptr<ARDOUR::Region>, ARDOUR::AnalysisFeatureList&, bool can_ferret, bool select_new = false) = 0; - virtual void mouse_add_new_marker (framepos_t where, bool is_cd=false) = 0; + virtual void mouse_add_new_marker (samplepos_t where, bool is_cd=false) = 0; virtual void foreach_time_axis_view (sigc::slot<void,TimeAxisView&>) = 0; virtual void add_to_idle_resize (TimeAxisView*, int32_t) = 0; - virtual framecnt_t get_nudge_distance (framepos_t pos, framecnt_t& next) = 0; - virtual framecnt_t get_paste_offset (framepos_t pos, unsigned paste_count, framecnt_t duration) = 0; - virtual unsigned get_grid_beat_divisions(framepos_t position) = 0; - virtual Evoral::Beats get_grid_type_as_beats (bool& success, framepos_t position) = 0; + virtual samplecnt_t get_nudge_distance (samplepos_t pos, samplecnt_t& next) = 0; + virtual samplecnt_t get_paste_offset (samplepos_t pos, unsigned paste_count, samplecnt_t duration) = 0; + virtual unsigned get_grid_beat_divisions(samplepos_t position) = 0; + virtual Evoral::Beats get_grid_type_as_beats (bool& success, samplepos_t position) = 0; virtual int32_t get_grid_music_divisions (uint32_t event_state) = 0; virtual void edit_notes (MidiRegionView*) = 0; @@ -351,7 +351,7 @@ public: virtual void set_xjadeo_sensitive (bool onoff) = 0; virtual int get_videotl_bar_height () const = 0; virtual void set_video_timeline_height (const int h) = 0; - virtual void embed_audio_from_video (std::string, framepos_t n = 0, bool lock_position_to_video = true) = 0; + virtual void embed_audio_from_video (std::string, samplepos_t n = 0, bool lock_position_to_video = true) = 0; virtual bool track_selection_change_without_scroll () const = 0; @@ -365,7 +365,7 @@ public: sigc::signal<void> ZoomChanged; sigc::signal<void> Realized; - sigc::signal<void,framepos_t> UpdateAllTransportClocks; + sigc::signal<void,samplepos_t> UpdateAllTransportClocks; static sigc::signal<void> DropDownKeys; @@ -397,7 +397,7 @@ public: virtual bool canvas_fade_out_handle_event (GdkEvent* event, ArdourCanvas::Item*, AudioRegionView*, bool) = 0; virtual bool canvas_region_view_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; virtual bool canvas_wave_view_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; - virtual bool canvas_frame_handle_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; + virtual bool canvas_sample_handle_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; virtual bool canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; virtual bool canvas_region_view_name_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; virtual bool canvas_feature_line_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; @@ -431,7 +431,7 @@ public: virtual void set_current_trimmable (boost::shared_ptr<ARDOUR::Trimmable>) = 0; virtual void set_current_movable (boost::shared_ptr<ARDOUR::Movable>) = 0; - virtual void center_screen (framepos_t) = 0; + virtual void center_screen (samplepos_t) = 0; virtual TrackViewList axis_views_from_routes (boost::shared_ptr<ARDOUR::RouteList>) const = 0; virtual TrackViewList const & get_track_views () const = 0; @@ -461,19 +461,19 @@ public: virtual ARDOUR::Location* find_location_from_marker (ArdourMarker *, bool &) const = 0; virtual ArdourMarker* find_marker_from_location_id (PBD::ID const &, bool) const = 0; - virtual void snap_to_with_modifier (ARDOUR::MusicFrame& first, + virtual void snap_to_with_modifier (ARDOUR::MusicSample& first, GdkEvent const * ev, ARDOUR::RoundMode direction = ARDOUR::RoundNearest, bool for_mark = false) = 0; - virtual void get_regions_at (RegionSelection &, framepos_t where, TrackViewList const &) const = 0; - virtual void get_regions_after (RegionSelection&, framepos_t where, const TrackViewList& ts) const = 0; - virtual RegionSelection get_regions_from_selection_and_mouse (framepos_t) = 0; + virtual void get_regions_at (RegionSelection &, samplepos_t where, TrackViewList const &) const = 0; + virtual void get_regions_after (RegionSelection&, samplepos_t where, const TrackViewList& ts) const = 0; + virtual RegionSelection get_regions_from_selection_and_mouse (samplepos_t) = 0; virtual void get_regionviews_by_id (PBD::ID const id, RegionSelection & regions) const = 0; virtual void get_per_region_note_selection (std::list<std::pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > > >&) const = 0; - virtual void mouse_add_new_tempo_event (framepos_t where) = 0; - virtual void mouse_add_new_meter_event (framepos_t where) = 0; + virtual void mouse_add_new_tempo_event (samplepos_t where) = 0; + virtual void mouse_add_new_meter_event (samplepos_t where) = 0; virtual void edit_tempo_section (ARDOUR::TempoSection*) = 0; virtual void edit_meter_section (ARDOUR::MeterSection*) = 0; |