#include <pbd/stateful.h>
#include <ardour/session.h>
#include <ardour/tempo.h>
+#include <ardour/stretch.h>
#include <ardour/location.h>
#include <ardour/audioregion.h>
+#include <ardour/track.h>
#include "audio_clock.h"
#include "gtk-custom-ruler.h"
#include "region_selection.h"
#include "canvas.h"
#include "draginfo.h"
-#include "tempo_lines.h"
namespace Gtkmm2ext {
class TearOff;
class Marker;
class GroupedButtons;
class AutomationLine;
-class UIExportSpecification;
-class ExportDialog;
class Selection;
+class TempoLines;
class TimeSelection;
class TrackSelection;
class AutomationSelection;
class AudioStreamView;
class ControlPoint;
class SoundFileOmega;
+class RhythmFerret;
#ifdef FFT_ANALYSIS
class AnalysisWindow;
#endif
public:
Editor ();
~Editor ();
-
+
void connect_to_session (ARDOUR::Session *);
ARDOUR::Session* current_session() const { return session; }
+ void first_idle ();
+ virtual bool have_idled() const { return _have_idled; }
- nframes_t leftmost_position() const { return leftmost_frame; }
- nframes_t current_page_frames() const {
- return (nframes_t) floor (canvas_width * frames_per_unit);
+ nframes64_t leftmost_position() const { return leftmost_frame; }
+ nframes64_t current_page_frames() const {
+ return (nframes64_t) floor (canvas_width * frames_per_unit);
}
+ void cycle_snap_mode ();
+ void cycle_snap_choice ();
void set_snap_to (Editing::SnapType);
void set_snap_mode (Editing::SnapMode);
void set_snap_threshold (double pixel_distance) {snap_threshold = pixel_distance;}
void add_imageframe_marker_time_axis(const std::string & track_name, TimeAxisView* marked_track, void*) ;
void connect_to_image_compositor() ;
void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) ;
- TimeAxisView* get_named_time_axis(const std::string & name) ;
#endif
+ TimeAxisView* get_named_time_axis(const std::string & name) ;
+ void foreach_time_axis_view (sigc::slot<void,TimeAxisView&>);
+ void add_to_idle_resize (TimeAxisView*, uint32_t);
+
+ RouteTimeAxisView* get_route_view_by_id (PBD::ID& id);
+
void consider_auditioning (boost::shared_ptr<ARDOUR::Region>);
void hide_a_region (boost::shared_ptr<ARDOUR::Region>);
void remove_a_region (boost::shared_ptr<ARDOUR::Region>);
+#ifdef USE_RUBBERBAND
+ std::vector<std::string> rb_opt_strings;
+#endif
+
/* option editor-access */
void set_show_waveforms (bool yn);
bool show_waveforms() const { return _show_waveforms; }
+ void set_waveform_scale (Editing::WaveformScale);
+
void set_show_waveforms_recording (bool yn);
bool show_waveforms_recording() const { return _show_waveforms_recording; }
/* things that need to be public to be used in the main menubar */
void new_region_from_selection ();
+ void separate_regions_between (const TimeSelection&);
void separate_region_from_selection ();
+ void separate_region_from_punch ();
+ void separate_region_from_loop ();
void separate_regions_using_location (ARDOUR::Location&);
void toggle_playback (bool with_abort);
void transition_to_rolling (bool forward);
/* undo related */
- nframes_t unit_to_frame (double unit) {
- return (nframes_t) rint (unit * frames_per_unit);
+ nframes64_t unit_to_frame (double unit) const {
+ return (nframes64_t) rint (unit * frames_per_unit);
}
- double frame_to_unit (nframes_t frame) {
+ double frame_to_unit (nframes64_t frame) const {
return rint ((double) frame / (double) frames_per_unit);
}
- double frame_to_unit (double frame) {
+ double frame_to_unit (double frame) const {
return rint (frame / frames_per_unit);
}
xscroll_adjustment.
*/
- nframes_t pixel_to_frame (double pixel) {
+ nframes64_t pixel_to_frame (double pixel) const {
/* pixel can be less than zero when motion events
are processed. since we've already run the world->canvas
*/
if (pixel >= 0) {
- return (nframes_t) rint (pixel * frames_per_unit * GNOME_CANVAS(track_canvas.gobj())->pixels_per_unit);
+ return (nframes64_t) rint (pixel * frames_per_unit * GNOME_CANVAS(track_canvas->gobj())->pixels_per_unit);
} else {
return 0;
}
}
- gulong frame_to_pixel (nframes_t frame) {
- return (gulong) rint ((frame / (frames_per_unit * GNOME_CANVAS(track_canvas.gobj())->pixels_per_unit)));
+ gulong frame_to_pixel (nframes64_t frame) const {
+ return (gulong) rint ((frame / (frames_per_unit * GNOME_CANVAS(track_canvas->gobj())->pixels_per_unit)));
}
+ void flush_canvas ();
+
/* selection */
Selection& get_selection() const { return *selection; }
bool extend_selection_to_track (TimeAxisView&);
void play_selection ();
- void select_all_in_selected_tracks (Selection::Operation op);
+ void select_all_in_track (Selection::Operation op);
void select_all (Selection::Operation op);
- void invert_selection_in_selected_tracks ();
+ void invert_selection_in_track ();
void invert_selection ();
+ void deselect_all ();
/* tempo */
void set_show_measures (bool yn);
bool show_measures () const { return _show_measures; }
- bool initial_ruler_update_required;
#ifdef FFT_ANALYSIS
/* analysis window */
#endif
/* export */
-
- /* these initiate export ... */
- void export_session();
- void export_selection();
-
+ void export_audio ();
+ void export_selection ();
+ void export_range ();
+ void export_region ();
void add_toplevel_controls (Gtk::Container&);
Gtk::HBox& get_status_bar_packer() { return status_bar_hpacker; }
void set_zoom_focus (Editing::ZoomFocus);
Editing::ZoomFocus get_zoom_focus () const { return zoom_focus; }
- gdouble get_current_zoom () { return frames_per_unit; }
+ double get_current_zoom () const { return frames_per_unit; }
void temporal_zoom_step (bool coarser);
PlaylistSelector& playlist_selector() const;
void route_name_changed (TimeAxisView *);
- gdouble frames_per_unit;
- nframes_t leftmost_frame;
void clear_playlist (boost::shared_ptr<ARDOUR::Playlist>);
void new_playlists (TimeAxisView* v);
void show_editor_mixer (bool yn);
void show_editor_list (bool yn);
void set_selected_mixer_strip (TimeAxisView&);
- void hide_track_in_display (TimeAxisView& tv);
+ void hide_track_in_display (TimeAxisView& tv, bool temporary = false);
void show_track_in_display (TimeAxisView& tv);
/* nudge is initiated by transport controls owned by ARDOUR_UI */
- void nudge_forward (bool next);
- void nudge_backward (bool next);
+ void nudge_forward (bool next, bool force_playhead);
+ void nudge_backward (bool next, bool force_playhead);
/* nudge initiated from context menu */
bool dragging_playhead () const { return _dragging_playhead; }
void toggle_waveform_visibility ();
+ void toggle_zero_line_visibility ();
void toggle_waveforms_while_recording ();
void toggle_measure_visibility ();
void toggle_logo_visibility ();
/* layers */
void set_layer_model (ARDOUR::LayerModel);
void update_layering_model ();
+
+ void toggle_link_region_and_track_selection ();
/* redirect shared ops menu. caller must free returned menu */
bool new_regionviews_display_gain () { return _new_regionviews_show_envelope; }
void prepare_for_cleanup ();
+ void finish_cleanup ();
void maximise_editing_space();
void restore_editing_space();
- void reset_x_origin (nframes_t);
+ void reset_x_origin (nframes64_t);
void reset_zoom (double);
- void reposition_and_zoom (nframes_t, double);
+ void reposition_and_zoom (nframes64_t, double);
+
+ nframes64_t get_preferred_edit_position (bool ignore_playhead = false);
- nframes_t edit_cursor_position(bool);
bool update_mouse_speed ();
bool decelerate_mouse_speed ();
+ void toggle_meter_updating();
+
+ void show_rhythm_ferret();
+
+ void goto_visual_state (uint32_t);
+ void save_visual_state (uint32_t);
+
+ void queue_draw_resize_line (int at);
+ void start_resize_line_ops ();
+ void end_resize_line_ops ();
+
protected:
void map_transport_state ();
- void map_position_change (nframes_t);
+ void map_position_change (nframes64_t);
void on_realize();
+ bool on_expose_event (GdkEventExpose*);
private:
bool constructed;
// to keep track of the playhead position for control_scroll
- boost::optional<nframes_t> _control_scroll_target;
+ boost::optional<nframes64_t> _control_scroll_target;
PlaylistSelector* _playlist_selector;
- void set_frames_per_unit (double);
+ typedef std::pair<TimeAxisView*,XMLNode*> TAVState;
- Editing::MouseMode mouse_mode;
+ struct VisualState {
+ double y_position;
+ double frames_per_unit;
+ nframes64_t leftmost_frame;
+ Editing::ZoomFocus zoom_focus;
+ bool zoomed_to_region;
+ std::list<TAVState> track_states;
+ };
+
+ std::list<VisualState*> undo_visual_stack;
+ std::list<VisualState*> redo_visual_stack;
+ VisualState* current_visual_state (bool with_tracks = true);
+ void undo_visual_state ();
+ void redo_visual_state ();
+ void use_visual_state (VisualState&);
+ bool no_save_visual;
+ void swap_visual_state ();
+
+ std::vector<VisualState*> visual_states;
+ sigc::connection visual_state_op_connection;
+ void start_visual_state_op (uint32_t n);
+ void cancel_visual_state_op (uint32_t n);
+ bool end_visual_state_op (uint32_t n);
+
+ nframes64_t leftmost_frame;
+ double frames_per_unit;
+ Editing::ZoomFocus zoom_focus;
+
+ void set_frames_per_unit (double);
+ void post_zoom ();
+
+ Editing::MouseMode mouse_mode;
Editing::MidiEditMode midi_edit_mode;
int post_maximal_editor_width;
void location_gone (ARDOUR::Location *);
void remove_marker (ArdourCanvas::Item&, GdkEvent*);
gint really_remove_marker (ARDOUR::Location* loc);
+ void goto_nth_marker (int nth);
uint32_t location_marker_color;
uint32_t location_range_color;
struct LocationMarkers {
Marker* start;
Marker* end;
+ bool valid;
+ LocationMarkers () : start(0), end(0), valid (true) {}
+
~LocationMarkers ();
void hide();
void show ();
void set_name (const string&);
- void set_position (nframes_t start, nframes_t end = 0);
+ void set_position (nframes64_t start, nframes64_t end = 0);
void set_color_rgba (uint32_t);
};
- LocationMarkers *find_location_markers (ARDOUR::Location *);
- ARDOUR::Location* find_location_from_marker (Marker *, bool& is_start);
+ LocationMarkers *find_location_markers (ARDOUR::Location *) const;
+ ARDOUR::Location* find_location_from_marker (Marker *, bool& is_start) const;
+ Marker* entered_marker;
typedef std::map<ARDOUR::Location*,LocationMarkers *> LocationMarkerMap;
LocationMarkerMap location_markers;
void hide_marker (ArdourCanvas::Item*, GdkEvent*);
void clear_marker_display ();
- void mouse_add_new_marker (nframes_t where);
+ void mouse_add_new_marker (nframes64_t where, bool is_cd=false, bool is_xrun=false);
+ bool choose_new_marker_name(string &name);
+ void update_cd_marker_display ();
+ void ensure_cd_marker_updated (LocationMarkers * lam, ARDOUR::Location * location);
TimeAxisView* clicked_axisview;
RouteTimeAxisView* clicked_routeview;
* editor_canvas_events.cc
*/
RegionView* clicked_regionview;
-
- RegionView* latest_regionview;
+ RegionSelection latest_regionviews;
uint32_t clicked_selection;
CrossfadeView* clicked_crossfadeview;
ControlPoint* clicked_control_point;
- void sort_track_selection ();
+ void sort_track_selection (TrackSelection* sel = 0);
void get_relevant_tracks (std::set<RouteTimeAxisView*>& relevant_tracks);
void get_equivalent_regions (RegionView* rv, std::vector<RegionView*>&) const;
/* functions to be passed to mapover_tracks(), possibly with sigc::bind()-supplied arguments */
void mapped_get_equivalent_regions (RouteTimeAxisView&, uint32_t, RegionView*, vector<RegionView*>*) const;
- void mapped_use_new_playlist (RouteTimeAxisView&, uint32_t);
- void mapped_use_copy_playlist (RouteTimeAxisView&, uint32_t);
+ void mapped_use_new_playlist (RouteTimeAxisView&, uint32_t, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
+ void mapped_use_copy_playlist (RouteTimeAxisView&, uint32_t, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
void mapped_clear_playlist (RouteTimeAxisView&, uint32_t);
/* end */
void catch_vanishing_regionview (RegionView *);
- bool set_selected_track (TimeAxisView&, Selection::Operation op = Selection::Set, bool no_remove=false);
+ void set_selected_track (TimeAxisView&, Selection::Operation op = Selection::Set, bool no_remove=false);
void select_all_tracks ();
+ int get_regionview_count_from_region_list (boost::shared_ptr<ARDOUR::Region> region);
+
bool set_selected_control_point_from_click (Selection::Operation op = Selection::Set, bool no_remove=false);
- bool set_selected_track_from_click (bool press, Selection::Operation op = Selection::Set, bool no_remove=false);
+ void set_selected_track_from_click (bool press, Selection::Operation op = Selection::Set, bool no_remove=false);
+ void set_selected_track_as_side_effect (bool force = false);
bool set_selected_regionview_from_click (bool press, Selection::Operation op = Selection::Set, bool no_track_remove=false);
void set_selected_regionview_from_region_list (boost::shared_ptr<ARDOUR::Region> region, Selection::Operation op = Selection::Set);
+ bool set_selected_regionview_from_map_event (GdkEventAny*, StreamView*, boost::weak_ptr<ARDOUR::Region>);
void collect_new_region_view (RegionView *);
void collect_and_select_new_region_view (RegionView *);
+
+ Gtk::Menu track_context_menu;
+ Gtk::Menu track_region_context_menu;
+ Gtk::Menu track_selection_context_menu;
+ Gtk::Menu track_crossfade_context_menu;
Gtk::MenuItem* region_edit_menu_split_item;
Gtk::MenuItem* region_edit_menu_split_multichannel_item;
-
- void popup_track_context_menu (int, int, nframes_t);
- Gtk::Menu* build_track_context_menu (nframes_t);
- void add_bus_or_audio_track_context_items (Gtk::Menu_Helpers::MenuList&);
- void add_region_context_items (Gtk::Menu_Helpers::MenuList&);
+ Gtk::Menu * track_region_edit_playlist_menu;
+ Gtk::Menu * track_edit_playlist_submenu;
+ Gtk::Menu * track_selection_edit_playlist_submenu;
+
+ void popup_track_context_menu (int, int, ItemType, bool, nframes64_t);
+ Gtk::Menu* build_track_context_menu (nframes64_t);
+ Gtk::Menu* build_track_bus_context_menu (nframes64_t);
+ Gtk::Menu* build_track_region_context_menu (nframes64_t frame);
+ Gtk::Menu* build_track_crossfade_context_menu (nframes64_t);
+ Gtk::Menu* build_track_selection_context_menu (nframes64_t);
+ void add_dstream_context_items (Gtk::Menu_Helpers::MenuList&);
+ void add_bus_context_items (Gtk::Menu_Helpers::MenuList&);
+ void add_region_context_items (StreamView*, boost::shared_ptr<ARDOUR::Region>, Gtk::Menu_Helpers::MenuList&);
void add_crossfade_context_items (AudioStreamView*, boost::shared_ptr<ARDOUR::Crossfade>, Gtk::Menu_Helpers::MenuList&, bool many);
void add_selection_context_items (Gtk::Menu_Helpers::MenuList&);
Gtk::VBox global_vpacker;
Gtk::VBox vpacker;
+ bool need_resize_line;
+ int resize_line_y;
+ int old_resize_line_y;
+
Gdk::Cursor* current_canvas_cursor;
+ void set_canvas_cursor ();
+ Gdk::Cursor* which_grabber_cursor ();
- ArdourCanvas::CanvasAA track_canvas;
- ArdourCanvas::CanvasAA time_canvas;
+ ArdourCanvas::Canvas* track_canvas;
ArdourCanvas::Text* first_action_message;
ArdourCanvas::Text* verbose_canvas_cursor;
Gtk::EventBox time_canvas_event_box;
Gtk::EventBox track_canvas_event_box;
Gtk::EventBox time_button_event_box;
- Gtk::Frame time_button_frame;
+ Gtk::EventBox ruler_label_event_box;
ArdourCanvas::Group *minsec_group;
ArdourCanvas::Pixbuf *logo_item;
ArdourCanvas::Group *marker_group;
ArdourCanvas::Group *range_marker_group;
ArdourCanvas::Group *transport_marker_group;
+ ArdourCanvas::Group* cd_marker_group;
+
+ ArdourCanvas::Group* timebar_group;
+
+ /* These bars never need to be scrolled */
+ ArdourCanvas::Group* meter_bar_group;
+ ArdourCanvas::Group* tempo_bar_group;
+ ArdourCanvas::Group* marker_bar_group;
+ ArdourCanvas::Group* range_marker_bar_group;
+ ArdourCanvas::Group* transport_marker_bar_group;
+ ArdourCanvas::Group* cd_marker_bar_group;
+
+ /** The group containing all items that require horizontal scrolling. */
+ ArdourCanvas::Group* _master_group;
+
+ /* The group containing all trackviews. Only scrolled vertically. */
+ ArdourCanvas::Group* _trackview_group;
+
+ /* The group used for region motion. Sits on top of _trackview_group */
+ ArdourCanvas::Group* _region_motion_group;
- enum {
+ enum RulerType {
ruler_metric_smpte = 0,
ruler_metric_bbt = 1,
ruler_metric_frames = 2,
ruler_time_marker = 6,
ruler_time_range_marker = 7,
ruler_time_transport_marker = 8,
+ ruler_time_cd_marker = 9,
};
static GtkCustomMetric ruler_metrics[4];
- bool ruler_shown[9];
+ Glib::RefPtr<Gtk::ToggleAction> ruler_timecode_action;
+ Glib::RefPtr<Gtk::ToggleAction> ruler_bbt_action;
+ Glib::RefPtr<Gtk::ToggleAction> ruler_samples_action;
+ Glib::RefPtr<Gtk::ToggleAction> ruler_minsec_action;
+ Glib::RefPtr<Gtk::ToggleAction> ruler_tempo_action;
+ Glib::RefPtr<Gtk::ToggleAction> ruler_meter_action;
+ Glib::RefPtr<Gtk::ToggleAction> ruler_marker_action;
+ Glib::RefPtr<Gtk::ToggleAction> ruler_range_action;
+ Glib::RefPtr<Gtk::ToggleAction> ruler_loop_punch_action;
+ Glib::RefPtr<Gtk::ToggleAction> ruler_cd_marker_action;
bool no_ruler_shown_update;
gint ruler_button_press (GdkEventButton*);
gint ruler_button_release (GdkEventButton*);
gint ruler_mouse_motion (GdkEventMotion*);
+ bool ruler_scroll (GdkEventScroll* event);
gint ruler_pressed_button;
Gtk::Widget * ruler_grabbed_widget;
void compute_fixed_ruler_scale (); //calculates the RulerScale of the fixed rulers
void update_fixed_rulers ();
void update_tempo_based_rulers ();
- void popup_ruler_menu (nframes_t where = 0, ItemType type = RegionItem);
+ void popup_ruler_menu (nframes64_t where = 0, ItemType type = RegionItem);
void update_ruler_visibility ();
+ void set_ruler_visible (RulerType, bool);
+ void toggle_ruler_visibility (RulerType rt);
void ruler_toggled (int);
gint ruler_label_button_release (GdkEventButton*);
void store_ruler_visibility ();
gint bbt_nmarks;
uint32_t bbt_bar_helper_on;
uint32_t bbt_accent_modulo;
- void compute_bbt_ruler_scale (nframes_t lower, nframes_t upper);
+ void compute_bbt_ruler_scale (nframes64_t lower, nframes64_t upper);
gint metric_get_smpte (GtkCustomRulerMark **, gdouble, gdouble, gint);
gint metric_get_bbt (GtkCustomRulerMark **, gdouble, gdouble, gint);
static const double timebar_height;
guint32 visible_timebars;
+ gdouble canvas_timebars_vsize;
Gtk::Menu *editor_ruler_menu;
ArdourCanvas::SimpleRect* tempo_bar;
ArdourCanvas::SimpleRect* marker_bar;
ArdourCanvas::SimpleRect* range_marker_bar;
ArdourCanvas::SimpleRect* transport_marker_bar;
-
+ ArdourCanvas::SimpleRect* cd_marker_bar;
+
Gtk::Label minsec_label;
Gtk::Label bbt_label;
Gtk::Label smpte_label;
Gtk::Label mark_label;
Gtk::Label range_mark_label;
Gtk::Label transport_mark_label;
+ Gtk::Label cd_mark_label;
Gtk::VBox time_button_vbox;
Editor& editor;
ArdourCanvas::Points points;
ArdourCanvas::Line canvas_item;
- nframes_t current_frame;
+ nframes64_t current_frame;
double length;
Cursor (Editor&, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*));
~Cursor ();
- void set_position (nframes_t);
+ void set_position (nframes64_t);
void set_length (double units);
void set_y_axis (double position);
};
*/
Cursor* playhead_cursor;
- Cursor* edit_cursor;
ArdourCanvas::Group* cursor_group;
+ void cursor_to_region_boundary (Cursor*, int32_t dir);
+ void cursor_to_next_region_boundary (Cursor*);
+ void cursor_to_previous_region_boundary (Cursor*);
void cursor_to_next_region_point (Cursor*, ARDOUR::RegionPoint);
void cursor_to_previous_region_point (Cursor*, ARDOUR::RegionPoint);
void cursor_to_region_point (Cursor*, ARDOUR::RegionPoint, int32_t dir);
void cursor_to_selection_start (Cursor *);
void cursor_to_selection_end (Cursor *);
+
+ void selected_marker_to_region_boundary (int32_t dir);
+ void selected_marker_to_next_region_boundary ();
+ void selected_marker_to_previous_region_boundary ();
+ void selected_marker_to_next_region_point (ARDOUR::RegionPoint);
+ void selected_marker_to_previous_region_point (ARDOUR::RegionPoint);
+ void selected_marker_to_region_point (ARDOUR::RegionPoint, int32_t dir);
+ void selected_marker_to_selection_start ();
+ void selected_marker_to_selection_end ();
+
void select_all_selectables_using_cursor (Cursor *, bool);
- void select_all_selectables_between_cursors (Cursor *, Cursor *);
+ void select_all_selectables_using_edit (bool);
+ void select_all_selectables_between (bool within);
+ void select_range_between ();
- boost::shared_ptr<ARDOUR::Region> find_next_region (nframes_t, ARDOUR::RegionPoint, int32_t dir, TrackViewList&, TimeAxisView ** = 0);
+ boost::shared_ptr<ARDOUR::Region> find_next_region (nframes64_t, ARDOUR::RegionPoint, int32_t dir, TrackViewList&, TimeAxisView ** = 0);
+ nframes64_t find_next_region_boundary (nframes64_t, int32_t dir, const TrackViewList&);
- vector<nframes_t> region_boundary_cache;
+ vector<nframes64_t> region_boundary_cache;
void build_region_boundary_cache ();
- Gtk::VBox trackview_vpacker;
-
Gtk::HBox top_hbox;
Gtk::HBox bottom_hbox;
Gtk::Layout controls_layout;
bool control_layout_scroll (GdkEventScroll* ev);
void controls_layout_size_request (Gtk::Requisition*);
+ sigc::connection controls_layout_size_request_connection;
Gtk::HScrollbar edit_hscrollbar;
bool _dragging_hscrollbar;
double canvas_width;
double canvas_height;
double full_canvas_height;
- nframes_t last_canvas_frame;
+ nframes64_t last_canvas_frame;
bool track_canvas_map_handler (GdkEventAny*);
- bool time_canvas_map_handler (GdkEventAny*);
gint edit_controls_button_release (GdkEventButton*);
Gtk::Menu *edit_controls_left_menu;
Gtk::Menu *edit_controls_right_menu;
+ Gtk::VBox ruler_label_vbox;
Gtk::VBox track_canvas_vbox;
Gtk::VBox time_canvas_vbox;
Gtk::VBox edit_controls_vbox;
Gtk::HBox edit_controls_hbox;
void control_scroll (float);
- bool deferred_control_scroll (nframes_t);
+ void access_action (std::string,std::string);
+ bool deferred_control_scroll (nframes64_t);
sigc::connection control_scroll_connection;
+ gdouble get_trackview_group_vertical_offset () const { return vertical_adjustment.get_value () - canvas_timebars_vsize;}
+ ArdourCanvas::Group* get_trackview_group () const { return _trackview_group; }
+ double last_trackview_group_vertical_offset;
void tie_vertical_scrolling ();
+ void scroll_canvas_horizontally ();
+ void scroll_canvas_vertically ();
void canvas_horizontally_scrolled ();
- static int _idle_canvas_horizontally_scrolled (void *arg);
- bool idle_canvas_horizontally_scrolled ();
+ void canvas_scroll_to (nframes64_t);
struct VisualChange {
enum Type {
};
Type pending;
- nframes_t time_origin;
+ nframes64_t time_origin;
double frames_per_unit;
int idle_handler_id;
static int _idle_visual_changer (void *arg);
int idle_visual_changer ();
- void queue_visual_change (nframes_t);
+ void queue_visual_change (nframes64_t);
void queue_visual_change (double);
void end_location_changed (ARDOUR::Location*);
struct RegionListDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
RegionListDisplayModelColumns() {
- add (name);
+ add (name);
add (region);
add (color_);
+ add (start);
+ add (end);
+ add (length);
+ add (sync);
+ add (fadein);
+ add (fadeout);
+ add (locked);
+ add (glued);
+ add (muted);
+ add (opaque);
+ add (used);
+ add (path);
}
Gtk::TreeModelColumn<Glib::ustring> name;
Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Region> > region;
Gtk::TreeModelColumn<Gdk::Color> color_;
+ Gtk::TreeModelColumn<Glib::ustring> start;
+ Gtk::TreeModelColumn<Glib::ustring> end;
+ Gtk::TreeModelColumn<Glib::ustring> length;
+ Gtk::TreeModelColumn<Glib::ustring> sync;
+ Gtk::TreeModelColumn<Glib::ustring> fadein;
+ Gtk::TreeModelColumn<Glib::ustring> fadeout;
+ Gtk::TreeModelColumn<bool> locked;
+ Gtk::TreeModelColumn<bool> glued;
+ Gtk::TreeModelColumn<bool> muted;
+ Gtk::TreeModelColumn<bool> opaque;
+ Gtk::TreeModelColumn<Glib::ustring> used;
+ Gtk::TreeModelColumn<Glib::ustring> path;
};
RegionListDisplayModelColumns region_list_columns;
Gtkmm2ext::DnDTreeView<boost::shared_ptr<ARDOUR::Region> > region_list_display;
- std::list<sigc::connection> region_state_changed_connections;
-
+
Glib::RefPtr<Gtk::TreeStore> region_list_model;
Glib::RefPtr<Gtk::ToggleAction> toggle_full_region_list_action;
Glib::RefPtr<Gtk::ToggleAction> toggle_show_auto_regions_action;
void region_list_region_changed (ARDOUR::Change, boost::weak_ptr<ARDOUR::Region>);
void region_list_selection_changed ();
bool region_list_selection_filter (const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::Path& path, bool yn);
+ void region_name_edit (const Glib::ustring&, const Glib::ustring&);
+ void get_regions_corresponding_to (boost::shared_ptr<ARDOUR::Region> region, std::vector<RegionView*>& regions);
Gtk::Menu *region_list_menu;
Gtk::ScrolledWindow region_list_scroller;
static Gdk::Cursor* trimmer_cursor;
static Gdk::Cursor* selector_cursor;
static Gdk::Cursor* grabber_cursor;
+ static Gdk::Cursor* grabber_edit_point_cursor;
static Gdk::Cursor* zoom_cursor;
static Gdk::Cursor* time_fx_cursor;
static Gdk::Cursor* fader_cursor;
static Gdk::Cursor* speaker_cursor;
static Gdk::Cursor* midi_pencil_cursor;
static Gdk::Cursor* midi_select_cursor;
+ static Gdk::Cursor* midi_resize_cursor;
static Gdk::Cursor* midi_erase_cursor;
static Gdk::Cursor* wait_cursor;
static Gdk::Cursor* timebar_cursor;
+ static Gdk::Cursor* transparent_cursor;
static void build_cursors ();
sigc::connection scroll_connection;
- nframes_t last_update_frame;
- void center_screen (nframes_t);
- void center_screen_internal (nframes_t, float);
+ nframes64_t last_update_frame;
+ void center_screen (nframes64_t);
+ void center_screen_internal (nframes64_t, float);
void update_current_screen ();
void session_going_away ();
- nframes_t cut_buffer_start;
- nframes_t cut_buffer_length;
+ nframes64_t cut_buffer_start;
+ nframes64_t cut_buffer_length;
bool typed_event (ArdourCanvas::Item*, GdkEvent*, ItemType);
bool button_press_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);
void register_actions ();
- int ensure_cursor (nframes_t* pos);
+ int ensure_cursor (nframes64_t* pos);
void handle_new_region (boost::weak_ptr<ARDOUR::Region>);
+ void handle_new_regions (vector<boost::weak_ptr<ARDOUR::Region> >& );
void handle_region_removed (boost::weak_ptr<ARDOUR::Region>);
void add_region_to_region_display (boost::shared_ptr<ARDOUR::Region>);
+ void add_regions_to_region_display (std::vector<boost::weak_ptr<ARDOUR::Region> > & );
void region_hidden (boost::shared_ptr<ARDOUR::Region>);
void redisplay_regions ();
+ void populate_row (boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &);
+ void update_region_row (boost::shared_ptr<ARDOUR::Region>);
+ bool update_region_subrows (boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &, int);
+ void update_all_region_rows ();
+ void update_all_region_subrows (Gtk::TreeModel::Row const &, int);
+ bool no_region_list_redisplay;
void insert_into_tmp_regionlist(boost::shared_ptr<ARDOUR::Region>);
list<boost::shared_ptr<ARDOUR::Region> > tmp_region_list;
void cut_copy (Editing::CutCopyOp);
bool can_cut_copy () const;
void cut_copy_points (Editing::CutCopyOp);
- void cut_copy_regions (Editing::CutCopyOp);
+ void cut_copy_regions (Editing::CutCopyOp, RegionSelection&);
void cut_copy_ranges (Editing::CutCopyOp);
void mouse_paste ();
- void paste_internal (nframes_t position, float times);
+ void paste_internal (nframes64_t position, float times);
/* EDITING OPERATIONS */
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 ();
void lower_region_to_bottom ();
void split_region ();
- void split_region_at (nframes_t);
- void split_regions_at (nframes_t, RegionSelection&);
+ void split_region_at (nframes64_t);
+ void split_regions_at (nframes64_t, RegionSelection&);
+ void split_region_at_transients ();
+ void split_region_at_points (boost::shared_ptr<ARDOUR::Region>, ARDOUR::AnalysisFeatureList&, bool can_ferret);
void crop_region_to_selection ();
- void set_a_regions_sync_position (boost::shared_ptr<ARDOUR::Region>, nframes_t);
- void set_region_sync_from_edit_cursor ();
+ void crop_region_to (nframes64_t start, nframes64_t end);
+ void set_sync_point (nframes64_t, const RegionSelection&);
+ void set_region_sync_from_edit_point ();
void remove_region_sync();
- void align_selection (ARDOUR::RegionPoint, nframes_t position);
- void align_selection_relative (ARDOUR::RegionPoint point, nframes_t position);
- void align_region (boost::shared_ptr<ARDOUR::Region>, ARDOUR::RegionPoint point, nframes_t position);
- void align_region_internal (boost::shared_ptr<ARDOUR::Region>, ARDOUR::RegionPoint point, nframes_t position);
+ void align_selection (ARDOUR::RegionPoint, nframes64_t position, const RegionSelection&);
+ void align_selection_relative (ARDOUR::RegionPoint point, nframes64_t position, const RegionSelection&);
+ void align_region (boost::shared_ptr<ARDOUR::Region>, ARDOUR::RegionPoint point, nframes64_t position);
+ void align_region_internal (boost::shared_ptr<ARDOUR::Region>, ARDOUR::RegionPoint point, nframes64_t position);
void remove_selected_regions ();
void remove_clicked_region ();
void edit_region ();
+ void rename_region ();
void duplicate_some_regions (RegionSelection&, float times);
void duplicate_selection (float times);
void region_fill_selection ();
void audition_playlist_region_standalone (boost::shared_ptr<ARDOUR::Region>);
void audition_playlist_region_via_route (boost::shared_ptr<ARDOUR::Region>, ARDOUR::Route&);
void split_multichannel_region();
- void reverse_regions ();
- void normalize_regions ();
- void denormalize_regions ();
- void quantize_regions ();
+ void reverse_region ();
+ void normalize_region ();
+ void denormalize_region ();
+ void adjust_region_scale_amplitude (bool up);
+ void quantize_region ();
+
+ void do_insert_time ();
+ void insert_time (nframes64_t pos, nframes64_t distance, Editing::InsertTimeOption opt, bool ignore_music_glue, bool markers_too);
+
+ void tab_to_transient (bool forward);
+
+ void use_region_as_bar ();
+ void use_range_as_bar ();
+
+ void define_one_bar (nframes64_t start, nframes64_t end);
void audition_region_from_region_list ();
void hide_region_from_region_list ();
void reset_focus ();
+ void split ();
+
void cut ();
void copy ();
void paste (float times);
int get_prefix (float&, bool&);
void keyboard_paste ();
- void keyboard_duplicate_region ();
- void keyboard_duplicate_selection ();
void keyboard_insert_region_list_selection ();
void region_from_selection ();
- void create_region_from_selection (std::vector<boost::shared_ptr<ARDOUR::AudioRegion> >&);
-
- bool region_renamed;
- void rename_region ();
- void rename_region_finished (bool);
+ void create_region_from_selection (std::vector<boost::shared_ptr<ARDOUR::Region> >&);
void play_from_start ();
- void play_from_edit_cursor ();
+ void play_from_edit_point ();
+ void play_from_edit_point_and_return ();
void play_selected_region ();
- void audition_selected_region ();
+ void play_edit_range ();
void loop_selected_region ();
void play_location (ARDOUR::Location&);
void loop_location (ARDOUR::Location&);
- Editing::ZoomFocus zoom_focus;
-
void temporal_zoom_selection ();
+ void temporal_zoom_region (bool both_axes);
+ void toggle_zoom_region (bool both_axes);
+ bool zoomed_to_region;
void temporal_zoom_session ();
void temporal_zoom (gdouble scale);
- void temporal_zoom_by_frame (nframes_t start, nframes_t end, const string & op);
- void temporal_zoom_to_frame (bool coarser, nframes_t frame);
+ void temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string & op);
+ void temporal_zoom_to_frame (bool coarser, nframes64_t frame);
void amplitude_zoom (gdouble scale);
void amplitude_zoom_step (bool in);
void insert_region_list_drag (boost::shared_ptr<ARDOUR::Region>, int x, int y);
void insert_region_list_selection (float times);
+ void insert_route_list_drag (boost::shared_ptr<ARDOUR::Route>, int x, int y);
+
/* import & embed */
void add_external_audio_action (Editing::ImportMode);
void external_audio_dialog ();
+ void session_import_dialog ();
+
+ int check_whether_and_how_to_import(string, bool all_or_nothing = true);
bool check_multichannel_status (const std::vector<Glib::ustring>& paths);
SoundFileOmega* sfbrowser;
void bring_in_external_audio (Editing::ImportMode mode, nframes64_t& pos);
+
+ void _do_import (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t&);
void do_import (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t&);
+ bool idle_do_import (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t&);
void _do_embed (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode, nframes64_t&);
void do_embed (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode, nframes64_t&);
bool idle_do_embed (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode, nframes64_t&);
int import_sndfiles (vector<Glib::ustring> paths, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t& pos,
- int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::AudioTrack>&);
+ int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&, bool);
int embed_sndfiles (vector<Glib::ustring> paths, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode,
- nframes64_t& pos, int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::AudioTrack>&);
+ nframes64_t& pos, int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&);
int add_sources (vector<Glib::ustring> paths, ARDOUR::SourceList& sources, nframes64_t& pos, Editing::ImportMode,
- int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::AudioTrack>&, bool add_channel_suffix);
- int finish_bringing_in_audio (boost::shared_ptr<ARDOUR::AudioRegion> region, uint32_t, uint32_t, nframes64_t& pos, Editing::ImportMode mode,
- boost::shared_ptr<ARDOUR::AudioTrack>& existing_track);
+ int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&, bool add_channel_suffix);
+ int finish_bringing_in_material (boost::shared_ptr<ARDOUR::Region> region, uint32_t, uint32_t, nframes64_t& pos, Editing::ImportMode mode,
+ boost::shared_ptr<ARDOUR::Track>& existing_track);
boost::shared_ptr<ARDOUR::AudioTrack> get_nth_selected_audio_track (int nth) const;
+ boost::shared_ptr<ARDOUR::MidiTrack> get_nth_selected_midi_track (int nth) const;
/* generic interthread progress window */
void move_to_end ();
void goto_frame ();
void center_playhead ();
- void center_edit_cursor ();
+ void center_edit_point ();
void edit_cursor_backward ();
void edit_cursor_forward ();
+ void playhead_forward_to_grid ();
+ void playhead_backward_to_grid ();
void playhead_backward ();
void playhead_forward ();
void scroll_playhead (bool forward);
void set_selection_from_range (ARDOUR::Location&);
void set_selection_from_punch ();
void set_selection_from_loop ();
- void set_selection_from_audio_region ();
+ void set_selection_from_region ();
+ void add_location_mark (nframes64_t where);
void add_location_from_audio_region ();
void add_location_from_selection ();
void set_loop_from_selection (bool play);
void set_punch_from_selection ();
-
- void set_loop_range (nframes_t start, nframes_t end, std::string cmd);
- void set_punch_range (nframes_t start, nframes_t end, std::string cmd);
+ void set_punch_from_region ();
+
+ void set_loop_from_edit_range (bool play);
+ void set_loop_from_region (bool play);
+ void set_punch_from_edit_range ();
+
+ void set_loop_range (nframes64_t start, nframes64_t end, std::string cmd);
+ void set_punch_range (nframes64_t start, nframes64_t end, std::string cmd);
void add_location_from_playhead_cursor ();
+ bool select_new_marker;
void reverse_selection ();
void edit_envelope ();
void stop_scrolling ();
bool _scrubbing;
- bool have_full_mouse_speed;
- nframes64_t last_scrub_frame;
- double last_scrub_time;
- int mouse_speed_update;
- double mouse_direction;
- double compute_mouse_speed ();
- void add_mouse_speed (double, double);
- double* mouse_speed;
- size_t mouse_speed_entries;
- size_t mouse_speed_size;
+ double last_scrub_x;
+ int scrubbing_direction;
+ int scrub_reversals;
+ int scrub_reverse_distance;
+ void scrub ();
void keyboard_selection_begin ();
void keyboard_selection_finish (bool add);
bool have_pending_keyboard_selection;
- nframes_t pending_keyboard_selection_start;
+ nframes64_t pending_keyboard_selection_start;
boost::shared_ptr<ARDOUR::Region> select_region_for_operation (int dir, TimeAxisView **tv);
void extend_selection_to_end_of_region (bool next);
void start_grab (GdkEvent*, Gdk::Cursor* cursor = 0);
bool end_grab (ArdourCanvas::Item*, GdkEvent*);
void swap_grab (ArdourCanvas::Item*, Gdk::Cursor* cursor, uint32_t time);
+ void break_drag ();
+ void finalize_drag ();
Gtk::Menu fade_context_menu;
void popup_fade_context_menu (int, int, ArdourCanvas::Item*, ItemType);
void set_fade_in_shape (ARDOUR::AudioRegion::FadeShape);
void set_fade_out_shape (ARDOUR::AudioRegion::FadeShape);
-
+
+ void set_fade_length (bool in);
+ void toggle_fade_active (bool in);
void set_fade_in_active (bool);
void set_fade_out_active (bool);
std::set<boost::shared_ptr<ARDOUR::Playlist> > motion_frozen_playlists;
+ RegionSelection pre_drag_region_selection;
void region_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*);
void region_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*);
void create_region_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*);
void create_region_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*);
+ bool check_region_drag_possible (RouteTimeAxisView**);
+ void possibly_copy_regions_during_grab (GdkEvent*);
+ void region_drag_splice_motion_callback (ArdourCanvas::Item*, GdkEvent*);
+ void region_drag_splice_finished_callback (ArdourCanvas::Item*, GdkEvent*);
bool _dragging_playhead;
+ bool _dragging_edit_point;
void cursor_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*);
void cursor_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*);
void remove_gain_control_point (ArdourCanvas::Item*, GdkEvent*);
void remove_control_point (ArdourCanvas::Item*, GdkEvent*);
- void mouse_brush_insert_region (RegionView*, nframes_t pos);
- void brush (nframes_t);
+ void mouse_brush_insert_region (RegionView*, nframes64_t pos);
+ void brush (nframes64_t);
- 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);
+ void show_verbose_time_cursor (nframes64_t frame, double offset = 0, double xpos=-1, double ypos=-1);
+ void show_verbose_duration_cursor (nframes64_t start, nframes64_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 */
bool canvas_fade_in_handle_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*);
bool canvas_fade_out_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*);
bool canvas_fade_out_handle_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*);
+
+
+ // These variables are used to detect a feedback loop and break it to avoid a gui hang
+private:
+ ArdourCanvas::Item *last_item_entered;
+ int last_item_entered_n;
+public:
+
bool canvas_region_view_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
bool canvas_region_view_name_highlight_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
bool canvas_region_view_name_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
bool canvas_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*);
bool canvas_range_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*);
bool canvas_transport_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*);
+ bool canvas_cd_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*);
bool canvas_imageframe_item_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*);
bool canvas_imageframe_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameTimeAxis*);
/* non-public event handlers */
bool canvas_playhead_cursor_event (GdkEvent* event, ArdourCanvas::Item*);
- bool canvas_edit_cursor_event (GdkEvent* event, ArdourCanvas::Item*);
bool track_canvas_scroll (GdkEventScroll* event);
bool track_canvas_scroll_event (GdkEventScroll* event);
bool track_canvas_motion_notify_event (GdkEventMotion* event);
Gtk::Allocation canvas_allocation;
- bool canvas_idle_queued;
void track_canvas_allocate (Gtk::Allocation alloc);
bool track_canvas_size_allocated ();
- void set_edit_cursor (GdkEvent* event);
- void set_playhead_cursor (GdkEvent* event);
+ void set_playhead_cursor ();
void kbd_driver (sigc::slot<void,GdkEvent*>, bool use_track_canvas = true, bool use_time_canvas = true, bool can_select = true);
- void kbd_set_playhead_cursor ();
- void kbd_set_edit_cursor ();
void kbd_mute_unmute_region ();
- void kbd_split ();
- void kbd_set_sync_position ();
- void kbd_align (ARDOUR::RegionPoint);
- void kbd_align_relative (ARDOUR::RegionPoint);
void kbd_brush ();
- void kbd_audition ();
- void kbd_do_split (GdkEvent*);
- void kbd_do_set_sync_position (GdkEvent* ev);
- void kbd_do_align (GdkEvent*, ARDOUR::RegionPoint);
- void kbd_do_align_relative (GdkEvent*, ARDOUR::RegionPoint);
void kbd_do_brush (GdkEvent*);
void kbd_do_audition (GdkEvent*);
void handle_new_duration ();
void initialize_canvas ();
- int canvas_hroizontally_scrolled_handler_id;
- void reset_horizontally_scrolling_region (Gtk::Allocation* alloc = 0);
- void reset_scrolling_region (Gtk::Allocation* alloc = 0);
/* display control */
ARDOUR::TempoMap::BBTPointList *current_bbt_points;
- ArdourCanvas::Group* time_line_group;
- ArdourCanvas::Group* marker_time_line_group;
-
TempoLines* tempo_lines;
- TempoLines* marker_tempo_lines;
+
+ ArdourCanvas::Group* time_line_group;
void hide_measures ();
void draw_measures ();
void new_tempo_section ();
- void mouse_add_new_tempo_event (nframes_t where);
- void mouse_add_new_meter_event (nframes_t where);
+ void mouse_add_new_tempo_event (nframes64_t where);
+ void mouse_add_new_meter_event (nframes64_t where);
void remove_tempo_marker (ArdourCanvas::Item*);
void remove_meter_marker (ArdourCanvas::Item*);
void marker_menu_edit ();
void marker_menu_remove ();
void marker_menu_rename ();
+ void marker_menu_lock (bool yn);
void marker_menu_hide ();
void marker_menu_loop_range ();
void marker_menu_select_all_selectables_using_range ();
void marker_menu_set_playhead ();
void marker_menu_set_from_playhead ();
void marker_menu_set_from_selection ();
+ void marker_menu_range_to_next ();
void new_transport_marker_menu_set_loop ();
void new_transport_marker_menu_set_punch ();
void update_loop_range_view (bool visibility=false);
Gtk::Menu* range_marker_menu;
Gtk::Menu* transport_marker_menu;
Gtk::Menu* new_transport_marker_menu;
+ Gtk::Menu* cd_marker_menu;
ArdourCanvas::Item* marker_menu_item;
typedef list<Marker*> Marks;
void draw_metric_marks (const ARDOUR::Metrics& metrics);
void compute_current_bbt_points (nframes_t left, nframes_t right);
- int tempo_map_change_idle_handler_id;
void tempo_map_changed (ARDOUR::Change);
void redisplay_tempo (bool immediate_redraw);
void snap_to (nframes64_t& first, int32_t direction = 0, bool for_mark = false);
- void snap_to (nframes_t& first, int32_t direction = 0, bool for_mark = false) {
- /* XXX remove this function when everything moves to 64 bit frame counts */
- nframes64_t first64 = first;
- snap_to (first64, direction, for_mark);
- first = (nframes_t) first64;
- }
- double snap_length_beats (nframes_t start);
+ double snap_length_beats (nframes64_t start);
uint32_t bbt_beat_subdivision;
/* toolbar */
-
+
Gtk::ToggleButton editor_mixer_button;
Gtk::ToggleButton editor_list_button;
-
void editor_mixer_button_toggled ();
void editor_list_button_toggled ();
- AudioClock edit_cursor_clock;
+ AudioClock edit_point_clock;
AudioClock zoom_range_clock;
Gtk::Button zoom_in_button;
Gtk::Button zoom_out_button;
Gtk::ComboBoxText edit_mode_selector;
Gtk::VBox edit_mode_box;
+ void set_edit_mode (ARDOUR::EditMode);
+ void cycle_edit_mode ();
void edit_mode_selection_done ();
Gtk::ComboBoxText snap_type_selector;
void zoom_adjustment_changed();
- void edit_cursor_clock_changed();
+ void edit_point_clock_changed();
void setup_toolbar ();
/* midi toolbar */
Gtk::HBox midi_tool_button_box;
- Gtkmm2ext::TearOff* midi_tool_tearoff;
Gtk::ToggleButton midi_tool_pencil_button;
Gtk::ToggleButton midi_tool_select_button;
+ Gtk::ToggleButton midi_tool_resize_button;
Gtk::ToggleButton midi_tool_erase_button;
+ Gtk::ToggleButton midi_panic_button;
GroupedButtons *midi_tool_button_set;
void midi_edit_mode_toggled (Editing::MidiEditMode m);
bool ignore_midi_edit_mode_toggle;
Gtk::EventBox midi_toolbar_base;
Gtk::Frame midi_toolbar_frame;
+ void midi_panic_toggle ();
void setup_midi_toolbar ();
/* selection process */
void time_selection_changed ();
void track_selection_changed ();
void region_selection_changed ();
+ void sensitize_the_right_region_actions (bool have_selected_regions);
void point_selection_changed ();
+ void marker_selection_changed ();
enum SelectionOp {
CreateSelection,
void region_selection_op (void (ARDOUR::Region::*pmf)(void*), void*);
void region_selection_op (void (ARDOUR::Region::*pmf)(bool), bool);
- bool audio_region_selection_covers (nframes_t where);
+ bool audio_region_selection_covers (nframes64_t where);
/* transport range select process */
enum RangeMarkerOp {
CreateRangeMarker,
- CreateTransportMarker
+ CreateTransportMarker,
+ CreateCDMarker
} range_marker_op;
void start_range_markerbar_op (ArdourCanvas::Item* item, GdkEvent* event, RangeMarkerOp);
void drag_range_markerbar_op (ArdourCanvas::Item* item, GdkEvent* event);
void end_range_markerbar_op (ArdourCanvas::Item* item, GdkEvent* event);
+ ArdourCanvas::SimpleRect* cd_marker_bar_drag_rect;
ArdourCanvas::SimpleRect* range_bar_drag_rect;
ArdourCanvas::SimpleRect* transport_bar_drag_rect;
ArdourCanvas::Line* marker_drag_line;
void drag_rubberband_select (ArdourCanvas::Item* item, GdkEvent* event);
void end_rubberband_select (ArdourCanvas::Item* item, GdkEvent* event);
- bool select_all_within (nframes_t start, nframes_t end, gdouble topy, gdouble boty, const TrackViewList&, Selection::Operation op);
+ bool select_all_within (nframes64_t start, nframes64_t end, gdouble topy, gdouble boty, const TrackViewList&, Selection::Operation op);
ArdourCanvas::SimpleRect *rubberband_rect;
void end_mouse_zoom (ArdourCanvas::Item* item, GdkEvent* event);
ArdourCanvas::SimpleRect *zoom_rect;
- void reposition_zoom_rect (nframes_t start, nframes_t end);
+ void reposition_zoom_rect (nframes64_t start, nframes64_t end);
/* diskstream/route display management */
RouteDisplayModelColumns() {
add (text);
add (visible);
+ add (temporary_visible);
add (tv);
add (route);
}
Gtk::TreeModelColumn<Glib::ustring> text;
Gtk::TreeModelColumn<bool> visible;
+ Gtk::TreeModelColumn<bool> temporary_visible;
Gtk::TreeModelColumn<TimeAxisView*> tv;
Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
};
Gtk::ScrolledWindow route_list_scroller;
Gtk::Menu* route_list_menu;
+ void update_route_visibility ();
+
void sync_order_keys ();
bool ignore_route_order_sync;
bool route_list_display_button_press (GdkEventButton*);
+ void route_list_display_drag_data_received (const Glib::RefPtr<Gdk::DragContext>& context,
+ gint x,
+ gint y,
+ const Gtk::SelectionData& data,
+ guint info,
+ guint time);
+
bool route_list_selection_filter (const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::Path& path, bool yn);
void route_list_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&);
bool autoscroll_active;
int autoscroll_timeout_tag;
- int autoscroll_direction;
+ int autoscroll_x;
+ int autoscroll_y;
+ int last_autoscroll_x;
+ int last_autoscroll_y;
uint32_t autoscroll_cnt;
- nframes_t autoscroll_distance;
-
+ nframes64_t autoscroll_x_distance;
+ double autoscroll_y_distance;
+
static gint _autoscroll_canvas (void *);
bool autoscroll_canvas ();
- void start_canvas_autoscroll (int direction);
+ void start_canvas_autoscroll (int x, int y);
void stop_canvas_autoscroll ();
- void maybe_autoscroll (GdkEvent*);
+ void maybe_autoscroll (GdkEventMotion*);
+ void maybe_autoscroll_horizontally (GdkEventMotion*);
+ bool allow_vertical_scroll;
/* trimming */
enum TrimOp {
void start_trim (ArdourCanvas::Item*, GdkEvent*);
void point_trim (GdkEvent*);
void trim_motion_callback (ArdourCanvas::Item*, GdkEvent*);
- void single_contents_trim (RegionView&, nframes_t, bool, bool, bool);
- void single_start_trim (RegionView&, nframes_t, bool, bool);
- void single_end_trim (RegionView&, nframes_t, bool, bool);
+ void single_contents_trim (RegionView&, nframes64_t, bool, bool, bool);
+ void single_start_trim (RegionView&, nframes64_t, bool, bool);
+ void single_end_trim (RegionView&, nframes64_t, bool, bool);
void trim_finished_callback (ArdourCanvas::Item*, GdkEvent*);
void thaw_region_after_trim (RegionView& rv);
-
- void trim_region_to_edit_cursor ();
- void trim_region_from_edit_cursor ();
+
+ void trim_region_front();
+ void trim_region_back();
+ void trim_region (bool front);
+
+ void trim_region_to_edit_point ();
+ void trim_region_from_edit_point ();
+ void trim_region_to_loop ();
+ void trim_region_to_punch ();
+ void trim_region_to_location (const ARDOUR::Location&, const char* cmd);
bool show_gain_after_trim;
guint info,
guint time);
- /* audio export */
+ void drop_routes (const Glib::RefPtr<Gdk::DragContext>& context,
+ gint x,
+ gint y,
+ const Gtk::SelectionData& data,
+ guint info,
+ guint time);
- ExportDialog *export_dialog;
- ExportDialog *export_range_markers_dialog;
-
- void export_range (nframes_t start, nframes_t end);
- void export_range_markers ();
+ /* audio export */
int write_region_selection(RegionSelection&);
bool write_region (string path, boost::shared_ptr<ARDOUR::AudioRegion>);
- void export_region ();
void bounce_region_selection ();
- void bounce_range_selection ();
+ void bounce_range_selection (bool replace);
void external_edit_region ();
int write_audio_selection (TimeSelection&);
void begin_reversible_command (string cmd_name);
void commit_reversible_command ();
- /* visual history */
-
- UndoHistory visual_history;
- UndoTransaction current_visual_command;
-
-
void update_title ();
void update_title_s (const string & snapshot_name);
static void* _freeze_thread (void*);
void* freeze_thread ();
- void freeze_routes ();
- void unfreeze_routes ();
+ void freeze_route ();
+ void unfreeze_route ();
/* edit-group solo + mute */
/* duplication */
- void duplicate_dialog (bool for_region);
+ void duplicate_dialog (bool with_dialog);
- nframes_t event_frame (GdkEvent*, double* px = 0, double* py = 0);
+ nframes64_t event_frame (GdkEvent*, double* px = 0, double* py = 0) const;
+
+ /* returns false if mouse pointer is not in track or marker canvas
+ */
+ bool mouse_frame (nframes64_t&, bool& in_track_canvas) const;
void time_fx_motion (ArdourCanvas::Item*, GdkEvent*);
void start_time_fx (ArdourCanvas::Item*, GdkEvent*);
void end_time_fx (ArdourCanvas::Item*, GdkEvent*);
- struct TimeStretchDialog : public ArdourDialog {
- ARDOUR::Session::TimeStretchRequest request;
+ struct TimeFXDialog : public ArdourDialog {
+ ARDOUR::TimeFXRequest request;
Editor& editor;
+ bool pitching;
+ Gtk::Adjustment pitch_octave_adjustment;
+ Gtk::Adjustment pitch_semitone_adjustment;
+ Gtk::Adjustment pitch_cent_adjustment;
+ Gtk::SpinButton pitch_octave_spinner;
+ Gtk::SpinButton pitch_semitone_spinner;
+ Gtk::SpinButton pitch_cent_spinner;
RegionSelection regions;
Gtk::ProgressBar progress_bar;
+
+ /* SoundTouch */
Gtk::ToggleButton quick_button;
Gtk::ToggleButton antialias_button;
+ Gtk::HBox upper_button_box;
+
+ /* RubberBand */
+ Gtk::ComboBoxText stretch_opts_selector;
+ Gtk::Label stretch_opts_label;
+ Gtk::ToggleButton precise_button;
+ Gtk::HBox opts_box;
+
Gtk::Button* cancel_button;
Gtk::Button* action_button;
- Gtk::HBox upper_button_box;
Gtk::VBox packer;
int status;
- TimeStretchDialog (Editor& e);
+ TimeFXDialog (Editor& e, bool for_pitch);
gint update_progress ();
sigc::connection first_cancel;
sigc::connection first_delete;
- void cancel_timestretch_in_progress ();
- gint delete_timestretch_in_progress (GdkEventAny*);
+ void cancel_in_progress ();
+ gint delete_in_progress (GdkEventAny*);
};
/* "whats mine is yours" */
- friend class TimeStretchDialog;
+ friend class TimeFXDialog;
+
+ TimeFXDialog* current_timefx;
- TimeStretchDialog* current_timestretch;
+ static void* timefx_thread (void *arg);
+ void do_timefx (TimeFXDialog&);
- static void* timestretch_thread (void *arg);
- int run_timestretch (RegionSelection&, float fraction);
- void do_timestretch (TimeStretchDialog&);
+ int time_stretch (RegionSelection&, float fraction);
+ int pitch_shift (RegionSelection&, float cents);
+ void pitch_shift_regions ();
+ int time_fx (RegionSelection&, float val, bool pitching);
/* editor-mixer strip */
/* nudging tracks */
- void nudge_selected_tracks (bool use_edit_cursor, bool forwards);
+ void nudge_track (bool use_edit_point, bool forwards);
/* xfades */
Gtk::VBox nudge_vbox;
AudioClock nudge_clock;
- nframes_t get_nudge_distance (nframes_t pos, nframes_t& next);
+ nframes64_t get_nudge_distance (nframes64_t pos, nframes64_t& next);
+
+ bool nudge_forward_release (GdkEventButton*);
+ bool nudge_backward_release (GdkEventButton*);
/* audio filters */
/* tracking step changes of track height */
TimeAxisView* current_stepping_trackview;
- struct timeval last_track_height_step_timestamp;
+ ARDOUR::microseconds_t last_track_height_step_timestamp;
gint track_height_step_timeout();
sigc::connection step_timeout;
TimeAxisView* entered_track;
RegionView* entered_regionview;
+
+
+ void ensure_entered_track_selected (bool op_acts_on_objects = false);
bool clear_entered_track;
- gint left_track_canvas (GdkEventCrossing*);
+ bool left_track_canvas (GdkEventCrossing*);
+ bool entered_track_canvas (GdkEventCrossing*);
void set_entered_track (TimeAxisView*);
void set_entered_regionview (RegionView*);
gint left_automation_track ();
bool _new_regionviews_show_envelope;
+ void reset_canvas_action_sensitivity (bool);
void toggle_gain_envelope_visibility ();
void toggle_gain_envelope_active ();
void reset_region_gain_envelopes ();
- Gtk::CheckMenuItem* region_envelope_visible_item;
- Gtk::CheckMenuItem* region_envelope_active_item;
- Gtk::CheckMenuItem* region_mute_item;
- Gtk::CheckMenuItem* region_lock_item;
- Gtk::CheckMenuItem* region_lock_position_item;
- Gtk::CheckMenuItem* region_opaque_item;
-
bool on_key_press_event (GdkEventKey*);
+ bool on_key_release_event (GdkEventKey*);
void session_state_saved (string);
void history_changed ();
Gtk::HBox status_bar_hpacker;
+
+ Editing::EditPoint _edit_point;
+
+ Gtk::ComboBoxText edit_point_selector;
+
+ void set_edit_point_preference (Editing::EditPoint ep, bool force = false);
+ void cycle_edit_point (bool with_marker);
+ void set_edit_point ();
+ void edit_point_selection_done ();
+ void edit_point_chosen (Editing::EditPoint);
+ Glib::RefPtr<Gtk::RadioAction> edit_point_action (Editing::EditPoint);
+ std::vector<std::string> edit_point_strings;
+
+ void selected_marker_moved (ARDOUR::Location*);
+ sigc::connection edit_point_clock_connection_a;
+ sigc::connection edit_point_clock_connection_b;
+
+ bool get_edit_op_range (nframes64_t& start, nframes64_t& end) const;
+
+ void get_regions_at (RegionSelection&, nframes64_t where, const TrackSelection& ts) const;
+ void get_regions_after (RegionSelection&, nframes64_t where, const TrackSelection& ts) const;
+
+ void get_regions_for_action (RegionSelection&, bool allowed_entered_regionview = false);
+
+ sigc::connection fast_screen_update_connection;
+ gint start_updating ();
+ gint stop_updating ();
+ void fast_update_strips ();
+ bool meters_running;
+
+ void select_next_route ();
+ void select_prev_route ();
+
+ void snap_to_internal (nframes64_t& first, int32_t direction = 0, bool for_mark = false);
+
+ RhythmFerret* rhythm_ferret;
+
+ void fit_tracks ();
+ void set_track_height (uint32_t h);
+ void set_track_height_largest ();
+ void set_track_height_large ();
+ void set_track_height_larger ();
+ void set_track_height_normal ();
+ void set_track_height_smaller ();
+ void set_track_height_small ();
+
+ void remove_tracks ();
+ void toggle_tracks_active ();
+ void waveform_scale_chosen (Editing::WaveformScale);
+
+ bool _have_idled;
+ int resize_idle_id;
+ int32_t resize_idle_target;
+ bool idle_resize();
+ friend gboolean _idle_resize (gpointer);
+ std::vector<TimeAxisView*> pending_resizes;
};
#endif /* __ardour_editor_h__ */