#include "ardour/midi_track.h"
#include "ardour/operations.h"
#include "ardour/playlist_factory.h"
+#include "ardour/profile.h"
#include "ardour/quantize.h"
#include "ardour/region_factory.h"
#include "ardour/reverse.h"
#include "interthread_progress_window.h"
#include "keyboard.h"
#include "midi_region_view.h"
+#include "mixer_strip.h"
#include "mouse_cursors.h"
#include "normalize_dialog.h"
#include "patch_change_dialog.h"
{
bool frozen = false;
- list <boost::shared_ptr<Playlist > > used_playlists;
+ RegionSelection pre_selected_regions = selection->regions;
+ bool working_on_selection = !pre_selected_regions.empty();
+
+ list<boost::shared_ptr<Playlist> > used_playlists;
+ list<RouteTimeAxisView*> used_trackviews;
if (regions.empty()) {
return;
/* remember used playlists so we can thaw them later */
used_playlists.push_back(pl);
+
+ TimeAxisView& tv = (*a)->get_time_axis_view();
+ RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&tv);
+ if (rtv) {
+ used_trackviews.push_back (rtv);
+ }
pl->freeze();
}
+
if (pl) {
pl->clear_changes ();
pl->split_region ((*a)->region(), where);
a = tmp;
}
+ vector<sigc::connection> region_added_connections;
+
+ for (list<RouteTimeAxisView*>::iterator i = used_trackviews.begin(); i != used_trackviews.end(); ++i) {
+ region_added_connections.push_back ((*i)->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view)));
+ }
+
+ latest_regionviews.clear ();
+
while (used_playlists.size() > 0) {
list <boost::shared_ptr<Playlist > >::iterator i = used_playlists.begin();
(*i)->thaw();
used_playlists.pop_front();
}
+ for (vector<sigc::connection>::iterator c = region_added_connections.begin(); c != region_added_connections.end(); ++c) {
+ (*c).disconnect ();
+ }
+
commit_reversible_command ();
if (frozen){
EditorThaw(); /* Emit Signal */
}
+
+ if (ARDOUR::Profile->get_mixbus()) {
+ //IFF we were working on selected regions, try to reinstate the other region selections that existed before the freeze/thaw.
+ _ignore_follow_edits = true; //a split will change the region selection in mysterious ways; its not practical or wanted to follow this edit
+ if( working_on_selection ) {
+ selection->add ( pre_selected_regions );
+ selection->add (latest_regionviews); //these are the new regions created after the split
+ }
+ _ignore_follow_edits = false;
+ }
}
/** Move one extreme of the current range selection. If more than one range is selected,
bool
Editor::scroll_down_one_track ()
{
- TrackViewList::reverse_iterator next = track_views.rend();
+ TrackViewList::reverse_iterator next = track_views.rbegin();
std::pair<TimeAxisView*,double> res;
- const double bottom_of_trackviews = vertical_adjustment.get_value() + vertical_adjustment.get_page_size() - 1;
+ const double top_of_trackviews = vertical_adjustment.get_value();
for (TrackViewList::reverse_iterator t = track_views.rbegin(); t != track_views.rend(); ++t) {
if ((*t)->hidden()) {
continue;
}
-
- /* If this is the bottom visible trackview, we want to display
- the next one.
+
+ next = t;
+ if (next != track_views.rbegin()) {
+ --next; // moves "next" towards the lower/later tracks since it is a reverse iterator
+ }
+
+ /* If this is the upper-most visible trackview, we want to display
+ the one above it (next)
*/
- res = (*t)->covers_y_position (bottom_of_trackviews);
+ res = (*t)->covers_y_position (top_of_trackviews);
if (res.first) {
break;
}
-
- ++next; // moves "next" towards the "front" since it is a reverse iterator
}
/* move to the track below the first one that covers the */
- if (next != track_views.rend()) {
- ensure_time_axis_view_is_visible (**next);
+ if (next != track_views.rbegin()) {
+ ensure_time_axis_view_is_visible (**next, true);
return true;
}
bool
Editor::scroll_up_one_track ()
{
- double vertical_pos = vertical_adjustment.get_value ();
-
TrackViewList::iterator prev = track_views.end();
std::pair<TimeAxisView*,double> res;
-
+ double top_of_trackviews = vertical_adjustment.get_value ();
+
for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) {
if ((*t)->hidden()) {
}
/* find the trackview at the top of the trackview group */
- res = (*t)->covers_y_position (vertical_pos);
+ res = (*t)->covers_y_position (top_of_trackviews);
if (res.first) {
- cerr << res.first->name() << " covers the top\n";
break;
}
}
if (prev != track_views.end()) {
- ensure_time_axis_view_is_visible (**prev);
+ ensure_time_axis_view_is_visible (**prev, true);
return true;
}
reposition_and_zoom (leftmost_after_zoom, nfpp);
}
+void
+Editor::calc_extra_zoom_edges(framepos_t &start, framepos_t &end)
+{
+ /* this func helps make sure we leave a little space
+ at each end of the editor so that the zoom doesn't fit the region
+ precisely to the screen.
+ */
+
+ GdkScreen* screen = gdk_screen_get_default ();
+ const gint pixwidth = gdk_screen_get_width (screen);
+ const gint mmwidth = gdk_screen_get_width_mm (screen);
+ const double pix_per_mm = (double) pixwidth/ (double) mmwidth;
+ const double one_centimeter_in_pixels = pix_per_mm * 10.0;
+
+ const framepos_t range = end - start;
+ const framecnt_t new_fpp = (framecnt_t) ceil ((double) range / (double) _visible_canvas_width);
+ const framepos_t extra_samples = (framepos_t) floor (one_centimeter_in_pixels * new_fpp);
+
+ if (start > extra_samples) {
+ start -= extra_samples;
+ } else {
+ start = 0;
+ }
+
+ if (max_framepos - extra_samples > end) {
+ end += extra_samples;
+ } else {
+ end = max_framepos;
+ }
+}
+
void
Editor::temporal_zoom_region (bool both_axes)
{
tracks.insert (&((*i)->get_time_axis_view()));
}
- /* now comes an "interesting" hack ... make sure we leave a little space
- at each end of the editor so that the zoom doesn't fit the region
- precisely to the screen.
- */
-
- GdkScreen* screen = gdk_screen_get_default ();
- gint pixwidth = gdk_screen_get_width (screen);
- gint mmwidth = gdk_screen_get_width_mm (screen);
- double pix_per_mm = (double) pixwidth/ (double) mmwidth;
- double one_centimeter_in_pixels = pix_per_mm * 10.0;
-
if ((start == 0 && end == 0) || end < start) {
return;
}
- framepos_t range = end - start;
- double new_fpp = (double) range / (double) _visible_canvas_width;
- framepos_t extra_samples = (framepos_t) floor (one_centimeter_in_pixels * new_fpp);
-
- if (start > extra_samples) {
- start -= extra_samples;
- } else {
- start = 0;
- }
-
- if (max_framepos - extra_samples > end) {
- end += extra_samples;
- } else {
- end = max_framepos;
- }
+ calc_extra_zoom_edges (start, end);
/* if we're zooming on both axes we need to save track heights etc.
*/
}
void
-Editor::temporal_zoom_selection ()
+Editor::temporal_zoom_selection (bool both_axes)
{
if (!selection) return;
- if (selection->time.empty()) {
- return;
+ //if a range is selected, zoom to that
+ if (!selection->time.empty()) {
+
+ framepos_t start = selection->time.start();
+ framepos_t end = selection->time.end_frame();
+
+ calc_extra_zoom_edges(start, end);
+
+ temporal_zoom_by_frame (start, end);
+
+ if (both_axes)
+ fit_selected_tracks();
+
+ } else {
+ temporal_zoom_region (both_axes);
}
- framepos_t start = selection->time[clicked_selection].start;
- framepos_t end = selection->time[clicked_selection].end;
- temporal_zoom_by_frame (start, end);
}
void
ENSURE_GUI_THREAD (*this, &Editor::temporal_zoom_session)
if (_session) {
- framecnt_t const l = _session->current_end_frame() - _session->current_start_frame();
- double s = _session->current_start_frame() - l * 0.01;
- if (s < 0) {
- s = 0;
+ framecnt_t start = _session->current_start_frame();
+ framecnt_t end = _session->current_end_frame();
+
+ if (_session->actively_recording () ) {
+ framepos_t cur = playhead_cursor->current_frame ();
+ if (cur > end) {
+ /* recording beyond the end marker; zoom out
+ * by 5 seconds more so that if 'follow
+ * playhead' is active we don't immediately
+ * scroll.
+ */
+ end = cur + _session->frame_rate() * 5;
+ }
+ }
+
+ if ((start == 0 && end == 0) || end < start) {
+ return;
}
- framecnt_t const e = _session->current_end_frame() + l * 0.01;
- temporal_zoom_by_frame (framecnt_t (s), e);
+
+ calc_extra_zoom_edges(start, end);
+
+ temporal_zoom_by_frame (start, end);
}
}
framepos_t range = end - start;
- double const new_fpp = (double) range / (double) _visible_canvas_width;
-
- framepos_t new_page = (framepos_t) floor (_visible_canvas_width * new_fpp);
+ const framecnt_t new_fpp = (framecnt_t) ceil ((double) range / (double) _visible_canvas_width);
+
+ framepos_t new_page = range;
framepos_t middle = (framepos_t) floor ((double) start + ((double) range / 2.0f));
framepos_t new_leftmost = (framepos_t) floor ((double) middle - ((double) new_page / 2.0f));
_session->begin_reversible_command (_("clear ranges"));
XMLNode &before = _session->locations()->get_state();
- Location * looploc = _session->locations()->auto_loop_location();
- Location * punchloc = _session->locations()->auto_punch_location();
- Location * sessionloc = _session->locations()->session_range_location();
-
_session->locations()->clear_ranges ();
- // re-add these
- if (looploc) _session->locations()->add (looploc);
- if (punchloc) _session->locations()->add (punchloc);
- if (sessionloc) _session->locations()->add (sessionloc);
XMLNode &after = _session->locations()->get_state();
_session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
void
Editor::maybe_locate_with_edit_preroll ( framepos_t location )
{
- if ( _session->transport_rolling() || !Config->get_follow_edits() )
+ if ( _session->transport_rolling() || !Config->get_follow_edits() || _ignore_follow_edits )
return;
location -= get_preroll();
tll->set (location.start(), location.end());
// enable looping, reposition and start rolling
- _session->request_play_loop (true);
_session->request_locate (tll->start(), true);
+ _session->request_play_loop (true);
}
}
}
if (in_command) {
- selection->set (new_selection);
- set_mouse_mode (MouseObject);
+// selection->set (new_selection);
commit_reversible_command ();
}
void
Editor::delete_ ()
{
- cut_copy (Delete);
+ //special case: if the user is pointing in the editor/mixer strip, they may be trying to delete a plugin.
+ //we need this because the editor-mixer strip is in the editor window, so it doesn't get the bindings from the mix window
+ bool deleted = false;
+ if ( current_mixer_strip && current_mixer_strip == MixerStrip::entered_mixer_strip() )
+ deleted = current_mixer_strip->delete_processors ();
+
+ if (!deleted)
+ cut_copy (Delete);
}
/** Cut selected regions, automation points or a time range */
bool
Editor::can_cut_copy () const
{
- switch (effective_mouse_mode()) {
-
- case MouseObject:
- if (!selection->regions.empty() || !selection->points.empty()) {
- return true;
- }
- break;
-
- case MouseRange:
- if (!selection->time.empty()) {
- return true;
- }
- break;
-
- default:
- break;
- }
+ if (!selection->time.empty() || !selection->regions.empty() || !selection->points.empty())
+ return true;
return false;
}
bool did_edit = false;
- switch (effective_mouse_mode()) {
- case MouseGain:
- if (!selection->points.empty()) {
- begin_reversible_command (opname + _(" points"));
- did_edit = true;
- cut_copy_points (op);
- if (op == Cut || op == Delete) {
- selection->clear_points ();
- }
+ if (!selection->points.empty()) {
+ begin_reversible_command (opname + _(" points"));
+ did_edit = true;
+ cut_copy_points (op);
+ if (op == Cut || op == Delete) {
+ selection->clear_points ();
}
- break;
-
- case MouseObject:
-
- if (!selection->regions.empty() || !selection->points.empty()) {
+ } else if (!selection->regions.empty() || !selection->points.empty()) {
- string thing_name;
+ string thing_name;
- if (selection->regions.empty()) {
- thing_name = _("points");
- } else if (selection->points.empty()) {
- thing_name = _("regions");
- } else {
- thing_name = _("objects");
- }
-
- begin_reversible_command (opname + ' ' + thing_name);
- did_edit = true;
+ if (selection->regions.empty()) {
+ thing_name = _("points");
+ } else if (selection->points.empty()) {
+ thing_name = _("regions");
+ } else {
+ thing_name = _("objects");
+ }
+
+ begin_reversible_command (opname + ' ' + thing_name);
+ did_edit = true;
- if (!selection->regions.empty()) {
- cut_copy_regions (op, selection->regions);
-
- if (op == Cut || op == Delete) {
- selection->clear_regions ();
- }
- }
-
- if (!selection->points.empty()) {
- cut_copy_points (op);
-
- if (op == Cut || op == Delete) {
- selection->clear_points ();
- }
- }
- }
- break;
+ if (!selection->regions.empty()) {
+ cut_copy_regions (op, selection->regions);
- case MouseRange:
- if (selection->time.empty()) {
- framepos_t start, end;
- /* no time selection, see if we can get an edit range
- and use that.
- */
- if (get_edit_op_range (start, end)) {
- selection->set (start, end);
+ if (op == Cut || op == Delete) {
+ selection->clear_regions ();
}
}
- if (!selection->time.empty()) {
- begin_reversible_command (opname + _(" range"));
-
- did_edit = true;
- cut_copy_ranges (op);
+
+ if (!selection->points.empty()) {
+ cut_copy_points (op);
if (op == Cut || op == Delete) {
- selection->clear_time ();
+ selection->clear_points ();
}
}
- break;
+ } else if (selection->time.empty()) {
+ framepos_t start, end;
+ /* no time selection, see if we can get an edit range
+ and use that.
+ */
+ if (get_edit_op_range (start, end)) {
+ selection->set (start, end);
+ }
+ } else if (!selection->time.empty()) {
+ begin_reversible_command (opname + _(" range"));
+
+ did_edit = true;
+ cut_copy_ranges (op);
- default:
- break;
+ if (op == Cut || op == Delete) {
+ selection->clear_time ();
+ }
}
if (did_edit) {
{
}
+
+void
+Editor::fade_range ()
+{
+ TrackViewList ts = selection->tracks.filter_to_unique_playlists ();
+
+ begin_reversible_command (_("fade range"));
+
+ for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) {
+ (*i)->fade_range (selection->time);
+ }
+
+ commit_reversible_command ();
+}
+
+
void
Editor::set_fade_length (bool in)
{
selection->set(current);
- ensure_time_axis_view_is_visible (*current);
+ ensure_time_axis_view_is_visible (*current, false);
}
void
selection->set (current);
- ensure_time_axis_view_is_visible (*current);
+ ensure_time_axis_view_is_visible (*current, false);
}
void
set_loop_range (start, end, _("set loop range from selection"));
if (play) {
- _session->request_play_loop (true);
_session->request_locate (start, true);
+ _session->request_play_loop (true);
}
}
set_loop_range (start, end, _("set loop range from edit range"));
if (play) {
- _session->request_play_loop (true);
_session->request_locate (start, true);
+ _session->request_play_loop (true);
}
}
set_loop_range (start, end, _("set loop range from region"));
if (play) {
- _session->request_play_loop (true);
_session->request_locate (start, true);
+ _session->request_play_loop (true);
}
}
return;
}
+ // XXX should be using gettext plural forms, maybe?
if (ntracks > 1) {
trackstr = _("tracks");
} else {
}
} else if (nbusses) {
prompt = string_compose (_("Do you really want to remove %1 %2?\n\n"
- "This action cannot be undon, and the session file will be overwritten"),
+ "This action cannot be undone, and the session file will be overwritten"),
nbusses, busstr);
}
{
Session::StateProtector sp (_session);
+ DisplaySuspender ds;
for (vector<boost::shared_ptr<Route> >::iterator x = routes.begin(); x != routes.end(); ++x) {
_session->remove_route (*x);
}
}
}
}
+
}
void
height that will be taken by visible children of selected
tracks - height of the ruler/hscroll area
*/
- uint32_t h = (uint32_t) floor ((_visible_canvas_height - (child_heights + _trackview_group->canvas_origin().y)) / visible_tracks);
+ uint32_t h = (uint32_t) floor ((trackviews_height() - child_heights) / visible_tracks);
double first_y_pos = DBL_MAX;
if (h < TimeAxisView::preset_height (HeightSmall)) {
}
}
- /* operate on all tracks, hide unselected ones that are in the middle of selected ones */
-
- bool within_selected = false;
+ bool prev_was_selected = false;
+ bool is_selected = tracks.contains (all.front());
+ bool next_is_selected;
for (TrackViewList::iterator t = all.begin(); t != all.end(); ++t) {
next = t;
++next;
-
+
+ if (next != all.end()) {
+ next_is_selected = tracks.contains (*next);
+ } else {
+ next_is_selected = false;
+ }
+
if ((*t)->marked_for_display ()) {
- if (tracks.contains (*t)) {
+ if (is_selected) {
(*t)->set_height (h);
first_y_pos = std::min ((*t)->y_position (), first_y_pos);
- within_selected = true;
- } else if (within_selected) {
- hide_track_in_display (*t);
+ } else {
+ if (prev_was_selected && next_is_selected) {
+ hide_track_in_display (*t);
+ }
}
}
+
+ prev_was_selected = is_selected;
+ is_selected = next_is_selected;
}
/*
vertical_adjustment.set_value (first_y_pos);
redo_visual_stack.push_back (current_visual_state (true));
+
+ visible_tracks_selector.set_text (_("Sel"));
}
void
ArdourButton* b = manage (new ArdourButton);
b->set_name ("lock button");
- b->set_markup (string_compose ("<span size=\"large\" weight=\"bold\">%1</span>", _("Click to unlock")));
+ b->set_text (_("Click to unlock"));
b->signal_clicked.connect (sigc::mem_fun (*this, &Editor::unlock));
lock_dialog->get_vbox()->pack_start (*b);
start_lock_event_timing ();
}
}
+
+void
+Editor::bring_in_callback (Gtk::Label* label, uint32_t n, uint32_t total, string name)
+{
+ Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&Editor::update_bring_in_message, this, label, n, total, name));
+}
+
+void
+Editor::update_bring_in_message (Gtk::Label* label, uint32_t n, uint32_t total, string name)
+{
+ label->set_text (string_compose ("Copying %1, %2 of %3", name, n, total));
+ Gtkmm2ext::UI::instance()->flush_pending ();
+}
+
+void
+Editor::bring_all_sources_into_session ()
+{
+ if (!_session) {
+ return;
+ }
+
+ Gtk::Label msg;
+ ArdourDialog w (_("Moving embedded files into session folder"));
+ w.get_vbox()->pack_start (msg);
+ w.present ();
+
+ /* flush all pending GUI events because we're about to start copying
+ * files
+ */
+
+ Gtkmm2ext::UI::instance()->flush_pending ();
+
+ cerr << " Do it\n";
+
+ _session->bring_all_sources_into_session (boost::bind (&Editor::bring_in_callback, this, &msg, _1, _2, _3));
+}
projects / ardour.git / blobdiff