Gdk::Cursor* Editor::grabber_cursor = 0;
Gdk::Cursor* Editor::grabber_note_cursor = 0;
Gdk::Cursor* Editor::grabber_edit_point_cursor = 0;
-Gdk::Cursor* Editor::zoom_cursor = 0;
+Gdk::Cursor* Editor::zoom_in_cursor = 0;
+Gdk::Cursor* Editor::zoom_out_cursor = 0;
Gdk::Cursor* Editor::time_fx_cursor = 0;
Gdk::Cursor* Editor::fader_cursor = 0;
Gdk::Cursor* Editor::speaker_cursor = 0;
, _pending_locate_request (false)
, _pending_initial_locate (false)
, _last_cut_copy_source_track (0)
+
+ , _region_selection_change_updates_region_list (true)
{
constructed = false;
clicked_crossfadeview = 0;
clicked_control_point = 0;
last_update_frame = 0;
+ pre_press_cursor = 0;
_drags = new DragManager (this);
current_mixer_strip = 0;
current_bbt_points = 0;
TimeAxisView::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&Editor::timeaxisview_deleted, this, _1), gui_context());
- _last_normalization_value = 0;
-
constructed = true;
instant_save ();
+
+ setup_fade_images ();
}
Editor::~Editor()
if (fpu < 1.0) {
fpu = 1.0;
- zoom_range_clock.set ((nframes64_t) floor (fpu * _canvas_width));
+ zoom_range_clock.set ((framepos_t) floor (fpu * _canvas_width));
} else if (fpu > _session->current_end_frame() / _canvas_width) {
fpu = _session->current_end_frame() / _canvas_width;
- zoom_range_clock.set ((nframes64_t) floor (fpu * _canvas_width));
+ zoom_range_clock.set ((framepos_t) floor (fpu * _canvas_width));
}
temporal_zoom (fpu);
/*
_control_scroll_target is an optional<T>
- it acts like a pointer to an nframes64_t, with
+ it acts like a pointer to an framepos_t, with
a operator conversion to boolean to check
that it has a value could possibly use
playhead_cursor->current_frame to store the
_dragging_playhead = true;
}
- if ((fraction < 0.0f) && (*_control_scroll_target < (nframes64_t) fabs(step))) {
+ if ((fraction < 0.0f) && (*_control_scroll_target < (framepos_t) fabs(step))) {
*_control_scroll_target = 0;
- } else if ((fraction > 0.0f) && (max_frames - *_control_scroll_target < step)) {
- *_control_scroll_target = max_frames - (current_page_frames()*2); // allow room for slop in where the PH is on the screen
+ } else if ((fraction > 0.0f) && (max_framepos - *_control_scroll_target < step)) {
+ *_control_scroll_target = max_framepos - (current_page_frames()*2); // allow room for slop in where the PH is on the screen
} else {
- *_control_scroll_target += (nframes64_t) floor (step);
+ *_control_scroll_target += (framepos_t) floor (step);
}
/* move visuals, we'll catch up with it later */
}
bool
-Editor::deferred_control_scroll (nframes64_t /*target*/)
+Editor::deferred_control_scroll (framepos_t /*target*/)
{
_session->request_locate (*_control_scroll_target, _session->transport_rolling());
// reset for next stream
}
void
-Editor::map_position_change (nframes64_t frame)
+Editor::map_position_change (framepos_t frame)
{
ENSURE_GUI_THREAD (*this, &Editor::map_position_change, frame)
}
void
-Editor::center_screen (nframes64_t frame)
+Editor::center_screen (framepos_t frame)
{
double page = _canvas_width * frames_per_unit;
}
void
-Editor::center_screen_internal (nframes64_t frame, float page)
+Editor::center_screen_internal (framepos_t frame, float page)
{
page /= 2;
if (frame > page) {
- frame -= (nframes64_t) page;
+ frame -= (framepos_t) page;
} else {
frame = 0;
}
{
using namespace Gdk;
- Gdk::Color mbg ("#000000" ); /* Black */
- Gdk::Color mfg ("#0000ff" ); /* Blue. */
-
{
- RefPtr<Bitmap> source, mask;
- source = Bitmap::create (mag_bits, mag_width, mag_height);
- mask = Bitmap::create (magmask_bits, mag_width, mag_height);
- zoom_cursor = new Gdk::Cursor (source, mask, mfg, mbg, mag_x_hot, mag_y_hot);
+ Glib::RefPtr<Gdk::Pixbuf> zoom_in_cursor_pixbuf (::get_icon ("zoom_in_cursor"));
+ zoom_in_cursor = new Gdk::Cursor (Gdk::Display::get_default(), zoom_in_cursor_pixbuf, 5, 5);
}
+ {
+ Glib::RefPtr<Gdk::Pixbuf> zoom_out_cursor_pixbuf (::get_icon ("zoom_out_cursor"));
+ zoom_out_cursor = new Gdk::Cursor (Gdk::Display::get_default(), zoom_out_cursor_pixbuf, 5, 5);
+ }
+
Gdk::Color fbg ("#ffffff" );
Gdk::Color ffg ("#000000" );
transparent_cursor = new Gdk::Cursor (bits, bits, c, c, 0, 0);
}
-
- grabber_cursor = new Gdk::Cursor (HAND2);
+ {
+ Glib::RefPtr<Gdk::Pixbuf> grabber_pixbuf (::get_icon ("grabber"));
+ grabber_cursor = new Gdk::Cursor (Gdk::Display::get_default(), grabber_pixbuf, 5, 0);
+ }
{
Glib::RefPtr<Gdk::Pixbuf> grabber_note_pixbuf (::get_icon ("grabber_note"));
items.push_back (SeparatorElem());
if (Profile->get_sae()) {
- items.push_back (MenuElem (_("Linear"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear)));
- items.push_back (MenuElem (_("Slowest"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast)));
+
+ items.push_back (MenuElem (_("Linear"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), FadeLinear)));
+ items.push_back (MenuElem (_("Slowest"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), FadeFast)));
+
} else {
- items.push_back (MenuElem (_("Linear"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear)));
- items.push_back (MenuElem (_("Slowest"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast)));
- items.push_back (MenuElem (_("Slow"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogB)));
- items.push_back (MenuElem (_("Fast"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogA)));
- items.push_back (MenuElem (_("Fastest"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Slow)));
+
+ items.push_back (
+ ImageMenuElem (
+ _("Linear"),
+ *_fade_in_images[FadeLinear],
+ sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), FadeLinear)
+ )
+ );
+
+ dynamic_cast<ImageMenuItem*>(&items.back())->set_always_show_image ();
+
+ items.push_back (
+ ImageMenuElem (
+ _("Slowest"),
+ *_fade_in_images[FadeFast],
+ sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), FadeFast)
+ ));
+
+ dynamic_cast<ImageMenuItem*>(&items.back())->set_always_show_image ();
+
+ items.push_back (
+ ImageMenuElem (
+ _("Slow"),
+ *_fade_in_images[FadeLogB],
+ sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), FadeLogB)
+ ));
+
+ dynamic_cast<ImageMenuItem*>(&items.back())->set_always_show_image ();
+
+ items.push_back (
+ ImageMenuElem (
+ _("Fast"),
+ *_fade_in_images[FadeLogA],
+ sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), FadeLogA)
+ ));
+
+ dynamic_cast<ImageMenuItem*>(&items.back())->set_always_show_image ();
+
+ items.push_back (
+ ImageMenuElem (
+ _("Fastest"),
+ *_fade_in_images[FadeSlow],
+ sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), FadeSlow)
+ ));
+
+ dynamic_cast<ImageMenuItem*>(&items.back())->set_always_show_image ();
}
break;
items.push_back (SeparatorElem());
if (Profile->get_sae()) {
- items.push_back (MenuElem (_("Linear"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear)));
- items.push_back (MenuElem (_("Slowest"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow)));
+ items.push_back (MenuElem (_("Linear"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), FadeLinear)));
+ items.push_back (MenuElem (_("Slowest"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), FadeSlow)));
} else {
- items.push_back (MenuElem (_("Linear"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear)));
- items.push_back (MenuElem (_("Slowest"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow)));
- items.push_back (MenuElem (_("Slow"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogA)));
- items.push_back (MenuElem (_("Fast"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogB)));
- items.push_back (MenuElem (_("Fastest"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Fast)));
+
+ items.push_back (
+ ImageMenuElem (
+ _("Linear"),
+ *_fade_out_images[FadeLinear],
+ sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), FadeLinear)
+ )
+ );
+
+ dynamic_cast<ImageMenuItem*>(&items.back())->set_always_show_image ();
+
+ items.push_back (
+ ImageMenuElem (
+ _("Slowest"),
+ *_fade_out_images[FadeFast],
+ sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), FadeSlow)
+ ));
+
+ dynamic_cast<ImageMenuItem*>(&items.back())->set_always_show_image ();
+
+ items.push_back (
+ ImageMenuElem (
+ _("Slow"),
+ *_fade_out_images[FadeLogB],
+ sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), FadeLogA)
+ ));
+
+ dynamic_cast<ImageMenuItem*>(&items.back())->set_always_show_image ();
+
+ items.push_back (
+ ImageMenuElem (
+ _("Fast"),
+ *_fade_out_images[FadeLogA],
+ sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), FadeLogB)
+ ));
+
+ dynamic_cast<ImageMenuItem*>(&items.back())->set_always_show_image ();
+
+ items.push_back (
+ ImageMenuElem (
+ _("Fastest"),
+ *_fade_out_images[FadeSlow],
+ sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), FadeFast)
+ ));
+
+ dynamic_cast<ImageMenuItem*>(&items.back())->set_always_show_image ();
}
break;
}
void
-Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, bool with_selection, nframes64_t frame)
+Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, bool with_selection, framepos_t frame)
{
using namespace Menu_Helpers;
- Menu* (Editor::*build_menu_function)(nframes64_t);
+ Menu* (Editor::*build_menu_function)(framepos_t);
Menu *menu;
switch (item_type) {
}
Menu*
-Editor::build_track_context_menu (nframes64_t)
+Editor::build_track_context_menu (framepos_t)
{
using namespace Menu_Helpers;
}
Menu*
-Editor::build_track_bus_context_menu (nframes64_t)
+Editor::build_track_bus_context_menu (framepos_t)
{
using namespace Menu_Helpers;
}
Menu*
-Editor::build_track_region_context_menu (nframes64_t frame)
+Editor::build_track_region_context_menu (framepos_t frame)
{
using namespace Menu_Helpers;
MenuList& edit_items = track_region_context_menu.items();
}
Menu*
-Editor::build_track_crossfade_context_menu (nframes64_t frame)
+Editor::build_track_crossfade_context_menu (framepos_t frame)
{
using namespace Menu_Helpers;
MenuList& edit_items = track_crossfade_context_menu.items();
}
Menu*
-Editor::build_track_selection_context_menu (nframes64_t)
+Editor::build_track_selection_context_menu (framepos_t)
{
using namespace Menu_Helpers;
MenuList& edit_items = track_selection_context_menu.items();
Glib::RefPtr<RadioAction>::cast_dynamic(act)->set_active (true);
}
- nframes64_t foo;
+ framepos_t foo;
bool in_track_canvas;
if (!mouse_frame (foo, in_track_canvas)) {
move (x, y);
if (_session && (prop = node.property ("playhead"))) {
- nframes64_t pos;
+ framepos_t pos;
sscanf (prop->value().c_str(), "%" PRIi64, &pos);
playhead_cursor->set_position (pos);
} else {
}
if ((prop = node.property ("left-frame")) != 0){
- nframes64_t pos;
+ framepos_t pos;
if (sscanf (prop->value().c_str(), "%" PRId64, &pos) == 1) {
reset_x_origin (pos);
}
XMLNodeList children = node.children ();
for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
selection->set_state (**i, Stateful::current_state_version);
+ _regions->set_state (**i);
}
return 0;
node->add_property (X_("editor-list-page"), buf);
node->add_child_nocopy (selection->get_state ());
+ node->add_child_nocopy (_regions->get_state ());
return *node;
}
* @param event Event to get current key modifier information from, or 0.
*/
void
-Editor::snap_to_with_modifier (nframes64_t& start, GdkEvent const * event, int32_t direction, bool for_mark)
+Editor::snap_to_with_modifier (framepos_t& start, GdkEvent const * event, int32_t direction, bool for_mark)
{
if (!_session || !event) {
return;
}
void
-Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark)
+Editor::snap_to (framepos_t& start, int32_t direction, bool for_mark)
{
if (!_session || _snap_mode == SnapOff) {
return;
}
void
-Editor::timecode_snap_to_internal (nframes64_t& start, int32_t direction, bool /*for_mark*/)
+Editor::timecode_snap_to_internal (framepos_t& start, int32_t direction, bool /*for_mark*/)
{
- const nframes64_t one_timecode_second = (nframes64_t)(rint(_session->timecode_frames_per_second()) * _session->frames_per_timecode_frame());
- nframes64_t one_timecode_minute = (nframes64_t)(rint(_session->timecode_frames_per_second()) * _session->frames_per_timecode_frame() * 60);
+ const framepos_t one_timecode_second = (framepos_t)(rint(_session->timecode_frames_per_second()) * _session->frames_per_timecode_frame());
+ framepos_t one_timecode_minute = (framepos_t)(rint(_session->timecode_frames_per_second()) * _session->frames_per_timecode_frame() * 60);
switch (_snap_type) {
case SnapToTimecodeFrame:
if (((direction == 0) && (fmod((double)start, (double)_session->frames_per_timecode_frame()) > (_session->frames_per_timecode_frame() / 2))) || (direction > 0)) {
- start = (nframes64_t) (ceil ((double) start / _session->frames_per_timecode_frame()) * _session->frames_per_timecode_frame());
+ start = (framepos_t) (ceil ((double) start / _session->frames_per_timecode_frame()) * _session->frames_per_timecode_frame());
} else {
- start = (nframes64_t) (floor ((double) start / _session->frames_per_timecode_frame()) * _session->frames_per_timecode_frame());
+ start = (framepos_t) (floor ((double) start / _session->frames_per_timecode_frame()) * _session->frames_per_timecode_frame());
}
break;
start -= _session->timecode_offset ();
}
if (((direction == 0) && (start % one_timecode_second > one_timecode_second / 2)) || direction > 0) {
- start = (nframes64_t) ceil ((double) start / one_timecode_second) * one_timecode_second;
+ start = (framepos_t) ceil ((double) start / one_timecode_second) * one_timecode_second;
} else {
- start = (nframes64_t) floor ((double) start / one_timecode_second) * one_timecode_second;
+ start = (framepos_t) floor ((double) start / one_timecode_second) * one_timecode_second;
}
if (_session->timecode_offset_negative())
start -= _session->timecode_offset ();
}
if (((direction == 0) && (start % one_timecode_minute > one_timecode_minute / 2)) || direction > 0) {
- start = (nframes64_t) ceil ((double) start / one_timecode_minute) * one_timecode_minute;
+ start = (framepos_t) ceil ((double) start / one_timecode_minute) * one_timecode_minute;
} else {
- start = (nframes64_t) floor ((double) start / one_timecode_minute) * one_timecode_minute;
+ start = (framepos_t) floor ((double) start / one_timecode_minute) * one_timecode_minute;
}
if (_session->timecode_offset_negative())
{
}
void
-Editor::snap_to_internal (nframes64_t& start, int32_t direction, bool for_mark)
+Editor::snap_to_internal (framepos_t& start, int32_t direction, bool for_mark)
{
- const nframes64_t one_second = _session->frame_rate();
- const nframes64_t one_minute = _session->frame_rate() * 60;
- nframes64_t presnap = start;
- nframes64_t before;
- nframes64_t after;
+ const framepos_t one_second = _session->frame_rate();
+ const framepos_t one_minute = _session->frame_rate() * 60;
+ framepos_t presnap = start;
+ framepos_t before;
+ framepos_t after;
switch (_snap_type) {
case SnapToTimecodeFrame:
case SnapToCDFrame:
if (((direction == 0) && (start % (one_second/75) > (one_second/75) / 2)) || (direction > 0)) {
- start = (nframes64_t) ceil ((double) start / (one_second / 75)) * (one_second / 75);
+ start = (framepos_t) ceil ((double) start / (one_second / 75)) * (one_second / 75);
} else {
- start = (nframes64_t) floor ((double) start / (one_second / 75)) * (one_second / 75);
+ start = (framepos_t) floor ((double) start / (one_second / 75)) * (one_second / 75);
}
break;
case SnapToSeconds:
if (((direction == 0) && (start % one_second > one_second / 2)) || (direction > 0)) {
- start = (nframes64_t) ceil ((double) start / one_second) * one_second;
+ start = (framepos_t) ceil ((double) start / one_second) * one_second;
} else {
- start = (nframes64_t) floor ((double) start / one_second) * one_second;
+ start = (framepos_t) floor ((double) start / one_second) * one_second;
}
break;
case SnapToMinutes:
if (((direction == 0) && (start % one_minute > one_minute / 2)) || (direction > 0)) {
- start = (nframes64_t) ceil ((double) start / one_minute) * one_minute;
+ start = (framepos_t) ceil ((double) start / one_minute) * one_minute;
} else {
- start = (nframes64_t) floor ((double) start / one_minute) * one_minute;
+ start = (framepos_t) floor ((double) start / one_minute) * one_minute;
}
break;
_session->locations()->marks_either_side (start, before, after);
- if (before == max_frames) {
+ if (before == max_framepos) {
start = after;
- } else if (after == max_frames) {
+ } else if (after == max_framepos) {
start = before;
- } else if (before != max_frames && after != max_frames) {
+ } else if (before != max_framepos && after != max_framepos) {
/* have before and after */
if ((start - before) < (after - start)) {
start = before;
case SnapToRegionBoundary:
if (!region_boundary_cache.empty()) {
- vector<nframes64_t>::iterator prev = region_boundary_cache.end ();
- vector<nframes64_t>::iterator next = region_boundary_cache.end ();
+ vector<framepos_t>::iterator prev = region_boundary_cache.end ();
+ vector<framepos_t>::iterator next = region_boundary_cache.end ();
if (direction > 0) {
next = std::upper_bound (region_boundary_cache.begin(), region_boundary_cache.end(), start);
prev--;
}
- nframes64_t const p = (prev == region_boundary_cache.end()) ? region_boundary_cache.front () : *prev;
- nframes64_t const n = (next == region_boundary_cache.end()) ? region_boundary_cache.back () : *next;
+ framepos_t const p = (prev == region_boundary_cache.end()) ? region_boundary_cache.front () : *prev;
+ framepos_t const n = (next == region_boundary_cache.end()) ? region_boundary_cache.back () : *next;
if (start > (p + n) / 2) {
start = n;
Editor::setup_tooltips ()
{
ARDOUR_UI::instance()->set_tip (mouse_move_button, _("Select/Move Objects"));
- ARDOUR_UI::instance()->set_tip (mouse_gain_button, _("Draw Gain Automation"));
+ ARDOUR_UI::instance()->set_tip (mouse_gain_button, _("Draw Region Gain"));
ARDOUR_UI::instance()->set_tip (mouse_zoom_button, _("Select Zoom Range"));
ARDOUR_UI::instance()->set_tip (mouse_timefx_button, _("Stretch/Shrink Regions and MIDI Notes"));
ARDOUR_UI::instance()->set_tip (mouse_audition_button, _("Listen to Specific Regions"));
ARDOUR_UI::instance()->set_tip (join_object_range_button, _("Select/Move Objects or Ranges"));
ARDOUR_UI::instance()->set_tip (internal_edit_button, _("Edit Region Contents (e.g. notes)"));
- ARDOUR_UI::instance()->set_tip (*_group_tabs, _("Groups: context-click for possible operations"));
+ ARDOUR_UI::instance()->set_tip (*_group_tabs, _("Groups: click to (de)activate\nContext-click for other operations"));
ARDOUR_UI::instance()->set_tip (nudge_forward_button, _("Nudge Region/Selection Forwards"));
ARDOUR_UI::instance()->set_tip (nudge_backward_button, _("Nudge Region/Selection Backwards"));
ARDOUR_UI::instance()->set_tip (zoom_in_button, _("Zoom In"));
return -1;
}
- vector<ustring> uris = data.get_uris();
+ vector<string> uris = data.get_uris();
if (uris.empty()) {
THERE MAY BE NO NULL TERMINATING CHAR!!!
*/
- ustring txt = data.get_text();
+ string txt = data.get_text();
const char* p;
const char* q;
if (q > p)
{
- uris.push_back (ustring (p, q - p + 1));
+ uris.push_back (string (p, q - p + 1));
}
}
}
}
}
- for (vector<ustring>::iterator i = uris.begin(); i != uris.end(); ++i) {
+ for (vector<string>::iterator i = uris.begin(); i != uris.end(); ++i) {
if ((*i).substr (0,7) == "file://") {
- ustring p = *i;
+ string p = *i;
PBD::url_decode (p);
// scan forward past three slashes
- ustring::size_type slashcnt = 0;
- ustring::size_type n = 0;
- ustring::iterator x = p.begin();
+ string::size_type slashcnt = 0;
+ string::size_type n = 0;
+ string::iterator x = p.begin();
while (slashcnt < 3 && x != p.end()) {
if ((*x) == '/') {
}
}
- RegionSelection rs;
- get_regions_for_action (rs);
+ RegionSelection rs = get_regions_for_action ();
if (mouse_mode != MouseRange) {
}
void
-Editor::show_verbose_canvas_cursor_with (const string & txt)
+Editor::show_verbose_canvas_cursor_with (const string & txt, int32_t xoffset, int32_t yoffset)
{
verbose_canvas_cursor->property_text() = txt.c_str();
track_canvas->get_pointer (x, y);
track_canvas->window_to_world (x, y, wx, wy);
+ wx += xoffset;
+ wy += yoffset;
+
/* don't get too close to the edge */
verbose_canvas_cursor->property_x() = clamp_verbose_cursor_x (wx);
verbose_canvas_cursor->property_y() = clamp_verbose_cursor_y (wy);
}
Evoral::MusicalTime
-Editor::get_grid_type_as_beats (bool& success, nframes64_t position)
+Editor::get_grid_type_as_beats (bool& success, framepos_t position)
{
success = true;
return 0.0;
}
-nframes64_t
-Editor::get_nudge_distance (nframes64_t pos, nframes64_t& next)
+framecnt_t
+Editor::get_nudge_distance (framepos_t pos, framecnt_t& next)
{
- nframes64_t ret;
+ framecnt_t ret;
ret = nudge_clock.current_duration (pos);
next = ret + 1; /* XXXX fix me */
}
bool
-Editor::audio_region_selection_covers (nframes64_t where)
+Editor::audio_region_selection_covers (framepos_t where)
{
for (RegionSelection::iterator a = selection->regions.begin(); a != selection->regions.end(); ++a) {
if ((*a)->region()->covers (where)) {
* @param frame New x origin.
*/
void
-Editor::reset_x_origin (nframes64_t frame)
+Editor::reset_x_origin (framepos_t frame)
{
queue_visual_change (frame);
}
}
void
-Editor::reposition_and_zoom (nframes64_t frame, double fpu)
+Editor::reposition_and_zoom (framepos_t frame, double fpu)
{
reset_x_origin (frame);
reset_zoom (fpu);
of frames into an 800 pixel wide space.
*/
- if (max_frames / fpu < 800.0) {
+ if (max_framepos / fpu < 800.0) {
return;
}
{
// convert fpu to frame count
- nframes64_t frames = (nframes64_t) floor (frames_per_unit * _canvas_width);
+ framepos_t frames = (framepos_t) floor (frames_per_unit * _canvas_width);
if (frames_per_unit != zoom_range_clock.current_duration()) {
zoom_range_clock.set (frames);
}
void
-Editor::queue_visual_change (nframes64_t where)
+Editor::queue_visual_change (framepos_t where)
{
pending_visual_change.add (VisualChange::TimeOrigin);
pending_visual_change.time_origin = where;
VisualChange::Type p = pending_visual_change.pending;
pending_visual_change.pending = (VisualChange::Type) 0;
- double last_time_origin = horizontal_position ();
+ double const last_time_origin = horizontal_position ();
+
+ if (p & VisualChange::TimeOrigin) {
+ /* This is a bit of a hack, but set_frames_per_unit
+ below will (if called) end up with the
+ CrossfadeViews looking at Editor::leftmost_frame,
+ and if we're changing origin and zoom in the same
+ operation it will be the wrong value unless we
+ update it here.
+ */
+
+ leftmost_frame = pending_visual_change.time_origin;
+ }
if (p & VisualChange::ZoomLevel) {
set_frames_per_unit (pending_visual_change.frames_per_unit);
}
}
-nframes64_t
+framepos_t
Editor::get_preferred_edit_position (bool ignore_playhead)
{
bool ignored;
- nframes64_t where = 0;
+ framepos_t where = 0;
EditPoint ep = _edit_point;
if (entered_marker) {
}
void
-Editor::set_loop_range (nframes64_t start, nframes64_t end, string cmd)
+Editor::set_loop_range (framepos_t start, framepos_t end, string cmd)
{
if (!_session) return;
}
void
-Editor::set_punch_range (nframes64_t start, nframes64_t end, string cmd)
+Editor::set_punch_range (framepos_t start, framepos_t end, string cmd)
{
if (!_session) return;
* @param ts Tracks to look on; if this is empty, all tracks are examined.
*/
void
-Editor::get_regions_at (RegionSelection& rs, nframes64_t where, const TrackViewList& ts) const
+Editor::get_regions_at (RegionSelection& rs, framepos_t where, const TrackViewList& ts) const
{
const TrackViewList* tracks;
if ((tr = rtv->track()) && ((pl = tr->playlist()))) {
Playlist::RegionList* regions = pl->regions_at (
- (nframes64_t) floor ( (double)where * tr->speed()));
+ (framepos_t) floor ( (double)where * tr->speed()));
for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
RegionView* rv = rtv->view()->find_view (*i);
}
void
-Editor::get_regions_after (RegionSelection& rs, nframes64_t where, const TrackViewList& ts) const
+Editor::get_regions_after (RegionSelection& rs, framepos_t where, const TrackViewList& ts) const
{
const TrackViewList* tracks;
if ((tr = rtv->track()) && ((pl = tr->playlist()))) {
Playlist::RegionList* regions = pl->regions_touched (
- (nframes64_t) floor ( (double)where * tr->speed()), max_frames);
+ (framepos_t) floor ( (double)where * tr->speed()), max_framepos);
for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
}
}
-/** Find all regions which are either:
- * - selected or
- * - the entered_regionview (if allow_entered == true) or
- * - under the preferred edit position AND on a selected track, or on a track
- * which is in the same active edit-enable route group as a selected region (if allow_edit_position == true)
+/** Get regions using the following conditions:
+ * If check_edit_position == false, then return the selected regions.
+ * Otherwise:
+ * 1. If the edit point is `mouse':
+ * if the mouse is over a selected region, or no region, return all selected regions.
+ * if the mouse is over an unselected region, return just that region.
+ * 2. For all other edit points:
+ * return the selected regions AND those that are both under the edit position
+ * AND on a selected track, or on a track which is in the same active edit-enabled route group
+ * as a selected region.
+ *
+ * The rationale here is that the mouse edit point is special in that its position describes
+ * both a time and a track; the other edit modes only describe a time.
+ *
* @param rs Returned region list.
- * @param allow_entered true to include the entered_regionview in the list.
*/
-void
-Editor::get_regions_for_action (RegionSelection& rs, bool allow_entered, bool allow_edit_position)
+
+RegionSelection
+Editor::get_regions_for_action (bool check_edit_point)
{
- /* Start with selected regions */
- rs = selection->regions;
+ if (!check_edit_point) {
+ return selection->regions;
+ }
- /* Add the entered_regionview, if requested */
- if (allow_entered && entered_regionview) {
- rs.add (entered_regionview);
+ if (_edit_point == EditAtMouse) {
+ if (entered_regionview == 0 || selection->regions.contains (entered_regionview)) {
+ return selection->regions;
+ } else {
+ RegionSelection rs;
+ rs.add (entered_regionview);
+ return rs;
+ }
}
- if (allow_edit_position) {
+ /* We're using the edit point, but its not EditAtMouse */
- TrackViewList tracks = selection->tracks;
+ /* Start with selected regions */
+ RegionSelection rs = selection->regions;
- /* tracks is currently the set of selected tracks; add any other tracks that
- * have regions that are in the same edit-activated route group as one of
- * our regions */
- for (RegionSelection::iterator i = rs.begin (); i != rs.end(); ++i) {
+ TrackViewList tracks = selection->tracks;
- RouteGroup* g = (*i)->get_time_axis_view().route_group ();
- if (g && g->is_active() && g->is_edit()) {
- tracks.add (axis_views_from_routes (g->route_list()));
- }
-
- }
-
- if (!tracks.empty()) {
- /* now find regions that are at the edit position on those tracks */
- nframes64_t const where = get_preferred_edit_position ();
- get_regions_at (rs, where, tracks);
+ /* Tracks is currently the set of selected tracks; add any other tracks that
+ have regions that are in the same edit-activated route group as one of
+ our regions.
+ */
+ for (RegionSelection::iterator i = rs.begin (); i != rs.end(); ++i) {
+
+ RouteGroup* g = (*i)->get_time_axis_view().route_group ();
+ if (g && g->is_active() && g->is_edit()) {
+ tracks.add (axis_views_from_routes (g->route_list()));
}
+
+ }
+
+ if (!tracks.empty()) {
+ /* now find regions that are at the edit position on those tracks */
+ framepos_t const where = get_preferred_edit_position ();
+ get_regions_at (rs, where, tracks);
}
+
+ return rs;
}
void
void
Editor::reset_x_origin_to_follow_playhead ()
{
- nframes64_t const frame = playhead_cursor->current_frame;
+ framepos_t const frame = playhead_cursor->current_frame;
if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) {
if (frame < leftmost_frame) {
/* moving left */
- nframes64_t l = 0;
+ framepos_t l = 0;
if (_session->transport_rolling()) {
/* rolling; end up with the playhead at the right of the page */
l = frame - current_page_frames ();
/* PLAYHEAD AND VIEWPORT */
- nframes64_t const frame = _session->audible_frame();
+ framepos_t const frame = _session->audible_frame();
/* There are a few reasons why we might not update the playhead / viewport stuff:
*
change_region_layering_order (frame);
}
}
+
+void
+Editor::setup_fade_images ()
+{
+ _fade_in_images[FadeLinear] = new Gtk::Image (get_icon_path (X_("crossfade-in-linear")));
+ _fade_in_images[FadeFast] = new Gtk::Image (get_icon_path (X_("crossfade-in-short-cut")));
+ _fade_in_images[FadeLogB] = new Gtk::Image (get_icon_path (X_("crossfade-in-slow-cut")));
+ _fade_in_images[FadeLogA] = new Gtk::Image (get_icon_path (X_("crossfade-in-fast-cut")));
+ _fade_in_images[FadeSlow] = new Gtk::Image (get_icon_path (X_("crossfade-in-long-cut")));
+
+ _fade_out_images[FadeLinear] = new Gtk::Image (get_icon_path (X_("crossfade-out-linear")));
+ _fade_out_images[FadeFast] = new Gtk::Image (get_icon_path (X_("crossfade-out-short-cut")));
+ _fade_out_images[FadeLogB] = new Gtk::Image (get_icon_path (X_("crossfade-out-slow-cut")));
+ _fade_out_images[FadeLogA] = new Gtk::Image (get_icon_path (X_("crossfade-out-fast-cut")));
+ _fade_out_images[FadeSlow] = new Gtk::Image (get_icon_path (X_("crossfade-out-long-cut")));
+}
+
projects / ardour.git / blobdiff