diff options
| author | David Robillard <d@drobilla.net> | 2006-10-21 19:01:50 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-10-21 19:01:50 +0000 |
| commit | fedf3d34f32264ac57c6a222b678dc90f2bb1a88 (patch) | |
| tree | e816c676d12ccc32b7e666792b9a01ab5b5a0367 /gtk2_ardour/public_editor.h | |
| parent | 7bd41538d951c3e476655df741adfbebbb990bde (diff) | |
Merged with trunk R992.
Completely untested other than it compiles, runs, and records somewhat (need to merge again).
git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/public_editor.h')
| -rw-r--r-- | gtk2_ardour/public_editor.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index a37e33bede..716f0b86d0 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -87,11 +87,11 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible { virtual void separate_region_from_selection () = 0; virtual void toggle_playback (bool with_abort) = 0; virtual void set_edit_menu (Gtk::Menu&) = 0; - virtual jack_nframes_t unit_to_frame (double unit) = 0; - virtual double frame_to_unit (jack_nframes_t frame) = 0; + virtual nframes_t unit_to_frame (double unit) = 0; + virtual double frame_to_unit (nframes_t frame) = 0; virtual double frame_to_unit (double frame) = 0; - virtual jack_nframes_t pixel_to_frame (double pixel) = 0; - virtual gulong frame_to_pixel (jack_nframes_t frame) = 0; + virtual nframes_t pixel_to_frame (double pixel) = 0; + virtual gulong frame_to_pixel (nframes_t frame) = 0; virtual Selection& get_selection() const = 0; virtual Selection& get_cut_buffer() const = 0; virtual void play_selection () = 0; @@ -119,14 +119,14 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible { virtual void ensure_float (Gtk::Window&) = 0; virtual void show_window () = 0; virtual TrackViewList* get_valid_views (TimeAxisView*, ARDOUR::RouteGroup* grp = 0) = 0; - virtual jack_nframes_t leftmost_position() const = 0; - virtual jack_nframes_t current_page_frames() const = 0; + virtual nframes_t leftmost_position() const = 0; + virtual nframes_t current_page_frames() const = 0; virtual void temporal_zoom_step (bool coarser) = 0; virtual void scroll_tracks_down_line () = 0; virtual void scroll_tracks_up_line () = 0; virtual bool new_regionviews_display_gain () = 0; virtual void prepare_for_cleanup () = 0; - virtual void reposition_x_origin (jack_nframes_t frame) = 0; + virtual void reposition_x_origin (nframes_t frame) = 0; virtual void remove_last_capture () = 0; virtual void maximise_editing_space() = 0; virtual void restore_editing_space() = 0; |