/*
- Copyright (C) 2000-2004 Paul Davis
+ Copyright (C) 2000-2004 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <map>
#include <set>
-#include <pbd/error.h>
-#include <pbd/basename.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/memento_command.h>
-#include <pbd/whitespace.h>
+#include "pbd/error.h"
+#include "pbd/basename.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/memento_command.h"
+#include "pbd/whitespace.h"
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/choice.h>
-#include <gtkmm2ext/window_title.h>
#include <gtkmm2ext/popup.h>
-
-#include <ardour/audioengine.h>
-#include <ardour/session.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/audioregion.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/utils.h>
-#include <ardour/location.h>
-#include <ardour/named_selection.h>
-#include <ardour/audio_track.h>
-#include <ardour/audiofilesource.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/region_factory.h>
-#include <ardour/playlist_factory.h>
-#include <ardour/reverse.h>
-#include <ardour/transient_detector.h>
-#include <ardour/dB.h>
-#include <ardour/quantize.h>
+#include "ardour/audioengine.h"
+#include "ardour/session.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/audioregion.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/utils.h"
+#include "ardour/location.h"
+#include "ardour/audio_track.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/region_factory.h"
+#include "ardour/playlist_factory.h"
+#include "ardour/reverse.h"
+#include "ardour/transient_detector.h"
+#include "ardour/dB.h"
+#include "ardour/quantize.h"
+#include "ardour/strip_silence.h"
+#include "ardour/route_group.h"
#include "ardour_ui.h"
#include "editor.h"
#include "audio_time_axis.h"
#include "automation_time_axis.h"
#include "streamview.h"
+#include "audio_streamview.h"
#include "audio_region_view.h"
#include "midi_region_view.h"
#include "rgb_macros.h"
#include "gui_thread.h"
#include "keyboard.h"
#include "utils.h"
+#include "editor_drag.h"
+#include "strip_silence_dialog.h"
+#include "editor_routes.h"
+#include "editor_regions.h"
+#include "quantize_dialog.h"
#include "i18n.h"
}
}
-void
-Editor::split_region ()
-{
- split_region_at (get_preferred_edit_position());
-}
-
-void
-Editor::split_region_at (nframes64_t where)
-{
- RegionSelection rs;
-
- get_regions_for_action (rs);
- split_regions_at (where, selection->regions);
-}
-
void
Editor::split_regions_at (nframes64_t where, RegionSelection& regions)
{
// region boundaries, don't pay attention to them
if (regions.size() == 1) {
- switch (snap_type) {
+ switch (_snap_type) {
case SnapToRegionStart:
case SnapToRegionSync:
case SnapToRegionEnd:
snap_to (where);
}
- cerr << "Split " << regions.size() << " at " << where << endl;
-
for (RegionSelection::iterator a = regions.begin(); a != regions.end(); ) {
RegionSelection::iterator tmp;
/* XXX this test needs to be more complicated, to make sure we really
have something to split.
*/
-
+
if (!(*a)->region()->covers (where)) {
++a;
continue;
if (! pl->frozen()) {
/* we haven't seen this playlist before */
- /* remember used playlists so we can thaw them later */
+ /* remember used playlists so we can thaw them later */
used_playlists.push_back(pl);
pl->freeze();
}
AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*a);
-
if (arv) {
_new_regionviews_show_envelope = arv->envelope_visible();
}
-
+
if (pl) {
- XMLNode &before = pl->get_state();
+ XMLNode &before = pl->get_state();
pl->split_region ((*a)->region(), where);
- XMLNode &after = pl->get_state();
- session->add_command(new MementoCommand<Playlist>(*pl, &before, &after));
+ XMLNode &after = pl->get_state();
+ session->add_command(new MementoCommand<Playlist>(*pl, &before, &after));
}
a = tmp;
}
- while (used_playlists.size() > 0) {
+ while (used_playlists.size() > 0) {
list <boost::shared_ptr<Playlist > >::iterator i = used_playlists.begin();
(*i)->thaw();
used_playlists.pop_front();
}
- commit_reversible_command ();
- _new_regionviews_show_envelope = false;
-}
-
-
-/** Remove `clicked_regionview' */
-void
-Editor::remove_clicked_region ()
-{
- if (clicked_routeview == 0 || clicked_regionview == 0) {
- return;
- }
-
- boost::shared_ptr<Playlist> playlist = clicked_routeview->playlist();
-
- begin_reversible_command (_("remove region"));
- XMLNode &before = playlist->get_state();
- playlist->remove_region (clicked_regionview->region());
- XMLNode &after = playlist->get_state();
- session->add_command(new MementoCommand<Playlist>(*playlist, &before, &after));
- commit_reversible_command ();
-}
-
-
-/** Remove the selected regions */
-void
-Editor::remove_selected_regions ()
-{
- RegionSelection rs;
- get_regions_for_action (rs);
-
- if (!session) {
- return;
- }
-
- if (rs.empty()) {
- return;
- }
-
- begin_reversible_command (_("remove region"));
-
- list<boost::shared_ptr<Region> > regions_to_remove;
-
- for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
- // we can't just remove the region(s) in this loop because
- // this removes them from the RegionSelection, and they thus
- // disappear from underneath the iterator, and the ++i above
- // SEGVs in a puzzling fashion.
-
- // so, first iterate over the regions to be removed from rs and
- // add them to the regions_to_remove list, and then
- // iterate over the list to actually remove them.
-
- regions_to_remove.push_back ((*i)->region());
- }
-
- for (list<boost::shared_ptr<Region> >::iterator rl = regions_to_remove.begin(); rl != regions_to_remove.end(); ++rl) {
- boost::shared_ptr<Playlist> playlist = (*rl)->playlist();
- if (!playlist) {
- // is this check necessary?
- continue;
- }
-
- XMLNode &before = playlist->get_state();
- playlist->remove_region (*rl);
- XMLNode &after = playlist->get_state();
- session->add_command(new MementoCommand<Playlist>(*playlist, &before, &after));
- }
commit_reversible_command ();
+ _new_regionviews_show_envelope = false;
}
boost::shared_ptr<Region>
-Editor::select_region_for_operation (int dir, TimeAxisView **tv)
+Editor::select_region_for_operation (int /*dir*/, TimeAxisView **tv)
{
RegionView* rv;
boost::shared_ptr<Region> region;
nframes64_t start = 0;
if (selection->time.start () == selection->time.end_frame ()) {
-
+
/* no current selection-> is there a selected regionview? */
if (selection->regions.empty()) {
return region;
}
- }
+ }
if (!selection->regions.empty()) {
if ((rtv = dynamic_cast<RouteTimeAxisView*> (*tv)) != 0) {
boost::shared_ptr<Playlist> pl;
-
+
if ((pl = rtv->playlist()) == 0) {
return region;
}
-
+
region = pl->top_region_at (start);
}
- }
-
+ }
+
return region;
}
-
+
void
Editor::extend_selection_to_end_of_region (bool next)
{
}
/* Try to leave the selection with the same route if possible */
-
+
if ((tv = selection->time.track) == 0) {
return;
}
{
nframes64_t distance;
nframes64_t next_distance;
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
if (!session) return;
-
+
if (!force_playhead && !rs.empty()) {
begin_reversible_command (_("nudge regions forward"));
for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
boost::shared_ptr<Region> r ((*i)->region());
-
+
distance = get_nudge_distance (r->position(), next_distance);
if (next) {
commit_reversible_command ();
-
+
} else if (!force_playhead && !selection->markers.empty()) {
bool is_start;
begin_reversible_command (_("nudge location forward"));
-
+
for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) {
-
+
Location* loc = find_location_from_marker ((*i), is_start);
-
+
if (loc) {
-
+
XMLNode& before (loc->get_state());
-
+
if (is_start) {
distance = get_nudge_distance (loc->start(), next_distance);
if (next) {
session->add_command (new MementoCommand<Location>(*loc, &before, &after));
}
}
-
+
commit_reversible_command ();
-
+
} else {
distance = get_nudge_distance (playhead_cursor->current_frame, next_distance);
session->request_locate (playhead_cursor->current_frame + distance);
}
}
-
+
void
Editor::nudge_backward (bool next, bool force_playhead)
{
nframes64_t distance;
nframes64_t next_distance;
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
if (!session) return;
-
+
if (!force_playhead && !rs.empty()) {
begin_reversible_command (_("nudge regions backward"));
boost::shared_ptr<Region> r ((*i)->region());
distance = get_nudge_distance (r->position(), next_distance);
-
+
if (next) {
distance = next_distance;
}
XMLNode &before = r->playlist()->get_state();
-
+
if (r->position() > distance) {
r->set_position (r->position() - distance, this);
} else {
for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) {
Location* loc = find_location_from_marker ((*i), is_start);
-
+
if (loc) {
-
+
XMLNode& before (loc->get_state());
-
+
if (is_start) {
distance = get_nudge_distance (loc->start(), next_distance);
if (next) {
}
} else {
distance = get_nudge_distance (loc->end(), next_distance);
-
+
if (next) {
distance = next_distance;
}
-
+
if (distance < loc->end() - loc->length()) {
loc->set_end (loc->end() - distance);
} else {
loc->set_end (loc->length());
}
}
-
+
XMLNode& after (loc->get_state());
session->add_command (new MementoCommand<Location>(*loc, &before, &after));
}
}
commit_reversible_command ();
-
+
} else {
distance = get_nudge_distance (playhead_cursor->current_frame, next_distance);
Editor::nudge_forward_capture_offset ()
{
nframes64_t distance;
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
if (!session) return;
-
+
if (!rs.empty()) {
begin_reversible_command (_("nudge forward"));
for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
boost::shared_ptr<Region> r ((*i)->region());
-
+
XMLNode &before = r->playlist()->get_state();
r->set_position (r->position() + distance, this);
XMLNode &after = r->playlist()->get_state();
commit_reversible_command ();
- }
+ }
}
-
+
void
Editor::nudge_backward_capture_offset ()
{
nframes64_t distance;
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
if (!session) return;
-
+
if (!rs.empty()) {
begin_reversible_command (_("nudge forward"));
boost::shared_ptr<Region> r ((*i)->region());
XMLNode &before = r->playlist()->get_state();
-
+
if (r->position() > distance) {
r->set_position (r->position() - distance, this);
} else {
if (session == 0) {
return;
}
-
- switch (snap_type) {
+
+ switch (_snap_type) {
case SnapToRegionStart:
interesting_points.push_back (Start);
break;
case SnapToRegionEnd:
interesting_points.push_back (End);
- break;
+ break;
case SnapToRegionSync:
interesting_points.push_back (SyncPoint);
- break;
+ break;
case SnapToRegionBoundary:
interesting_points.push_back (Start);
interesting_points.push_back (End);
- break;
+ break;
default:
- fatal << string_compose (_("build_region_boundary_cache called with snap_type = %1"), snap_type) << endmsg;
+ fatal << string_compose (_("build_region_boundary_cache called with snap_type = %1"), _snap_type) << endmsg;
/*NOTREACHED*/
return;
}
-
+
TimeAxisView *ontrack = 0;
TrackViewList tlist;
case End:
rpos = r->last_frame();
- break;
+ break;
case SyncPoint:
- rpos = r->adjust_to_sync (r->first_frame());
+ rpos = r->sync_position ();
+ //r->adjust_to_sync (r->first_frame());
break;
default:
break;
}
-
+
float speed = 1.0f;
RouteTimeAxisView *rtav;
-
+
if (ontrack != 0 && (rtav = dynamic_cast<RouteTimeAxisView*>(ontrack)) != 0 ) {
if (rtav->get_diskstream() != 0) {
speed = rtav->get_diskstream()->speed();
}
}
-
+
rpos = track_frame_to_session_frame (rpos, speed);
if (rpos < lpos) {
to sort later.
*/
- vector<nframes64_t>::iterator ri;
-
+ vector<nframes64_t>::iterator ri;
+
for (ri = region_boundary_cache.begin(); ri != region_boundary_cache.end(); ++ri) {
if (*ri == rpos) {
break;
nframes64_t distance;
boost::shared_ptr<Region> r;
-
+
track_speed = 1.0f;
if ( (rtav = dynamic_cast<RouteTimeAxisView*>(*i)) != 0 ) {
if (rtav->get_diskstream()!=0)
break;
case SyncPoint:
- rpos = r->adjust_to_sync (r->first_frame());
+ rpos = r->sync_position ();
+ // r->adjust_to_sync (r->first_frame());
break;
}
nframes64_t distance = max_frames;
nframes64_t current_nearest = -1;
+
for (TrackViewList::const_iterator i = tracks.begin(); i != tracks.end(); ++i) {
nframes64_t contender;
nframes64_t d;
distance = d;
}
}
-
+
return current_nearest;
}
+nframes64_t
+Editor::get_region_boundary (nframes64_t pos, int32_t dir, bool with_selection, bool only_onscreen)
+{
+ nframes64_t target;
+ TrackViewList tvl;
+
+ if (with_selection && Config->get_region_boundaries_from_selected_tracks()) {
+
+ if (!selection->tracks.empty()) {
+
+ target = find_next_region_boundary (pos, dir, selection->tracks);
+
+ } else {
+
+ if (only_onscreen || Config->get_region_boundaries_from_onscreen_tracks()) {
+ get_onscreen_tracks (tvl);
+ target = find_next_region_boundary (pos, dir, tvl);
+ } else {
+ target = find_next_region_boundary (pos, dir, track_views);
+ }
+ }
+
+ } else {
+
+ if (only_onscreen || Config->get_region_boundaries_from_onscreen_tracks()) {
+ get_onscreen_tracks (tvl);
+ target = find_next_region_boundary (pos, dir, tvl);
+ } else {
+ target = find_next_region_boundary (pos, dir, track_views);
+ }
+ }
+
+ return target;
+}
+
void
-Editor::cursor_to_region_boundary (Cursor* cursor, int32_t dir)
+Editor::cursor_to_region_boundary (bool with_selection, int32_t dir)
{
- nframes64_t pos = cursor->current_frame;
+ nframes64_t pos = playhead_cursor->current_frame;
nframes64_t target;
if (!session) {
pos += dir;
}
- if (!selection->tracks.empty()) {
-
- target = find_next_region_boundary (pos, dir, selection->tracks);
-
- } else {
-
- target = find_next_region_boundary (pos, dir, track_views);
- }
-
- if (target < 0) {
+ if ((target = get_region_boundary (pos, dir, with_selection, false)) < 0) {
return;
}
- if (cursor == playhead_cursor) {
- session->request_locate (target);
- } else {
- cursor->set_position (target);
- }
+ session->request_locate (target);
}
void
-Editor::cursor_to_next_region_boundary (Cursor* cursor)
+Editor::cursor_to_next_region_boundary (bool with_selection)
{
- cursor_to_region_boundary (cursor, 1);
+ cursor_to_region_boundary (with_selection, 1);
}
void
-Editor::cursor_to_previous_region_boundary (Cursor* cursor)
+Editor::cursor_to_previous_region_boundary (bool with_selection)
{
- cursor_to_region_boundary (cursor, -1);
+ cursor_to_region_boundary (with_selection, -1);
}
void
-Editor::cursor_to_region_point (Cursor* cursor, RegionPoint point, int32_t dir)
+Editor::cursor_to_region_point (EditorCursor* cursor, RegionPoint point, int32_t dir)
{
boost::shared_ptr<Region> r;
nframes64_t pos = cursor->current_frame;
pos+=dir;
if (!selection->tracks.empty()) {
-
+
r = find_next_region (pos, point, dir, selection->tracks, &ontrack);
-
+
} else if (clicked_axisview) {
-
+
TrackViewList t;
t.push_back (clicked_axisview);
-
+
r = find_next_region (pos, point, dir, t, &ontrack);
-
+
} else {
-
+
r = find_next_region (pos, point, dir, track_views, &ontrack);
}
if (r == 0) {
return;
}
-
+
switch (point){
case Start:
pos = r->first_frame ();
break;
case SyncPoint:
- pos = r->adjust_to_sync (r->first_frame());
- break;
+ pos = r->sync_position ();
+ // r->adjust_to_sync (r->first_frame());
+ break;
}
-
+
float speed = 1.0f;
RouteTimeAxisView *rtav;
}
pos = track_frame_to_session_frame(pos, speed);
-
+
if (cursor == playhead_cursor) {
session->request_locate (pos);
} else {
}
void
-Editor::cursor_to_next_region_point (Cursor* cursor, RegionPoint point)
+Editor::cursor_to_next_region_point (EditorCursor* cursor, RegionPoint point)
{
cursor_to_region_point (cursor, point, 1);
}
void
-Editor::cursor_to_previous_region_point (Cursor* cursor, RegionPoint point)
+Editor::cursor_to_previous_region_point (EditorCursor* cursor, RegionPoint point)
{
cursor_to_region_point (cursor, point, -1);
}
void
-Editor::cursor_to_selection_start (Cursor *cursor)
+Editor::cursor_to_selection_start (EditorCursor *cursor)
{
nframes64_t pos = 0;
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
}
void
-Editor::cursor_to_selection_end (Cursor *cursor)
+Editor::cursor_to_selection_end (EditorCursor *cursor)
{
nframes64_t pos = 0;
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
}
void
-Editor::selected_marker_to_region_boundary (int32_t dir)
+Editor::selected_marker_to_region_boundary (bool with_selection, int32_t dir)
{
nframes64_t target;
Location* loc;
if (!mouse_frame (mouse, ignored)) {
return;
}
-
+
add_location_mark (mouse);
}
pos += dir;
}
- if (!selection->tracks.empty()) {
-
- target = find_next_region_boundary (pos, dir, selection->tracks);
-
- } else {
-
- target = find_next_region_boundary (pos, dir, track_views);
- }
-
- if (target < 0) {
+ if ((target = get_region_boundary (pos, dir, with_selection, false)) < 0) {
return;
}
}
void
-Editor::selected_marker_to_next_region_boundary ()
+Editor::selected_marker_to_next_region_boundary (bool with_selection)
{
- selected_marker_to_region_boundary (1);
+ selected_marker_to_region_boundary (with_selection, 1);
}
void
-Editor::selected_marker_to_previous_region_boundary ()
+Editor::selected_marker_to_previous_region_boundary (bool with_selection)
{
- selected_marker_to_region_boundary (-1);
+ selected_marker_to_region_boundary (with_selection, -1);
}
void
pos+=dir;
if (!selection->tracks.empty()) {
-
+
r = find_next_region (pos, point, dir, selection->tracks, &ontrack);
-
+
} else {
-
+
r = find_next_region (pos, point, dir, track_views, &ontrack);
}
if (r == 0) {
return;
}
-
+
switch (point){
case Start:
pos = r->first_frame ();
case SyncPoint:
pos = r->adjust_to_sync (r->first_frame());
- break;
+ break;
}
-
+
float speed = 1.0f;
- AudioTimeAxisView *atav;
+ RouteTimeAxisView *rtav;
- if ( ontrack != 0 && (atav = dynamic_cast<AudioTimeAxisView*>(ontrack)) != 0 ) {
- if (atav->get_diskstream() != 0) {
- speed = atav->get_diskstream()->speed();
+ if (ontrack != 0 && (rtav = dynamic_cast<RouteTimeAxisView*>(ontrack)) != 0) {
+ if (rtav->get_diskstream() != 0) {
+ speed = rtav->get_diskstream()->speed();
}
}
return;
}
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
return;
}
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
pos += delta ;
} else {
pos = max_frames;
- }
+ }
} else {
if (pos == 0) {
return;
- }
+ }
if (pos > delta) {
pos -= delta;
} else {
pos -= cnt;
}
-
+
/* XXX this is completely insane. with the current buffering
design, we'll force a complete track buffer flush and
reload, just to move 1 sample !!!
}
pos = playhead_cursor->current_frame;
-
+
/* XXX this is completely insane. with the current buffering
design, we'll force a complete track buffer flush and
reload, just to move 1 sample !!!
if (selection->markers.empty()) {
return;
}
-
+
session->request_locate (selection->markers.front()->position(), session->transport_rolling());
-
+
} else {
/* move selected markers to playhead */
-
+
for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) {
bool ignored;
-
+
Location* loc = find_location_from_marker (*i, ignored);
-
+
if (loc->is_mark()) {
loc->set_start (playhead_cursor->current_frame);
} else {
} else {
pos -= cnt;
}
-
+
// EDIT CURSOR edit_cursor->set_position (pos);
}
Editor::scroll_backward (float pages)
{
nframes64_t frame;
- nframes64_t one_page = (nframes64_t) rint (canvas_width * frames_per_unit);
+ nframes64_t one_page = (nframes64_t) rint (_canvas_width * frames_per_unit);
bool was_floating;
float prefix;
nframes64_t cnt;
-
+
if (get_prefix (prefix, was_floating)) {
cnt = (nframes64_t) floor (pages * one_page);
} else {
Editor::scroll_forward (float pages)
{
nframes64_t frame;
- nframes64_t one_page = (nframes64_t) rint (canvas_width * frames_per_unit);
+ nframes64_t one_page = (nframes64_t) rint (_canvas_width * frames_per_unit);
bool was_floating;
float prefix;
nframes64_t cnt;
-
+
if (get_prefix (prefix, was_floating)) {
cnt = (nframes64_t) floor (pages * one_page);
} else {
double vert_value = vertical_adjustment.get_value() + (cnt *
vertical_adjustment.get_page_size());
- if (vert_value > vertical_adjustment.get_upper() - canvas_height) {
- vert_value = vertical_adjustment.get_upper() - canvas_height;
+ if (vert_value > vertical_adjustment.get_upper() - _canvas_height) {
+ vert_value = vertical_adjustment.get_upper() - _canvas_height;
}
vertical_adjustment.set_value (vert_value);
}
Gtk::Adjustment* adj = edit_vscrollbar.get_adjustment();
double vert_value = adj->get_value() + 60;
- if (vert_value>adj->get_upper() - canvas_height) {
- vert_value = adj->get_upper() - canvas_height;
+ if (vert_value>adj->get_upper() - _canvas_height) {
+ vert_value = adj->get_upper() - _canvas_height;
}
adj->set_value (vert_value);
}
/* ZOOM */
+void
+Editor::tav_zoom_step (bool coarser)
+{
+ ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::temporal_zoom_step), coarser));
+
+ _routes->suspend_redisplay ();
+
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ TimeAxisView *tv = (static_cast<TimeAxisView*>(*i));
+ tv->step_height (coarser);
+ }
+
+ _routes->resume_redisplay ();
+}
+
void
Editor::temporal_zoom_step (bool coarser)
{
double nfpu;
nfpu = frames_per_unit;
-
- if (coarser) {
+
+ if (coarser) {
nfpu *= 1.61803399;
- } else {
+ } else {
nfpu = max(1.0,(nfpu/1.61803399));
}
temporal_zoom (nfpu);
-}
+}
void
Editor::temporal_zoom (gdouble fpu)
{
if (!session) return;
-
+
nframes64_t current_page = current_page_frames();
nframes64_t current_leftmost = leftmost_frame;
nframes64_t current_rightmost;
}
nfpu = fpu;
-
- new_page_size = (nframes64_t) floor (canvas_width * nfpu);
+
+ new_page_size = (nframes64_t) floor (_canvas_width * nfpu);
half_page_size = new_page_size / 2;
switch (zoom_focus) {
case ZoomFocusLeft:
leftmost_after_zoom = current_leftmost;
break;
-
+
case ZoomFocusRight:
current_rightmost = leftmost_frame + current_page;
if (current_rightmost < new_page_size) {
leftmost_after_zoom = current_rightmost - new_page_size;
}
break;
-
+
case ZoomFocusCenter:
- current_center = current_leftmost + (current_page/2);
+ current_center = current_leftmost + (current_page/2);
if (current_center < half_page_size) {
leftmost_after_zoom = 0;
} else {
leftmost_after_zoom = current_center - half_page_size;
}
break;
-
+
case ZoomFocusPlayhead:
/* try to keep the playhead in the same place */
where = playhead_cursor->current_frame;
-
+
l = - ((new_page_size * ((where - current_leftmost)/(double)current_page)) - where);
if (l < 0) {
leftmost_after_zoom = 0;
- } else if (l > max_frames) {
+ } else if (l > max_frames) {
leftmost_after_zoom = max_frames - new_page_size;
} else {
leftmost_after_zoom = (nframes64_t) l;
if (l < 0) {
leftmost_after_zoom = 0;
- } else if (l > max_frames) {
+ } else if (l > max_frames) {
leftmost_after_zoom = max_frames - new_page_size;
} else {
leftmost_after_zoom = (nframes64_t) l;
if (l < 0) {
leftmost_after_zoom = 0;
- } else if (l > max_frames) {
+ } else if (l > max_frames) {
leftmost_after_zoom = max_frames - new_page_size;
} else {
leftmost_after_zoom = (nframes64_t) l;
return;
}
break;
-
+
}
-
+
// leftmost_after_zoom = min (leftmost_after_zoom, session->current_end_frame());
reposition_and_zoom (leftmost_after_zoom, nfpu);
-}
+}
void
Editor::temporal_zoom_region (bool both_axes)
nframes64_t start = max_frames;
nframes64_t end = 0;
- RegionSelection rs;
+ RegionSelection rs;
set<TimeAxisView*> tracks;
- double top_y_position = DBL_MAX;
get_regions_for_action (rs);
}
tracks.insert (&((*i)->get_time_axis_view()));
-
- if ((*i)->get_time_axis_view().y_position < top_y_position) {
- top_y_position = (*i)->get_time_axis_view().y_position;
- }
}
/* now comes an "interesting" hack ... make sure we leave a little space
}
nframes64_t range = end - start;
- double new_fpu = (double)range / (double)canvas_width;
+ double new_fpu = (double)range / (double)_canvas_width;
nframes64_t extra_samples = (nframes64_t) floor (one_centimeter_in_pixels * new_fpu);
if (start > extra_samples) {
start -= extra_samples;
} else {
start = 0;
- }
+ }
if (max_frames - extra_samples > end) {
end += extra_samples;
temporal_zoom_by_frame (start, end, "zoom to region");
if (both_axes) {
- uint32_t per_track_height = (uint32_t) floor ((canvas_height - 10.0) / tracks.size());
-
+ uint32_t per_track_height = (uint32_t) floor ((_canvas_height - canvas_timebars_vsize - 10.0) / tracks.size());
+
/* set visible track heights appropriately */
-
+
for (set<TimeAxisView*>::iterator t = tracks.begin(); t != tracks.end(); ++t) {
(*t)->set_height (per_track_height);
}
-
+
/* hide irrelevant tracks */
-
- no_route_list_redisplay = true;
+
+ _routes->suspend_redisplay ();
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
if (find (tracks.begin(), tracks.end(), (*i)) == tracks.end()) {
}
}
- no_route_list_redisplay = false;
- redisplay_route_list ();
+ _routes->resume_redisplay ();
- vertical_adjustment.set_value (std::max (top_y_position - 5.0, 0.0));
+ vertical_adjustment.set_value (0.0);
no_save_visual = false;
}
- zoomed_to_region = true;
redo_visual_stack.push_back (current_visual_state());
}
void
-Editor::toggle_zoom_region (bool both_axes)
+Editor::zoom_to_region (bool both_axes)
{
- if (zoomed_to_region) {
- swap_visual_state ();
- } else {
- temporal_zoom_region (both_axes);
- }
+ temporal_zoom_region (both_axes);
}
void
Editor::temporal_zoom_selection ()
{
if (!selection) return;
-
+
if (selection->time.empty()) {
return;
}
ENSURE_GUI_THREAD (mem_fun (*this, &Editor::temporal_zoom_session));
if (session) {
- last_canvas_frame = ((session->current_end_frame() - session->current_start_frame()) + (current_page_frames() / 24));
temporal_zoom_by_frame (session->current_start_frame(), session->current_end_frame(), "zoom to session");
}
}
void
-Editor::temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string & op)
+Editor::temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string & /*op*/)
{
if (!session) return;
nframes64_t range = end - start;
- double new_fpu = (double)range / (double)canvas_width;
-
- nframes64_t new_page = (nframes64_t) floor (canvas_width * new_fpu);
+ double new_fpu = (double)range / (double)_canvas_width;
+
+ nframes64_t new_page = (nframes64_t) floor (_canvas_width * new_fpu);
nframes64_t middle = (nframes64_t) floor( (double)start + ((double)range / 2.0f ));
nframes64_t new_leftmost = (nframes64_t) floor( (double)middle - ((double)new_page/2.0f));
reposition_and_zoom (new_leftmost, new_fpu);
}
-void
+void
Editor::temporal_zoom_to_frame (bool coarser, nframes64_t frame)
{
if (!session) {
}
double range_before = frame - leftmost_frame;
double new_fpu;
-
+
new_fpu = frames_per_unit;
-
- if (coarser) {
+
+ if (coarser) {
new_fpu *= 1.61803399;
range_before *= 1.61803399;
- } else {
+ } else {
new_fpu = max(1.0,(new_fpu/1.61803399));
range_before /= 1.61803399;
}
dialog.set_prompt (_("New Name:"));
- WindowTitle title(Glib::get_application_name());
- title += _("Name New Location Marker");
-
- dialog.set_title(title.get_string());
+ dialog.set_title (_("New Location Marker"));
dialog.set_name ("MarkNameWindow");
dialog.set_size_request (250, -1);
default:
return false;
}
-
+
dialog.get_result(name);
return true;
}
void
-Editor::add_location_from_audio_region ()
+Editor::add_locations_from_audio_region ()
{
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
return;
}
- RegionView* rv = *(rs.begin());
- boost::shared_ptr<Region> region = rv->region();
-
- Location *location = new Location (region->position(), region->last_frame(), region->name(), Location::IsRangeMarker);
- session->begin_reversible_command (_("add marker"));
- XMLNode &before = session->locations()->get_state();
- session->locations()->add (location, true);
- XMLNode &after = session->locations()->get_state();
- session->add_command(new MementoCommand<Locations>(*(session->locations()), &before, &after));
- session->commit_reversible_command ();
-}
+ session->begin_reversible_command (rs.size () > 1 ? _("add markers") : _("add marker"));
+ XMLNode &before = session->locations()->get_state();
-void
+ cerr << "Add locations\n";
+
+ for (RegionSelection::iterator i = rs.begin (); i != rs.end (); ++i) {
+
+ boost::shared_ptr<Region> region = (*i)->region ();
+
+ Location *location = new Location (region->position(), region->last_frame(), region->name(), Location::IsRangeMarker);
+
+ session->locations()->add (location, true);
+ }
+
+ XMLNode &after = session->locations()->get_state();
+ session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
+ session->commit_reversible_command ();
+}
+
+void
+Editor::add_location_from_audio_region ()
+{
+ RegionSelection rs;
+
+ get_regions_for_action (rs);
+
+ if (rs.empty()) {
+ return;
+ }
+
+ session->begin_reversible_command (_("add marker"));
+ XMLNode &before = session->locations()->get_state();
+
+ string markername;
+
+ if (rs.size() > 1) { // more than one region selected
+ session->locations()->next_available_name(markername, "regions");
+ } else {
+ RegionView* rv = *(rs.begin());
+ boost::shared_ptr<Region> region = rv->region();
+ markername = region->name();
+ }
+
+ if (!choose_new_marker_name(markername)) {
+ return;
+ }
+
+ cerr << "Add location\n";
+
+ // single range spanning all selected
+ Location *location = new Location (rs.start(), rs.end_frame(), markername, Location::IsRangeMarker);
+ session->locations()->add (location, true);
+
+ XMLNode &after = session->locations()->get_state();
+ session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
+ session->commit_reversible_command ();
+}
+
+void
Editor::amplitude_zoom_step (bool in)
{
gdouble zoom = 1.0;
#ifdef FIX_FOR_CANVAS
/* XXX DO SOMETHING */
#endif
-}
+}
/* DELETION */
if (!session) {
return;
}
-
+
Location *location = session->locations()->first_location_after (playhead_cursor->current_frame);
if (location) {
}
Location *location = session->locations()->first_location_before (playhead_cursor->current_frame);
-
+
if (location) {
session->request_locate (location->start(), session->transport_rolling());
} else {
if (session) {
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();
-
+
session->locations()->clear_ranges ();
// re-add these
if (looploc) session->locations()->add (looploc);
if (punchloc) session->locations()->add (punchloc);
-
+
XMLNode &after = session->locations()->get_state();
session->add_command(new MementoCommand<Locations>(*(session->locations()), &before, &after));
session->commit_reversible_command ();
{
for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
Location *l = (*i).first;
- if (l->is_hidden() && l->is_range_marker()) {
+ if (l->is_hidden() && l->is_range_marker()) {
l->set_hidden(false, this);
}
}
{
double wx, wy;
double cx, cy;
- TimeAxisView *tv;
nframes64_t where;
RouteTimeAxisView *rtv = 0;
boost::shared_ptr<Playlist> playlist;
-
+
track_canvas->window_to_world (x, y, wx, wy);
//wx += horizontal_adjustment.get_value();
//wy += vertical_adjustment.get_value();
event.type = GDK_BUTTON_RELEASE;
event.button.x = wx;
event.button.y = wy;
-
+
where = event_frame (&event, &cx, &cy);
if (where < leftmost_frame || where > leftmost_frame + current_page_frames()) {
/* clearly outside canvas area */
return;
}
-
- if ((tv = trackview_by_y_position (cy)) == 0) {
+
+ std::pair<TimeAxisView*, int> tv = trackview_by_y_position (cy);
+ if (tv.first == 0) {
return;
}
-
- if ((rtv = dynamic_cast<RouteTimeAxisView*>(tv)) == 0) {
+
+ if ((rtv = dynamic_cast<RouteTimeAxisView*> (tv.first)) == 0) {
return;
}
if ((playlist = rtv->playlist()) == 0) {
return;
}
-
+
snap_to (where);
-
+
begin_reversible_command (_("insert dragged region"));
XMLNode &before = playlist->get_state();
playlist->add_region (RegionFactory::create (region), where, 1.0);
Editor::insert_route_list_drag (boost::shared_ptr<Route> route, int x, int y) {
double wx, wy;
double cx, cy;
- TimeAxisView *tv;
nframes_t where;
RouteTimeAxisView *dest_rtv = 0;
RouteTimeAxisView *source_rtv = 0;
where = event_frame (&event, &cx, &cy);
- if ((tv = trackview_by_y_position (cy)) == 0) {
+ std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (cy);
+ if (tv.first == 0) {
return;
}
- if ((dest_rtv = dynamic_cast<RouteTimeAxisView*>(tv)) == 0) {
+ if ((dest_rtv = dynamic_cast<RouteTimeAxisView*> (tv.first)) == 0) {
return;
}
- /* use this drag source to add underlay to a track. But we really don't care
+ /* use this drag source to add underlay to a track. But we really don't care
about the Route, only the view of the route, so find it first */
for(TrackViewList::iterator it = track_views.begin(); it != track_views.end(); ++it) {
if((source_rtv = dynamic_cast<RouteTimeAxisView*>(*it)) == 0) {
continue;
}
-
+
if(source_rtv->route() == route && source_rtv != dest_rtv) {
dest_rtv->add_underlay(source_rtv->view());
break;
if ((playlist = tv->playlist()) == 0) {
return;
}
-
- Glib::RefPtr<TreeSelection> selected = region_list_display.get_selection();
-
- if (selected->count_selected_rows() != 1) {
+
+ boost::shared_ptr<Region> region = _regions->get_single_selection ();
+ if (region == 0) {
return;
}
-
- TreeView::Selection::ListHandle_Path rows = selected->get_selected_rows ();
-
- /* only one row selected, so rows.begin() is it */
-
- TreeIter iter;
- if ((iter = region_list_model->get_iter (*rows.begin()))) {
-
- boost::shared_ptr<Region> region = (*iter)[region_list_columns.region];
-
- begin_reversible_command (_("insert region"));
- XMLNode &before = playlist->get_state();
- playlist->add_region ((RegionFactory::create (region)), get_preferred_edit_position(), times);
- session->add_command(new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
- commit_reversible_command ();
- }
+ begin_reversible_command (_("insert region"));
+ XMLNode &before = playlist->get_state();
+ playlist->add_region ((RegionFactory::create (region)), get_preferred_edit_position(), times);
+ session->add_command(new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
+ commit_reversible_command ();
}
/* BUILT-IN EFFECTS */
return;
}
- switch (Config->get_slave_source()) {
- case None:
- case JACK:
- break;
- default:
- /* transport controlled by the master */
- return;
+ if (session->config.get_external_sync()) {
+ switch (session->config.get_sync_source()) {
+ case JACK:
+ break;
+ default:
+ /* transport controlled by the master */
+ return;
+ }
}
if (session->is_auditioning()) {
session->cancel_audition ();
return;
}
-
- session->request_transport_speed (fwd ? 1.0f : -1.0f);
-}
-
-void
-Editor::toggle_playback (bool with_abort)
-{
- if (!session) {
- return;
- }
-
- switch (Config->get_slave_source()) {
- case None:
- case JACK:
- break;
- default:
- /* transport controlled by the master */
- return;
- }
- if (session->is_auditioning()) {
- session->cancel_audition ();
- return;
- }
-
- if (session->transport_rolling()) {
- session->request_stop (with_abort);
- if (session->get_play_loop()) {
- session->request_play_loop (false);
- }
- } else {
- session->request_transport_speed (1.0f);
- }
+ session->request_transport_speed (fwd ? 1.0f : -1.0f);
}
void
return;
}
- session->request_play_range (true);
+ session->request_play_range (&selection->time, true);
}
void
Editor::loop_selected_region ()
{
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
if ((tll = transport_loop_location()) != 0) {
tll->set (rv->region()->position(), rv->region()->last_frame());
-
+
// enable looping, reposition and start rolling
session->request_play_loop (true);
selection->foreach_regionview (&RegionView::show_region_editor);
}
+/** Show the midi list editor for the selected MIDI regions */
+void
+Editor::show_midi_list_editor ()
+{
+ selection->foreach_midi_regionview (&MidiRegionView::show_list_editor);
+}
+
void
Editor::rename_region()
{
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
return;
}
- WindowTitle title (Glib::get_application_name());
- title += _("Rename Region");
-
- ArdourDialog d (*this, title.get_string(), true, false);
+ ArdourDialog d (*this, _("Rename Region"), true, false);
Entry entry;
Label label (_("New name:"));
HBox hbox;
entry.select_region (0, -1);
entry.signal_activate().connect (bind (mem_fun (d, &Dialog::response), RESPONSE_OK));
-
+
d.show_all ();
-
+
entry.grab_focus();
int ret = d.run();
strip_whitespace_edges (str);
if (!str.empty()) {
rs.front()->region()->set_name (str);
- redisplay_regions ();
+ _regions->redisplay ();
}
}
}
{
if (session->is_auditioning()) {
session->cancel_audition ();
- }
+ }
// note: some potential for creativity here, because region doesn't
// have to belong to the playlist that Route is handling
// bool was_soloed = route.soloed();
route.set_solo (true, this);
-
+
session->request_bounded_roll (region->position(), region->position() + region->length());
-
+
/* XXX how to unset the solo state ? */
}
{
nframes64_t start = max_frames;
nframes64_t end = 0;
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
-
+
if (rs.empty()) {
return;
}
}
}
- session->request_stop ();
session->request_bounded_roll (start, end);
}
interthread_progress_window = new ArdourDialog (X_("interthread progress"), true);
interthread_progress_bar.set_orientation (Gtk::PROGRESS_LEFT_TO_RIGHT);
-
+
interthread_progress_window->set_border_width (12);
interthread_progress_window->get_vbox()->set_spacing (6);
nframes64_t start = selection->time[clicked_selection].start;
nframes64_t end = selection->time[clicked_selection].end;
+ TrackSelection tracks = get_tracks_for_range_action ();
+
nframes64_t selection_cnt = end - start + 1;
-
- for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
- boost::shared_ptr<AudioRegion> current;
- boost::shared_ptr<Region> current_r;
- boost::shared_ptr<Playlist> pl;
+ for (TrackSelection::iterator i = tracks.begin(); i != tracks.end(); ++i) {
+ boost::shared_ptr<Region> current;
+ boost::shared_ptr<Playlist> pl;
nframes64_t internal_start;
string new_name;
continue;
}
- if ((current_r = pl->top_region_at (start)) == 0) {
+ if ((current = pl->top_region_at (start)) == 0) {
continue;
}
- current = boost::dynamic_pointer_cast<AudioRegion> (current_r);
- assert(current); // FIXME
- if (current != 0) {
- internal_start = start - current->position();
- session->region_name (new_name, current->name(), true);
- boost::shared_ptr<Region> region (RegionFactory::create (current, internal_start, selection_cnt, new_name));
- }
+ internal_start = start - current->position();
+ session->region_name (new_name, current->name(), true);
+ boost::shared_ptr<Region> region (RegionFactory::create (current,
+ internal_start, selection_cnt, new_name));
}
-}
+}
void
Editor::create_region_from_selection (vector<boost::shared_ptr<Region> >& new_regions)
nframes64_t start = selection->time[clicked_selection].start;
nframes64_t end = selection->time[clicked_selection].end;
-
+
sort_track_selection ();
for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
-
- boost::shared_ptr<AudioRegion> current;
- boost::shared_ptr<Region> current_r;
+ boost::shared_ptr<Region> current;
boost::shared_ptr<Playlist> playlist;
nframes64_t internal_start;
string new_name;
continue;
}
- if ((current_r = playlist->top_region_at(start)) == 0) {
+ if ((current = playlist->top_region_at(start)) == 0) {
continue;
}
- if ((current = boost::dynamic_pointer_cast<AudioRegion>(current_r)) == 0) {
- continue;
- }
-
internal_start = start - current->position();
session->region_name (new_name, current->name(), true);
-
- new_regions.push_back (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (current, internal_start, end - start + 1, new_name)));
+
+ new_regions.push_back (RegionFactory::create (current,
+ internal_start, end - start + 1, new_name));
}
}
void
Editor::split_multichannel_region ()
{
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
return;
}
- vector<boost::shared_ptr<AudioRegion> > v;
+ vector< boost::shared_ptr<Region> > v;
for (list<RegionView*>::iterator x = rs.begin(); x != rs.end(); ++x) {
-
- AudioRegionView* arv = dynamic_cast<AudioRegionView*>(*x);
-
- if (!arv || arv->audio_region()->n_channels() < 2) {
- continue;
- }
-
- (arv)->audio_region()->separate_by_channel (*session, v);
+ (*x)->region()->separate_by_channel (*session, v);
}
}
}
}
-void
-Editor::separate_regions_between (const TimeSelection& ts)
+/** Return either:
+ * - selected tracks, or if there are none...
+ * - tracks containing selected regions, or if there are none...
+ * - all tracks
+ * @return tracks.
+ */
+TrackSelection
+Editor::get_tracks_for_range_action () const
{
- bool in_command = false;
- boost::shared_ptr<Playlist> playlist;
- RegionSelection new_selection;
- TrackSelection tmptracks;
+ TrackSelection t;
if (selection->tracks.empty()) {
-
- /* use tracks with selected regions */
- RegionSelection rs;
+ /* use tracks with selected regions */
- get_regions_for_action (rs);
+ RegionSelection rs = selection->regions;
for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
TimeAxisView* tv = &(*i)->get_time_axis_view();
- if (find (tmptracks.begin(), tmptracks.end(), tv) == tmptracks.end()) {
- tmptracks.push_back (tv);
+ if (!t.contains (tv)) {
+ t.push_back (tv);
}
}
- if (tmptracks.empty()) {
- /* no regions selected: do nothing */
- return;
+ if (t.empty()) {
+ /* no regions and no tracks: use all tracks */
+ t = track_views;
}
} else {
- tmptracks = selection->tracks;
-
+ t = selection->tracks;
}
- sort_track_selection (&tmptracks);
-
+ return t;
+}
+void
+Editor::separate_regions_between (const TimeSelection& ts)
+{
+ bool in_command = false;
+ boost::shared_ptr<Playlist> playlist;
+ RegionSelection new_selection;
+ TrackSelection tmptracks = get_tracks_for_range_action ();
+ sort_track_selection (&tmptracks);
for (TrackSelection::iterator i = tmptracks.begin(); i != tmptracks.end(); ++i) {
if (rtv->track()->diskstream()->destructive()) {
continue;
}
-
+
if ((playlist = rtv->playlist()) != 0) {
XMLNode *before;
for (list<AudioRange>::const_iterator t = ts.begin(); t != ts.end(); ++t) {
- sigc::connection c = rtv->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
+ sigc::connection c = rtv->view()->RegionViewAdded.connect (
+ mem_fun(*this, &Editor::collect_new_region_view));
latest_regionviews.clear ();
- playlist->partition ((nframes64_t)((*t).start * speed), (nframes64_t)((*t).end * speed), true);
+ playlist->partition ((nframes64_t)((*t).start * speed),
+ (nframes64_t)((*t).end * speed), true);
c.disconnect ();
if (!latest_regionviews.empty()) {
-
+
got_some = true;
- rtv->view()->foreach_regionview (bind (sigc::ptr_fun (add_if_covered), &(*t), &new_selection));
-
+ rtv->view()->foreach_regionview (bind (
+ sigc::ptr_fun (add_if_covered),
+ &(*t), &new_selection));
+
if (!in_command) {
begin_reversible_command (_("separate"));
in_command = true;
}
-
- session->add_command(new MementoCommand<Playlist>(*playlist, before, &playlist->get_state()));
-
- }
+
+ session->add_command(new MementoCommand<Playlist>(
+ *playlist, before, &playlist->get_state()));
+ }
}
if (!got_some) {
}
}
+/** Take tracks from get_tracks_for_range_action and cut any regions
+ * on those tracks so that the tracks are empty over the time
+ * selection.
+ */
void
Editor::separate_region_from_selection ()
{
nframes64_t start;
nframes64_t end;
-
+
if (get_edit_op_range (start, end)) {
-
+
AudioRange ar (start, end, 1);
TimeSelection ts;
ts.push_back (ar);
crop_region_to (start, end);
}
}
-
-}
+
+}
void
Editor::crop_region_to (nframes64_t start, nframes64_t end)
sort_track_selection ();
ts = &selection->tracks;
}
-
+
for (TrackSelection::iterator i = ts->begin(); i != ts->end(); ++i) {
-
+
RouteTimeAxisView* rtv;
-
+
if ((rtv = dynamic_cast<RouteTimeAxisView*> ((*i))) != 0) {
boost::shared_ptr<Track> t = rtv->track();
if (t != 0 && ! t->diskstream()->destructive()) {
-
+
if ((playlist = rtv->playlist()) != 0) {
playlists.push_back (playlist);
}
if (playlists.empty()) {
return;
}
-
+
nframes64_t the_start;
nframes64_t the_end;
nframes64_t cnt;
-
+
begin_reversible_command (_("trim to selection"));
-
+
for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists.begin(); i != playlists.end(); ++i) {
-
+
boost::shared_ptr<Region> region;
-
+
the_start = start;
-
+
if ((region = (*i)->top_region_at(the_start)) == 0) {
continue;
}
-
+
/* now adjust lengths to that we do the right thing
if the selection extends beyond the region
*/
-
+
the_start = max (the_start, (nframes64_t) region->position());
if (max_frames - the_start < region->length()) {
the_end = the_start + region->length() - 1;
}
the_end = min (end, the_end);
cnt = the_end - the_start + 1;
-
+
XMLNode &before = (*i)->get_state();
region->trim_to (the_start, cnt, this);
XMLNode &after = (*i)->get_state();
session->add_command (new MementoCommand<Playlist>(*(*i), &before, &after));
}
-
+
commit_reversible_command ();
-}
+}
void
Editor::region_fill_track ()
{
nframes64_t end;
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
boost::shared_ptr<Region> region ((*i)->region());
-
- // FIXME
- boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(region);
- assert(ar);
boost::shared_ptr<Playlist> pl = region->playlist();
}
XMLNode &before = pl->get_state();
- pl->add_region (RegionFactory::create (ar), ar->last_frame(), times);
+ pl->add_region (RegionFactory::create (region), region->last_frame(), times);
session->add_command (new MementoCommand<Playlist>(*pl, &before, &pl->get_state()));
}
void
Editor::region_fill_selection ()
{
- if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) {
+ if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) {
return;
}
return;
}
-
- Glib::RefPtr<TreeSelection> selected = region_list_display.get_selection();
-
- if (selected->count_selected_rows() != 1) {
+ boost::shared_ptr<Region> region = _regions->get_single_selection ();
+ if (region == 0) {
return;
}
- TreeModel::iterator i = region_list_display.get_selection()->get_selected();
- boost::shared_ptr<Region> region = (*i)[region_list_columns.region];
-
nframes64_t start = selection->time[clicked_selection].start;
nframes64_t end = selection->time[clicked_selection].end;
- boost::shared_ptr<Playlist> playlist;
+ boost::shared_ptr<Playlist> playlist;
if (selection->tracks.empty()) {
return;
nframes64_t selection_length = end - start;
float times = (float)selection_length / region->length();
-
+
begin_reversible_command (_("fill selection"));
-
+
for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
if ((playlist = (*i)->playlist()) == 0) {
continue;
- }
-
+ }
+
XMLNode &before = playlist->get_state();
playlist->add_region (RegionFactory::create (region), start, times);
session->add_command (new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
}
-
- commit_reversible_command ();
+
+ commit_reversible_command ();
}
void
bool in_command = false;
for (RegionSelection::const_iterator r = rs.begin(); r != rs.end(); ++r) {
-
+
if (!(*r)->region()->covers (where)) {
continue;
}
}
XMLNode &before = region->playlist()->get_state();
- region->set_sync_position (get_preferred_edit_position());
+ region->set_sync_position (where);
XMLNode &after = region->playlist()->get_state();
session->add_command(new MementoCommand<Playlist>(*(region->playlist()), &before, &after));
}
void
Editor::remove_region_sync ()
{
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
void
Editor::naturalize ()
{
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
void
Editor::align (RegionPoint what)
{
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
nframes64_t where = get_preferred_edit_position();
Editor::align_relative (RegionPoint what)
{
nframes64_t where = get_preferred_edit_position();
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
if (!rs.empty()) {
align_selection_relative (what, where, rs);
- }
+ }
}
struct RegionSortByTime {
return;
}
- nframes64_t distance;
+ nframes64_t distance = 0;
nframes64_t pos = 0;
- int dir = 0;
+ int dir = 1;
list<RegionView*> sorted;
rs.by_position (sorted);
pos = position;
if (position > r->position()) {
distance = position - r->position();
- dir = 1;
} else {
distance = r->position() - position;
dir = -1;
}
break;
-
+
case End:
if (position > r->last_frame()) {
distance = position - r->last_frame();
pos = r->position() + distance;
- dir = 1;
} else {
distance = r->last_frame() - position;
pos = r->position() - distance;
pos = r->adjust_to_sync (position);
if (pos > r->position()) {
distance = pos - r->position();
- dir = 1;
} else {
distance = r->position() - pos;
dir = -1;
}
- break;
+ break;
}
if (pos == r->position()) {
session->add_command(new MementoCommand<Playlist>(*(r->playlist()), &before, &after));
/* move rest by the same amount */
-
+
sorted.pop_front();
-
+
for (list<RegionView*>::iterator i = sorted.begin(); i != sorted.end(); ++i) {
boost::shared_ptr<Region> region ((*i)->region());
XMLNode &before = region->playlist()->get_state();
-
+
if (dir > 0) {
region->set_position (region->position() + distance, this);
} else {
XMLNode &after = region->playlist()->get_state();
session->add_command(new MementoCommand<Playlist>(*(region->playlist()), &before, &after));
-}
+}
+
+void
+Editor::trim_region_front ()
+{
+ trim_region (true);
+}
+
+void
+Editor::trim_region_back ()
+{
+ trim_region (false);
+}
+
+void
+Editor::trim_region (bool front)
+{
+ nframes64_t where = get_preferred_edit_position();
+ RegionSelection rs;
+
+ get_regions_for_action (rs);
+
+ if (rs.empty()) {
+ return;
+ }
+
+ begin_reversible_command (front ? _("trim front") : _("trim back"));
+
+ for (list<RegionView*>::const_iterator i = rs.by_layer().begin(); i != rs.by_layer().end(); ++i) {
+ if (!(*i)->region()->locked()) {
+ boost::shared_ptr<Playlist> pl = (*i)->region()->playlist();
+ XMLNode &before = pl->get_state();
+ if (front) {
+ (*i)->region()->trim_front (where, this);
+ } else {
+ (*i)->region()->trim_end (where, this);
+ }
+ XMLNode &after = pl->get_state();
+ session->add_command(new MementoCommand<Playlist>(*pl.get(), &before, &after));
+ }
+ }
+
+ commit_reversible_command ();
+}
/** Trim the end of the selected regions to the position of the edit cursor */
void
begin_reversible_command (str);
for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
- AudioRegionView* arv = dynamic_cast<AudioRegionView*> (*x);
-
- if (!arv) {
- continue;
- }
+ RegionView* rv = (*x);
/* require region to span proposed trim */
-
- switch (arv->region()->coverage (loc.start(), loc.end())) {
+ switch (rv->region()->coverage (loc.start(), loc.end())) {
case OverlapInternal:
break;
default:
continue;
}
-
- AudioTimeAxisView* atav = dynamic_cast<AudioTimeAxisView*> (&arv->get_time_axis_view());
- if (!atav) {
+ RouteTimeAxisView* tav = dynamic_cast<RouteTimeAxisView*> (&rv->get_time_axis_view());
+ if (!tav) {
return;
}
nframes64_t start;
nframes64_t end;
- if (atav->get_diskstream() != 0) {
- speed = atav->get_diskstream()->speed();
+ if (tav->get_diskstream() != 0) {
+ speed = tav->get_diskstream()->speed();
}
-
+
start = session_frame_to_track_frame (loc.start(), speed);
end = session_frame_to_track_frame (loc.end(), speed);
- XMLNode &before = arv->region()->playlist()->get_state();
- arv->region()->trim_to (start, (end - start), this);
- XMLNode &after = arv->region()->playlist()->get_state();
- session->add_command(new MementoCommand<Playlist>(*(arv->region()->playlist()), &before, &after));
+ XMLNode &before = rv->region()->playlist()->get_state();
+ rv->region()->trim_to (start, (end - start), this);
+ XMLNode &after = rv->region()->playlist()->get_state();
+ session->add_command(new MementoCommand<Playlist>(
+ *(rv->region()->playlist()), &before, &after));
}
commit_reversible_command ();
Editor::trim_region_to_edit_point ()
{
RegionSelection rs;
-
+
get_regions_for_action (rs);
nframes64_t where = get_preferred_edit_position();
begin_reversible_command (_("trim region start to edit point"));
for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
- AudioRegionView* arv = dynamic_cast<AudioRegionView*> (*x);
+ RegionView* rv = (*x);
- if (!arv) {
+ /* require region to cover trim */
+ if (!rv->region()->covers (where)) {
continue;
}
- /* require region to cover trim */
-
- if (!arv->region()->covers (where)) {
- continue;
- }
-
- AudioTimeAxisView* atav = dynamic_cast<AudioTimeAxisView*> (&arv->get_time_axis_view());
-
- if (!atav) {
- return;
+ RouteTimeAxisView* tav = dynamic_cast<RouteTimeAxisView*> (&rv->get_time_axis_view());
+ if (!tav) {
+ return;
}
float speed = 1.0;
- if (atav->get_diskstream() != 0) {
- speed = atav->get_diskstream()->speed();
+ if (tav->get_diskstream() != 0) {
+ speed = tav->get_diskstream()->speed();
}
- XMLNode &before = arv->region()->playlist()->get_state();
- arv->region()->trim_end( session_frame_to_track_frame(where, speed), this);
- XMLNode &after = arv->region()->playlist()->get_state();
- session->add_command(new MementoCommand<Playlist>(*(arv->region()->playlist()), &before, &after));
+ XMLNode &before = rv->region()->playlist()->get_state();
+ rv->region()->trim_end( session_frame_to_track_frame(where, speed), this);
+ XMLNode &after = rv->region()->playlist()->get_state();
+ session->add_command(new MementoCommand<Playlist>(
+ *(rv->region()->playlist()), &before, &after));
}
-
+
commit_reversible_command ();
}
begin_reversible_command (_("trim region end to edit point"));
for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
- AudioRegionView* arv = dynamic_cast<AudioRegionView*> (*x);
+ RegionView* rv = (*x);
- if (!arv) {
+ /* require region to cover trim */
+ if (!rv->region()->covers (where)) {
continue;
}
- /* require region to cover trim */
+ RouteTimeAxisView* tav = dynamic_cast<RouteTimeAxisView*> (&rv->get_time_axis_view());
+ if (!tav) {
+ return;
+ }
+
+ float speed = 1.0;
+
+ if (tav->get_diskstream() != 0) {
+ speed = tav->get_diskstream()->speed();
+ }
+
+ XMLNode &before = rv->region()->playlist()->get_state();
+ rv->region()->trim_front ( session_frame_to_track_frame(where, speed), this);
+ XMLNode &after = rv->region()->playlist()->get_state();
+ session->add_command(new MementoCommand<Playlist>(
+ *(rv->region()->playlist()), &before, &after));
+ }
+
+ commit_reversible_command ();
+}
+
+void
+Editor::trim_region_to_previous_region_end ()
+{
+ return trim_to_region(false);
+}
+
+void
+Editor::trim_region_to_next_region_start ()
+{
+ return trim_to_region(true);
+}
+
+void
+Editor::trim_to_region(bool forward)
+{
+ RegionSelection rs;
+
+ get_regions_for_action (rs);
+
+ begin_reversible_command (_("trim to region"));
- if (!arv->region()->covers (where)) {
+ boost::shared_ptr<Region> next_region;
+
+ for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
+
+ AudioRegionView* arv = dynamic_cast<AudioRegionView*> (*x);
+
+ if (!arv) {
continue;
}
speed = atav->get_diskstream()->speed();
}
- XMLNode &before = arv->region()->playlist()->get_state();
- arv->region()->trim_front ( session_frame_to_track_frame(where, speed), this);
- XMLNode &after = arv->region()->playlist()->get_state();
- session->add_command(new MementoCommand<Playlist>(*(arv->region()->playlist()), &before, &after));
+
+ boost::shared_ptr<Region> region = arv->region();
+ boost::shared_ptr<Playlist> playlist (region->playlist());
+
+ XMLNode &before = playlist->get_state();
+
+ if(forward){
+
+ next_region = playlist->find_next_region (region->first_frame(), Start, 1);
+
+ if(!next_region){
+ continue;
+ }
+
+ region->trim_end((nframes64_t) (next_region->first_frame() * speed), this);
+ arv->region_changed (Change (LengthChanged));
+ }
+ else {
+
+ next_region = playlist->find_next_region (region->first_frame(), Start, 0);
+
+ if(!next_region){
+ continue;
+ }
+
+ region->trim_front((nframes64_t) ((next_region->last_frame() + 1) * speed), this);
+ arv->region_changed (Change (LengthChanged|PositionChanged|StartChanged));
+ }
+
+ XMLNode &after = playlist->get_state();
+ session->add_command(new MementoCommand<Playlist>(*playlist, &before, &after));
}
-
+
commit_reversible_command ();
}
void
Editor::unfreeze_route ()
{
- if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) {
+ if (clicked_routeview == 0 || !clicked_routeview->is_track()) {
return;
}
-
- clicked_routeview->audio_track()->unfreeze ();
+
+ clicked_routeview->track()->unfreeze ();
}
void*
Editor::_freeze_thread (void* arg)
{
- PBD::ThreadCreated (pthread_self(), X_("Freeze"));
+ PBD::notify_gui_about_thread_creation (pthread_self(), X_("Freeze"));
return static_cast<Editor*>(arg)->freeze_thread ();
}
Editor::freeze_thread ()
{
clicked_routeview->audio_track()->freeze (*current_interthread_info);
+ current_interthread_info->done = true;
return 0;
}
gint
-Editor::freeze_progress_timeout (void *arg)
+Editor::freeze_progress_timeout (void */*arg*/)
{
- interthread_progress_bar.set_fraction (current_interthread_info->progress/100);
+ interthread_progress_bar.set_fraction (current_interthread_info->progress);
return !(current_interthread_info->done || current_interthread_info->cancel);
}
if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) {
return;
}
-
+
InterThreadInfo itt;
if (interthread_progress_window == 0) {
build_interthread_progress_window ();
}
- WindowTitle title(Glib::get_application_name());
- title += _("Freeze");
- interthread_progress_window->set_title (title.get_string());
+ interthread_progress_window->set_title (_("Freeze"));
interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE);
interthread_progress_window->show_all ();
interthread_progress_bar.set_fraction (0.0f);
interthread_cancel_label.set_text (_("Cancel Freeze"));
current_interthread_info = &itt;
- interthread_progress_connection =
+ interthread_progress_connection =
Glib::signal_timeout().connect (bind (mem_fun(*this, &Editor::freeze_progress_timeout), (gpointer) 0), 100);
itt.done = false;
itt.cancel = false;
itt.progress = 0.0f;
-
+
pthread_attr_t attr;
pthread_attr_init(&attr);
pthread_attr_setstacksize(&attr, 500000);
- pthread_create (&itt.thread, &attr, _freeze_thread, this);
+ pthread_create_and_store (X_("freezer"), &itt.thread, &attr, _freeze_thread, this);
pthread_attr_destroy(&attr);
}
void
-Editor::bounce_range_selection (bool replace)
+Editor::bounce_range_selection (bool replace, bool enable_processing)
{
if (selection->time.empty()) {
return;
if ((rtv = dynamic_cast<RouteTimeAxisView*> (*i)) == 0) {
continue;
}
-
+
boost::shared_ptr<Playlist> playlist;
-
+
if ((playlist = rtv->playlist()) == 0) {
return;
}
InterThreadInfo itt;
-
+
itt.done = false;
itt.cancel = false;
itt.progress = false;
XMLNode &before = playlist->get_state();
- boost::shared_ptr<Region> r = rtv->track()->bounce_range (start, start+cnt, itt);
-
+ boost::shared_ptr<Region> r = rtv->track()->bounce_range (start, start+cnt, itt, enable_processing);
+
if (replace) {
list<AudioRange> ranges;
ranges.push_back (AudioRange (start, start+cnt, 0));
XMLNode &after = playlist->get_state();
session->add_command (new MementoCommand<Playlist> (*playlist, &before, &after));
}
-
+
commit_reversible_command ();
}
Editor::can_cut_copy () const
{
switch (current_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;
}
/** Cut, copy or clear selected regions, automation points or a time range.
* @param op Operation (Cut, Copy or Clear)
*/
-void
+void
Editor::cut_copy (CutCopyOp op)
{
/* only cancel selection if cut/copy is successful.*/
*/
if (op == Cut || op == Clear) {
- if (drag_info.item) {
- drag_info.item->ungrab (0);
- drag_info.item = 0;
+ if (_drag) {
+ _drag->item()->ungrab (0);
+ delete _drag;
+ _drag = 0;
}
}
-
+
cut_buffer->clear ();
if (entered_marker) {
}
break_drag ();
+ delete _drag;
+ _drag = 0;
return;
}
- RegionSelection rs;
+ if (internal_editing()) {
- /* we only want to cut regions if some are selected */
+ switch (current_mouse_mode()) {
+ case MouseObject:
+ case MouseRange:
+ cut_copy_midi (op);
+ break;
+ default:
+ break;
+ }
- if (!selection->regions.empty()) {
- get_regions_for_action (rs);
- }
+ } else {
- switch (current_mouse_mode()) {
- case MouseObject:
- if (!rs.empty() || !selection->points.empty()) {
+ RegionSelection rs;
+
+ /* we only want to cut regions if some are selected */
+
+ if (!selection->regions.empty()) {
+ get_regions_for_action (rs, false, false);
+ }
- begin_reversible_command (opname + _(" objects"));
+ switch (current_mouse_mode()) {
+ case MouseObject:
+ if (!rs.empty() || !selection->points.empty()) {
- if (!rs.empty()) {
- cut_copy_regions (op, rs);
-
- if (op == Cut) {
- selection->clear_regions ();
+ begin_reversible_command (opname + _(" objects"));
+
+ if (!rs.empty()) {
+ cut_copy_regions (op, rs);
+
+ if (op == Cut) {
+ selection->clear_regions ();
+ }
}
- }
- if (!selection->points.empty()) {
- cut_copy_points (op);
+ if (!selection->points.empty()) {
+ cut_copy_points (op);
- if (op == Cut) {
- selection->clear_points ();
+ if (op == Cut) {
+ selection->clear_points ();
+ }
}
+
+ commit_reversible_command ();
+ break; // terminate case statement here
+ }
+ if (!selection->time.empty()) {
+ /* don't cause suprises */
+ break;
}
+ // fall thru if there was nothing selected
- commit_reversible_command ();
- break; // terminate case statement here
- }
- if (!selection->time.empty()) {
- /* don't cause suprises */
- break;
- }
- // fall thru if there was nothing selected
-
- case MouseRange:
- if (selection->time.empty()) {
- nframes64_t start, end;
- if (!get_edit_op_range (start, end)) {
- return;
+ case MouseRange:
+ if (selection->time.empty()) {
+ nframes64_t start, end;
+ if (!get_edit_op_range (start, end)) {
+ return;
+ }
+ selection->set ((TimeAxisView*) 0, start, end);
}
- selection->set ((TimeAxisView*) 0, start, end);
- }
-
- begin_reversible_command (opname + _(" range"));
- cut_copy_ranges (op);
- commit_reversible_command ();
-
- if (op == Cut) {
- selection->clear_time ();
- }
- break;
-
- default:
- break;
- }
+ begin_reversible_command (opname + _(" range"));
+ cut_copy_ranges (op);
+ commit_reversible_command ();
+
+ if (op == Cut) {
+ selection->clear_time ();
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
if (op == Cut || op == Clear) {
break_drag ();
+ delete _drag;
+ _drag = 0;
}
}
if (atv) {
atv->cut_copy_clear_objects (selection->points, op);
- }
+ }
+ }
+}
+
+/** Cut, copy or clear selected automation points.
+ * @param op Operation (Cut, Copy or Clear)
+ */
+void
+Editor::cut_copy_midi (CutCopyOp op)
+{
+ for (MidiRegionSelection::iterator i = selection->midi_regions.begin(); i != selection->midi_regions.end(); ++i) {
+ MidiRegionView* mrv = *i;
+ mrv->cut_copy_clear (op);
}
}
return a.playlist < b.playlist;
}
};
-
-struct PlaylistMapping {
+
+struct PlaylistMapping {
TimeAxisView* tv;
boost::shared_ptr<Playlist> pl;
PlaylistMapping (TimeAxisView* tvp) : tv (tvp) {}
};
+/** Remove `clicked_regionview' */
+void
+Editor::remove_clicked_region ()
+{
+ if (clicked_routeview == 0 || clicked_regionview == 0) {
+ return;
+ }
+
+ boost::shared_ptr<Playlist> playlist = clicked_routeview->playlist();
+
+ begin_reversible_command (_("remove region"));
+ XMLNode &before = playlist->get_state();
+ playlist->remove_region (clicked_regionview->region());
+ XMLNode &after = playlist->get_state();
+ session->add_command(new MementoCommand<Playlist>(*playlist, &before, &after));
+ commit_reversible_command ();
+}
+
+
+/** Remove the selected regions */
+void
+Editor::remove_selected_regions ()
+{
+ RegionSelection rs;
+ get_regions_for_action (rs);
+
+ if (!session) {
+ return;
+ }
+
+ if (rs.empty()) {
+ return;
+ }
+
+ begin_reversible_command (_("remove region"));
+
+ list<boost::shared_ptr<Region> > regions_to_remove;
+
+ for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+ // we can't just remove the region(s) in this loop because
+ // this removes them from the RegionSelection, and they thus
+ // disappear from underneath the iterator, and the ++i above
+ // SEGVs in a puzzling fashion.
+
+ // so, first iterate over the regions to be removed from rs and
+ // add them to the regions_to_remove list, and then
+ // iterate over the list to actually remove them.
+
+ regions_to_remove.push_back ((*i)->region());
+ }
+
+ vector<PlaylistState> playlists;
+
+ for (list<boost::shared_ptr<Region> >::iterator rl = regions_to_remove.begin(); rl != regions_to_remove.end(); ++rl) {
+
+ boost::shared_ptr<Playlist> playlist = (*rl)->playlist();
+
+ if (!playlist) {
+ // is this check necessary?
+ continue;
+ }
+
+ vector<PlaylistState>::iterator i;
+
+ //only take state if this is a new playlist.
+ for (i = playlists.begin(); i != playlists.end(); ++i) {
+ if ((*i).playlist == playlist) {
+ break;
+ }
+ }
+
+ if (i == playlists.end()) {
+
+ PlaylistState before;
+ before.playlist = playlist;
+ before.before = &playlist->get_state();
+
+ playlist->freeze ();
+ playlists.push_back(before);
+ }
+
+ playlist->remove_region (*rl);
+ }
+
+ vector<PlaylistState>::iterator pl;
+
+ for (pl = playlists.begin(); pl != playlists.end(); ++pl) {
+ (*pl).playlist->thaw ();
+ session->add_command(new MementoCommand<Playlist>(*(*pl).playlist, (*pl).before, &(*pl).playlist->get_state()));
+ }
+
+ commit_reversible_command ();
+}
/** Cut, copy or clear selected regions.
* @param op Operation (Cut, Copy or Clear)
*/
void
Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs)
-{
+{
/* we can't use a std::map here because the ordering is important, and we can't trivially sort
a map when we want ordered access to both elements. i think.
*/
vector<PlaylistMapping> pmap;
nframes64_t first_position = max_frames;
-
+
set<PlaylistState, lt_playlist> freezelist;
pair<set<PlaylistState, lt_playlist>::iterator,bool> insert_result;
-
+
/* get ordering correct before we cut/copy */
-
+
rs.sort_by_position_and_track ();
for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
boost::shared_ptr<Playlist> pl = (*x)->region()->playlist();
if (pl) {
+ set<PlaylistState, lt_playlist>::iterator fl;
- PlaylistState before;
- before.playlist = pl;
- before.before = &pl->get_state();
-
- insert_result = freezelist.insert (before);
-
- if (insert_result.second) {
+ //only take state if this is a new playlist.
+ for (fl = freezelist.begin(); fl != freezelist.end(); ++fl) {
+ if ((*fl).playlist == pl) {
+ break;
+ }
+ }
+
+ if (fl == freezelist.end()) {
+ PlaylistState before;
+ before.playlist = pl;
+ before.before = &pl->get_state();
pl->freeze ();
+ insert_result = freezelist.insert (before);
}
}
}
break;
}
}
-
+
if (z == pmap.end()) {
pmap.push_back (PlaylistMapping (tv));
}
for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ) {
boost::shared_ptr<Playlist> pl = (*x)->region()->playlist();
-
+
if (!pl) {
/* impossible, but this handles it for the future */
continue;
TimeAxisView& tv = (*x)->get_trackview();
boost::shared_ptr<Playlist> npl;
RegionSelection::iterator tmp;
-
+
tmp = x;
++tmp;
vector<PlaylistMapping>::iterator z;
-
+
for (z = pmap.begin(); z != pmap.end(); ++z) {
if ((*z).tv == &tv) {
break;
}
}
-
+
assert (z != pmap.end());
-
+
if (!(*z).pl) {
npl = PlaylistFactory::create (pl->data_type(), *session, "cutlist", true);
npl->freeze();
} else {
npl = (*z).pl;
}
-
+
boost::shared_ptr<Region> r = (*x)->region();
boost::shared_ptr<Region> _xx;
npl->add_region (_xx, r->position() - first_position);
pl->remove_region (r);
break;
-
+
case Copy:
/* copy region before adding, so we're not putting same object into two different playlists */
npl->add_region (RegionFactory::create (r), r->position() - first_position);
break;
-
+
case Clear:
pl->remove_region (r);
break;
x = tmp;
}
-
+
list<boost::shared_ptr<Playlist> > foo;
-
+
/* the pmap is in the same order as the tracks in which selected regions occured */
-
+
for (vector<PlaylistMapping>::iterator i = pmap.begin(); i != pmap.end(); ++i) {
(*i).pl->thaw();
foo.push_back ((*i).pl);
}
-
+
if (!foo.empty()) {
cut_buffer->set (foo);
{
bool commit = false;
- if (cut_buffer->empty()) {
- return;
+ if (internal_editing()) {
+ if (cut_buffer->midi_notes.empty()) {
+ return;
+ }
+ } else {
+ if (cut_buffer->empty()) {
+ return;
+ }
}
if (position == max_frames) {
/* get everything in the correct order */
-
if (!selection->tracks.empty()) {
sort_track_selection ();
ts = selection->tracks;
for (nth = 0, i = ts.begin(); i != ts.end(); ++i, ++nth) {
- /* undo/redo is handled by individual tracks */
+ /* undo/redo is handled by individual tracks/regions */
- if ((*i)->paste (position, times, *cut_buffer, nth)) {
- commit = true;
- }
- }
-
- if (commit) {
- commit_reversible_command ();
- }
-}
+ if (internal_editing()) {
-void
-Editor::paste_named_selection (float times)
-{
- TrackSelection::iterator t;
+ RegionSelection rs;
+ RegionSelection::iterator r;
+ MidiNoteSelection::iterator cb;
- Glib::RefPtr<TreeSelection> selected = named_selection_display.get_selection();
-
- if (selected->count_selected_rows() != 1 || selection->tracks.empty()) {
- return;
- }
+ get_regions_at (rs, position, ts);
- TreeModel::iterator i = selected->get_selected();
- NamedSelection* ns = (*i)[named_selection_columns.selection];
-
- list<boost::shared_ptr<Playlist> >::iterator chunk;
- list<boost::shared_ptr<Playlist> >::iterator tmp;
-
- chunk = ns->playlists.begin();
-
- begin_reversible_command (_("paste chunk"));
-
- sort_track_selection ();
-
- for (t = selection->tracks.begin(); t != selection->tracks.end(); ++t) {
-
- RouteTimeAxisView* rtv;
- boost::shared_ptr<Playlist> pl;
- boost::shared_ptr<AudioPlaylist> apl;
-
- if ((rtv = dynamic_cast<RouteTimeAxisView*> (*t)) == 0) {
- continue;
- }
-
- if ((pl = rtv->playlist()) == 0) {
- continue;
- }
-
- if ((apl = boost::dynamic_pointer_cast<AudioPlaylist> (pl)) == 0) {
- continue;
- }
-
- tmp = chunk;
- ++tmp;
+ for (cb = cut_buffer->midi_notes.begin(), r = rs.begin();
+ cb != cut_buffer->midi_notes.end() && r != rs.end(); ++r) {
+ MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (*r);
+ if (mrv) {
+ mrv->paste (position, times, **cb);
+ ++cb;
+ }
+ }
- XMLNode &before = apl->get_state();
- apl->paste (*chunk, get_preferred_edit_position(), times);
- session->add_command(new MementoCommand<AudioPlaylist>(*apl, &before, &apl->get_state()));
+ } else {
- if (tmp != ns->playlists.end()) {
- chunk = tmp;
+ if ((*i)->paste (position, times, *cut_buffer, nth)) {
+ commit = true;
+ }
}
}
- commit_reversible_command();
+ if (commit) {
+ commit_reversible_command ();
+ }
}
void
Editor::duplicate_some_regions (RegionSelection& regions, float times)
{
- boost::shared_ptr<Playlist> playlist;
+ boost::shared_ptr<Playlist> playlist;
RegionSelection sel = regions; // clear (below) may clear the argument list if its the current region selection
RegionSelection foo;
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&tv);
latest_regionviews.clear ();
sigc::connection c = rtv->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
-
+
playlist = (*i)->region()->playlist();
XMLNode &before = playlist->get_state();
playlist->duplicate (r, r->last_frame(), times);
session->add_command(new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
c.disconnect ();
-
+
foo.insert (foo.end(), latest_regionviews.begin(), latest_regionviews.end());
}
return;
}
- boost::shared_ptr<Playlist> playlist;
+ boost::shared_ptr<Playlist> playlist;
vector<boost::shared_ptr<Region> > new_regions;
vector<boost::shared_ptr<Region> >::iterator ri;
-
+
create_region_from_selection (new_regions);
if (new_regions.empty()) {
return;
}
-
+
begin_reversible_command (_("duplicate selection"));
ri = new_regions.begin();
/* reset all selected points to the relevant default value */
for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) {
-
+
AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*>(&(*i).track);
-
+
if (atv) {
atv->reset_objects (selection->points);
- }
+ }
}
}
void
Editor::center_playhead ()
{
- float page = canvas_width * frames_per_unit;
+ float page = _canvas_width * frames_per_unit;
center_screen_internal (playhead_cursor->current_frame, page);
}
void
Editor::center_edit_point ()
{
- float page = canvas_width * frames_per_unit;
+ float page = _canvas_width * frames_per_unit;
center_screen_internal (get_preferred_edit_position(), page);
}
void
Editor::nudge_track (bool use_edit, bool forwards)
{
- boost::shared_ptr<Playlist> playlist;
+ boost::shared_ptr<Playlist> playlist;
nframes64_t distance;
nframes64_t next_distance;
nframes64_t start;
if ((distance = get_nudge_distance (start, next_distance)) == 0) {
return;
}
-
+
if (selection->tracks.empty()) {
return;
}
-
+
begin_reversible_command (_("nudge track"));
-
+
for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
if ((playlist = (*i)->playlist()) == 0) {
continue;
- }
-
+ }
+
XMLNode &before = playlist->get_state();
playlist->nudge_after (start, distance, forwards);
XMLNode &after = playlist->get_state();
session->add_command (new MementoCommand<Playlist>(*playlist, &before, &after));
}
-
- commit_reversible_command ();
+
+ commit_reversible_command ();
}
void
{
vector<string> choices;
string prompt;
-
+
if (!session) {
return;
}
choices.push_back (_("No, do nothing."));
choices.push_back (_("Yes, destroy it."));
-
+
Gtkmm2ext::Choice prompter (prompt, choices);
-
+
if (prompter.run () == 1) {
session->remove_last_capture ();
}
void
Editor::normalize_region ()
{
- RegionSelection rs;
-
- get_regions_for_action (rs);
-
if (!session) {
return;
}
+ RegionSelection rs;
+ get_regions_for_action (rs);
+
if (rs.empty()) {
return;
}
+ Dialog dialog (rs.size() > 1 ? _("Normalize regions") : _("Normalize region"));
+ HBox hbox;
+ hbox.pack_start (*manage (new Label (_("Normalize to:"))));
+ SpinButton spin (0.2, 2);
+ spin.set_range (-112, 0);
+ spin.set_increments (0.1, 1);
+ spin.set_value (0);
+ hbox.pack_start (spin);
+ spin.set_value (_last_normalization_value);
+ hbox.pack_start (*manage (new Label (_("dbFS"))));
+ hbox.show_all ();
+ dialog.get_vbox()->pack_start (hbox);
+ dialog.add_button (Stock::CANCEL, RESPONSE_CANCEL);
+ dialog.add_button (_("Normalize"), RESPONSE_ACCEPT);
+
+ if (dialog.run () == RESPONSE_CANCEL) {
+ return;
+ }
+
begin_reversible_command (_("normalize"));
track_canvas->get_window()->set_cursor (*wait_cursor);
if (!arv)
continue;
XMLNode &before = arv->region()->get_state();
- arv->audio_region()->normalize_to (0.0f);
+ arv->audio_region()->normalize_to (spin.get_value());
session->add_command (new MementoCommand<Region>(*(arv->region().get()), &before, &arv->region()->get_state()));
}
commit_reversible_command ();
track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+
+ _last_normalization_value = spin.get_value ();
}
void
-Editor::denormalize_region ()
+Editor::reset_region_scale_amplitude ()
{
if (!session) {
return;
}
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
return;
}
- begin_reversible_command ("denormalize");
+ begin_reversible_command ("reset gain");
for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*r);
return;
}
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
if (!arv)
continue;
XMLNode &before = arv->region()->get_state();
-
+
double fraction = gain_to_slider_position (arv->audio_region()->scale_amplitude ());
-
+
if (up) {
fraction += 0.05;
fraction = min (fraction, 1.0);
}
fraction = slider_position_to_gain (fraction);
- fraction = coefficient_to_dB (fraction);
- fraction = dB_to_coefficient (fraction);
if (up && fraction >= 2.0) {
continue;
}
-
+
arv->audio_region()->set_scale_amplitude (fraction);
session->add_command (new MementoCommand<Region>(*(arv->region().get()), &before, &arv->region()->get_state()));
}
apply_filter (rev, _("reverse regions"));
}
+void
+Editor::strip_region_silence ()
+{
+ if (!session) {
+ return;
+ }
+
+ RegionSelection rs;
+ get_regions_for_action (rs);
+
+ if (rs.empty()) {
+ return;
+ }
+
+ std::list<boost::shared_ptr<AudioRegion> > ar;
+
+ for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+ AudioRegionView* const arv = dynamic_cast<AudioRegionView*> (*i);
+ if (arv) {
+ ar.push_back (arv->audio_region ());
+ }
+ }
+
+ StripSilenceDialog d (ar);
+ int const r = d.run ();
+
+ if (r == Gtk::RESPONSE_OK) {
+ StripSilence s (*session, d.threshold (), d.minimum_length (), d.fade_length ());
+ apply_filter (s, _("strip silence"));
+ }
+}
+
+Command*
+Editor::apply_midi_note_edit_op_to_region (MidiOperator& op, MidiRegionView& mrv)
+{
+ Evoral::Sequence<Evoral::MusicalTime>::Notes selected;
+ mrv.selection_as_notelist (selected);
+
+ vector<Evoral::Sequence<Evoral::MusicalTime>::Notes> v;
+ v.push_back (selected);
+
+ return op (mrv.midi_region()->model(), v);
+}
+
+void
+Editor::apply_midi_note_edit_op (MidiOperator& op)
+{
+ RegionSelection rs;
+ Command* cmd;
+
+ get_regions_for_action (rs);
+
+ if (rs.empty()) {
+ return;
+ }
+
+ begin_reversible_command (op.name ());
+
+ for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ) {
+ RegionSelection::iterator tmp = r;
+ ++tmp;
+
+ MidiRegionView* const mrv = dynamic_cast<MidiRegionView*> (*r);
+
+ if (mrv) {
+ cmd = apply_midi_note_edit_op_to_region (op, *mrv);
+ if (cmd) {
+ (*cmd)();
+ session->add_command (cmd);
+ }
+ }
+
+ r = tmp;
+ }
+
+ commit_reversible_command ();
+ rs.clear ();
+}
void
Editor::quantize_region ()
return;
}
- // FIXME: varying meter?
- Quantize quant (*session, snap_length_beats(0));
- apply_filter (quant, _("quantize regions"));
+ QuantizeDialog* qd = new QuantizeDialog (*this);
+
+ qd->present ();
+ const int r = qd->run ();
+ qd->hide ();
+
+ if (r == Gtk::RESPONSE_OK) {
+ Quantize quant (*session, Plain,
+ qd->snap_start(), qd->snap_end(),
+ qd->start_grid_size(), qd->end_grid_size(),
+ qd->strength(), qd->swing(), qd->threshold());
+
+ apply_midi_note_edit_op (quant);
+ }
}
void
Editor::apply_filter (Filter& filter, string command)
{
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
RegionSelection::iterator tmp = r;
++tmp;
- MidiRegionView* const mrv = dynamic_cast<MidiRegionView*>(*r);
- if (mrv) {
- if (mrv->midi_region()->apply(filter) == 0) {
- mrv->redisplay_model();
- }
- }
-
AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*r);
if (arv) {
boost::shared_ptr<Playlist> playlist = arv->region()->playlist();
if (arv->audio_region()->apply (filter) == 0) {
XMLNode &before = playlist->get_state();
- playlist->replace_region (arv->region(), filter.results.front(), arv->region()->position());
+
+ if (filter.results.empty ()) {
+
+ /* no regions returned; remove the old one */
+ playlist->remove_region (arv->region ());
+
+ } else {
+
+ std::vector<boost::shared_ptr<Region> >::iterator res = filter.results.begin ();
+
+ /* first region replaces the old one */
+ playlist->replace_region (arv->region(), *res, (*res)->position());
+ ++res;
+
+ /* add the rest */
+ while (res != filter.results.end()) {
+ playlist->add_region (*res, (*res)->position());
+ ++res;
+ }
+
+ }
+
XMLNode &after = playlist->get_state();
session->add_command(new MementoCommand<Playlist>(*playlist, &before, &after));
} else {
Editor::brush (nframes64_t pos)
{
RegionSelection sel;
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
void
Editor::reset_region_gain_envelopes ()
{
- RegionSelection rs;
-
- get_regions_for_action (rs);
+ RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit);
if (!session || rs.empty()) {
return;
void
Editor::toggle_gain_envelope_visibility ()
{
- RegionSelection rs;
+ RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit);
- get_regions_for_action (rs);
+ if (!session || rs.empty()) {
+ return;
+ }
+
+ session->begin_reversible_command (_("region gain envelope visible"));
for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
if (arv) {
+ XMLNode &before = arv->region()->get_state ();
arv->set_envelope_visible (!arv->envelope_visible());
+ XMLNode &after = arv->region()->get_state ();
+ session->add_command (new MementoCommand<Region> (*(arv->region().get()), &before, &after));
}
}
+
+ session->commit_reversible_command ();
}
void
Editor::toggle_gain_envelope_active ()
{
- RegionSelection rs;
+ RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit);
- get_regions_for_action (rs);
+ if (!session || rs.empty()) {
+ return;
+ }
+
+ session->begin_reversible_command (_("region gain envelope active"));
for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
if (arv) {
+ XMLNode &before = arv->region()->get_state ();
arv->audio_region()->set_envelope_active (!arv->audio_region()->envelope_active());
+ XMLNode &after = arv->region()->get_state ();
+ session->add_command (new MementoCommand<Region> (*(arv->region().get()), &before, &after));
}
}
+
+ session->commit_reversible_command ();
}
void
Editor::toggle_region_lock ()
{
- RegionSelection rs;
+ RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit);
- get_regions_for_action (rs);
+ if (!session || rs.empty()) {
+ return;
+ }
+
+ session->begin_reversible_command (_("region lock"));
for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+ XMLNode &before = (*i)->region()->get_state ();
(*i)->region()->set_locked (!(*i)->region()->locked());
+ XMLNode &after = (*i)->region()->get_state ();
+ session->add_command (new MementoCommand<Region> (*((*i)->region().get()), &before, &after));
}
+
+ session->commit_reversible_command ();
}
void
Editor::set_region_lock_style (Region::PositionLockStyle ps)
{
- RegionSelection rs;
+ RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit);
- get_regions_for_action (rs);
+ if (!session || rs.empty()) {
+ return;
+ }
+
+ session->begin_reversible_command (_("region lock style"));
for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+ XMLNode &before = (*i)->region()->get_state ();
(*i)->region()->set_position_lock_style (ps);
+ XMLNode &after = (*i)->region()->get_state ();
+ session->add_command (new MementoCommand<Region> (*((*i)->region().get()), &before, &after));
}
+
+ session->commit_reversible_command ();
}
void
Editor::toggle_region_mute ()
{
- RegionSelection rs;
+ RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit);
- get_regions_for_action (rs);
+ if (!session || rs.empty()) {
+ return;
+ }
+
+ session->begin_reversible_command (_("region mute"));
for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+ XMLNode &before = (*i)->region()->get_state ();
(*i)->region()->set_muted (!(*i)->region()->muted());
+ XMLNode &after = (*i)->region()->get_state ();
+ session->add_command (new MementoCommand<Region> (*((*i)->region().get()), &before, &after));
}
+
+ session->commit_reversible_command ();
}
void
Editor::toggle_region_opaque ()
{
- RegionSelection rs;
+ RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit);
- get_regions_for_action (rs);
+ if (!session || rs.empty()) {
+ return;
+ }
+
+ session->begin_reversible_command (_("region opacity"));
for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+ XMLNode &before = (*i)->region()->get_state ();
(*i)->region()->set_opaque (!(*i)->region()->opaque());
+ XMLNode &after = (*i)->region()->get_state ();
+ session->add_command (new MementoCommand<Region> (*((*i)->region().get()), &before, &after));
}
+
+ session->commit_reversible_command ();
}
void
-Editor::set_fade_length (bool in)
+Editor::toggle_record_enable ()
{
- RegionSelection rs;
+ bool new_state = false;
+ bool first = true;
+ for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
+ RouteTimeAxisView *rtav = dynamic_cast<RouteTimeAxisView *>(*i);
+ if (!rtav)
+ continue;
+ if (!rtav->is_track())
+ continue;
- get_regions_for_action (rs);
+ if (first) {
+ new_state = !rtav->track()->record_enabled();
+ first = false;
+ }
- /* we need a region to measure the offset from the start */
+ rtav->track()->set_record_enable(new_state, this);
+ }
+}
- RegionView* rv;
- if (!rs.empty()) {
- rv = rs.front();
- } else if (entered_regionview) {
- rv = entered_regionview;
- } else {
+void
+Editor::set_fade_length (bool in)
+{
+ RegionSelection rs;
+
+ get_regions_for_action (rs, true);
+
+ if (rs.empty()) {
return;
}
+ /* we need a region to measure the offset from the start */
+
+ RegionView* rv = rs.front ();
+
nframes64_t pos = get_preferred_edit_position();
nframes64_t len;
char* cmd;
-
+
if (pos > rv->region()->last_frame() || pos < rv->region()->first_frame()) {
/* edit point is outside the relevant region */
return;
tmp->audio_region()->set_fade_out_length (len);
tmp->audio_region()->set_fade_out_active (true);
}
-
+
XMLNode &after = alist->get_state();
session->add_command(new MementoCommand<AutomationList>(*alist, &before, &after));
}
void
Editor::toggle_fade_active (bool in)
{
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
AudioRegionView* tmp = dynamic_cast<AudioRegionView*> (*x);
-
+
if (!tmp) {
return;
}
boost::shared_ptr<AudioRegion> region (tmp->audio_region());
/* make the behaviour consistent across all regions */
-
+
if (!have_switch) {
if (in) {
yn = region->fade_in_active();
void
Editor::set_fade_in_shape (AudioRegion::FadeShape shape)
{
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
XMLNode &before = alist->get_state();
tmp->audio_region()->set_fade_in_shape (shape);
-
+
XMLNode &after = alist->get_state();
session->add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &after));
}
commit_reversible_command ();
-
+
}
void
Editor::set_fade_out_shape (AudioRegion::FadeShape shape)
{
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
XMLNode &before = alist->get_state();
tmp->audio_region()->set_fade_out_shape (shape);
-
+
XMLNode &after = alist->get_state();
session->add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &after));
}
void
Editor::set_fade_in_active (bool yn)
{
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
XMLNode &before = ar->get_state();
ar->set_fade_in_active (yn);
-
+
XMLNode &after = ar->get_state();
session->add_command(new MementoCommand<AudioRegion>(*ar, &before, &after));
}
void
Editor::set_fade_out_active (bool yn)
{
- RegionSelection rs;
+ RegionSelection rs;
+
+ get_regions_for_action (rs);
+
+ if (rs.empty()) {
+ return;
+ }
+
+ begin_reversible_command (_("set fade out active"));
+
+ for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
+ AudioRegionView* tmp = dynamic_cast<AudioRegionView*> (*x);
+
+ if (!tmp) {
+ return;
+ }
+
+ boost::shared_ptr<AudioRegion> ar (tmp->audio_region());
+
+ XMLNode &before = ar->get_state();
+
+ ar->set_fade_out_active (yn);
+
+ XMLNode &after = ar->get_state();
+ session->add_command(new MementoCommand<AudioRegion>(*ar, &before, &after));
+ }
+
+ commit_reversible_command ();
+}
+
+void
+Editor::toggle_selected_region_fades (int dir)
+{
+ RegionSelection rs;
+ RegionSelection::iterator i;
+ boost::shared_ptr<AudioRegion> ar;
+ bool yn;
get_regions_for_action (rs);
return;
}
- begin_reversible_command (_("set fade out active"));
+ for (i = rs.begin(); i != rs.end(); ++i) {
+ if ((ar = boost::dynamic_pointer_cast<AudioRegion>((*i)->region())) != 0) {
+ if (dir == -1) {
+ yn = ar->fade_out_active ();
+ } else {
+ yn = ar->fade_in_active ();
+ }
+ break;
+ }
+ }
- for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
- AudioRegionView* tmp = dynamic_cast<AudioRegionView*> (*x);
+ if (i == rs.end()) {
+ return;
+ }
- if (!tmp) {
- return;
+ /* XXX should this undo-able? */
+
+ for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+ if ((ar = boost::dynamic_pointer_cast<AudioRegion>((*i)->region())) == 0) {
+ continue;
+ }
+ if (dir == 1 || dir == 0) {
+ ar->set_fade_in_active (!yn);
}
- boost::shared_ptr<AudioRegion> ar (tmp->audio_region());
+ if (dir == -1 || dir == 0) {
+ ar->set_fade_out_active (!yn);
+ }
+ }
+}
- XMLNode &before = ar->get_state();
- ar->set_fade_out_active (yn);
-
- XMLNode &after = ar->get_state();
- session->add_command(new MementoCommand<AudioRegion>(*ar, &before, &after));
- }
+/** Update region fade visibility after its configuration has been changed */
+void
+Editor::update_region_fade_visibility ()
+{
+ bool _fade_visibility = session->config.get_show_region_fades ();
- commit_reversible_command ();
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ AudioTimeAxisView* v = dynamic_cast<AudioTimeAxisView*>(*i);
+ if (v) {
+ if (_fade_visibility) {
+ v->audio_view()->show_all_fades ();
+ } else {
+ v->audio_view()->hide_all_fades ();
+ }
+ }
+ }
}
-
/** Update crossfade visibility after its configuration has been changed */
void
Editor::update_xfade_visibility ()
{
- _xfade_visibility = Config->get_xfades_visible ();
-
+ _xfade_visibility = session->config.get_xfades_visible ();
+
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
AudioTimeAxisView* v = dynamic_cast<AudioTimeAxisView*>(*i);
if (v) {
if (!mouse_frame (where, ignored)) {
return;
}
-
+
snap_to (where);
if (selection->markers.empty()) {
-
+
mouse_add_new_marker (where);
} else {
if (!mouse_frame (where, ignored)) {
return;
}
-
+
snap_to (where);
-
+
if (session) {
session->request_locate (where, session->transport_rolling());
}
void
Editor::split ()
{
- RegionSelection rs;
-
- get_regions_for_action (rs);
+ RegionSelection rs;
+
+ get_regions_for_action (rs, true);
nframes64_t where = get_preferred_edit_position();
}
}
-void
-Editor::trim_region_front ()
-{
- trim_region (true);
-}
-
-void
-Editor::trim_region_back ()
-{
- trim_region (false);
-}
-
-void
-Editor::trim_region (bool front)
-{
- nframes64_t where = get_preferred_edit_position();
- RegionSelection rs;
-
- get_regions_for_action (rs);
-
- if (rs.empty()) {
- return;
- }
-
- begin_reversible_command (front ? _("trim front") : _("trim back"));
-
- for (list<RegionView*>::const_iterator i = rs.by_layer().begin(); i != rs.by_layer().end(); ++i) {
- if (!(*i)->region()->locked()) {
- boost::shared_ptr<Playlist> pl = (*i)->region()->playlist();
- XMLNode &before = pl->get_state();
- if (front) {
- (*i)->region()->trim_front (where, this);
- } else {
- (*i)->region()->trim_end (where, this);
- }
- XMLNode &after = pl->get_state();
- session->add_command(new MementoCommand<Playlist>(*pl.get(), &before, &after));
- }
- }
-
- commit_reversible_command ();
-}
-
struct EditorOrderRouteSorter {
bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
/* use of ">" forces the correct sort order */
TimeAxisView* current = selection->tracks.front();
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
- if (*i == current) {
- ++i;
- if (i != track_views.end()) {
- selection->set (*i);
- } else {
- selection->set (*(track_views.begin()));
+ RouteUI *rui;
+ do {
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ if (*i == current) {
+ ++i;
+ if (i != track_views.end()) {
+ current = (*i);
+ } else {
+ current = (*(track_views.begin()));
+ //selection->set (*(track_views.begin()));
+ }
+ break;
}
- break;
}
- }
+ rui = dynamic_cast<RouteUI *>(current);
+ } while ( current->hidden() || (rui != NULL && !rui->route()->active()));
+
+ selection->set(current);
+
+ ensure_track_visible(current);
}
void
TimeAxisView* current = selection->tracks.front();
- for (TrackViewList::reverse_iterator i = track_views.rbegin(); i != track_views.rend(); ++i) {
- if (*i == current) {
- ++i;
- if (i != track_views.rend()) {
- selection->set (*i);
- } else {
- selection->set (*(track_views.rbegin()));
+ RouteUI *rui;
+ do {
+ for (TrackViewList::reverse_iterator i = track_views.rbegin(); i != track_views.rend(); ++i) {
+ if (*i == current) {
+ ++i;
+ if (i != track_views.rend()) {
+ current = (*i);
+ } else {
+ current = *(track_views.rbegin());
+ }
+ break;
}
- break;
}
+ rui = dynamic_cast<RouteUI *>(current);
+ } while ( current->hidden() || (rui != NULL && !rui->route()->active()));
+
+ selection->set (current);
+
+ ensure_track_visible(current);
+}
+
+void
+Editor::ensure_track_visible(TimeAxisView *track)
+{
+ if (track->hidden())
+ return;
+
+ double const current_view_min_y = vertical_adjustment.get_value();
+ double const current_view_max_y = vertical_adjustment.get_value() + vertical_adjustment.get_page_size() - canvas_timebars_vsize;
+
+ double const track_min_y = track->y_position ();
+ double const track_max_y = track->y_position () + track->effective_height ();
+
+ if (track_min_y >= current_view_min_y &&
+ track_max_y <= current_view_max_y) {
+ return;
}
+
+ double new_value;
+
+ if (track_min_y < current_view_min_y) {
+ // Track is above the current view
+ new_value = track_min_y;
+ } else {
+ // Track is below the current view
+ new_value = track->y_position () + track->effective_height() + canvas_timebars_vsize - vertical_adjustment.get_page_size();
+ }
+
+ vertical_adjustment.set_value(new_value);
}
void
nframes64_t start = selection->time[clicked_selection].start;
nframes64_t end = selection->time[clicked_selection].end;
-
+
set_loop_range (start, end, _("set loop range from selection"));
if (play) {
nframes64_t start;
nframes64_t end;
-
+
if (!get_edit_op_range (start, end)) {
return;
}
nframes64_t start = max_frames;
nframes64_t end = 0;
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
nframes64_t start = selection->time[clicked_selection].start;
nframes64_t end = selection->time[clicked_selection].end;
-
+
set_punch_range (start, end, _("set punch range from selection"));
}
nframes64_t start;
nframes64_t end;
-
+
if (!get_edit_op_range (start, end)) {
return;
}
nframes64_t start = max_frames;
nframes64_t end = 0;
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
void
Editor::pitch_shift_regions ()
{
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
-
+
if (rs.empty()) {
return;
}
pitch_shift (rs, 1.2);
}
-
+
void
Editor::use_region_as_bar ()
{
return;
}
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
Editor::define_one_bar (nframes64_t start, nframes64_t end)
{
nframes64_t length = end - start;
-
+
const Meter& m (session->tempo_map().meter_at (start));
/* length = 1 bar */
*/
double frames_per_beat = length / m.beats_per_bar();
-
+
/* beats per minute = */
double beats_per_minute = (session->frame_rate() * 60.0) / frames_per_beat;
/* now decide whether to:
- (a) set global tempo
+ (a) set global tempo
(b) add a new tempo marker
*/
bool do_global = false;
if ((session->tempo_map().n_tempos() == 1) && (session->tempo_map().n_meters() == 1)) {
-
+
/* only 1 tempo & 1 meter: ask if the user wants to set the tempo
at the start, or create a new marker
*/
/* more than 1 tempo and/or meter section already, go ahead do the "usual":
if the marker is at the region starter, change it, otherwise add
- a new tempo marker
+ a new tempo marker
*/
}
return;
}
- RegionSelection rs;
+ RegionSelection rs;
get_regions_for_action (rs);
++tmp;
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> ((*i)->region());
-
+
if (ar && (ar->get_transients (positions) == 0)) {
split_region_at_points ((*i)->region(), positions, true);
positions.clear ();
}
-
+
i = tmp;
}
bool use_rhythmic_rodent = false;
boost::shared_ptr<Playlist> pl = r->playlist();
-
+
if (!pl) {
return;
}
-
+
if (positions.empty()) {
return;
}
return;
}
}
-
+
if (use_rhythmic_rodent) {
show_rhythm_ferret ();
return;
}
- AnalysisFeatureList::const_iterator x;
-
+ AnalysisFeatureList::const_iterator x;
+
nframes64_t pos = r->position();
XMLNode& before (pl->get_state());
-
+
x = positions.begin();
-
+
while (x != positions.end()) {
if ((*x) > pos) {
break;
}
++x;
}
-
+
if (x == positions.end()) {
return;
}
-
+
pl->freeze ();
pl->remove_region (r);
-
+
while (x != positions.end()) {
-
- /* file start = original start + how far we from the initial position ?
+
+ /* file start = original start + how far we from the initial position ?
*/
-
+
nframes64_t file_start = r->start() + (pos - r->position());
/* length = next position - current position
*/
-
+
nframes64_t len = (*x) - pos;
/* XXX we do we really want to allow even single-sample regions?
if (len <= 0) {
break;
}
-
+
string new_name;
-
+
if (session->region_name (new_name, r->name())) {
break;
}
-
+
/* do NOT announce new regions 1 by one, just wait till they are all done */
boost::shared_ptr<Region> nr = RegionFactory::create (r->sources(), file_start, len, new_name, 0, Region::DefaultFlags, false);
if (*x > r->last_frame()) {
/* add final fragment */
-
+
file_start = r->start() + (pos - r->position());
len = r->last_frame() - pos;
break;
}
- }
+ }
pl->thaw ();
XMLNode& after (pl->get_state());
-
+
session->add_command (new MementoCommand<Playlist>(*pl, &before, &after));
}
boost::shared_ptr<Playlist> pl = rtv->get_diskstream()->playlist ();
if (pl) {
nframes64_t result = pl->find_next_transient (pos, forward ? 1 : -1);
-
+
if (result >= 0) {
positions.push_back (result);
}
}
} else {
-
- RegionSelection rs;
+
+ RegionSelection rs;
get_regions_for_action (rs);
-
+
if (rs.empty()) {
return;
}
-
+
for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
(*r)->region()->get_transients (positions);
}
{
TrackSelection& ts (selection->tracks);
- if (ts.empty()) {
- return;
- }
-
for (TrackSelection::iterator x = ts.begin(); x != ts.end(); ++x) {
(*x)->set_height (h);
}
}
-void
-Editor::set_track_height_largest ()
-{
- set_track_height (TimeAxisView::hLargest);
-}
-void
-Editor::set_track_height_large ()
-{
- set_track_height (TimeAxisView::hLarge);
-}
-void
-Editor::set_track_height_larger ()
-{
- set_track_height (TimeAxisView::hLarger);
-}
-void
-Editor::set_track_height_normal ()
-{
- set_track_height (TimeAxisView::hNormal);
-}
-void
-Editor::set_track_height_smaller ()
-{
- set_track_height (TimeAxisView::hSmaller);
-}
-void
-Editor::set_track_height_small ()
-{
- set_track_height (TimeAxisView::hSmall);
-}
-
void
Editor::toggle_tracks_active ()
{
}
routes.push_back (rtv->_route);
}
-
+
if (ntracks + nbusses == 0) {
return;
}
}
}
-void
-Editor::set_waveform_scale (WaveformScale ws)
-{
- TrackSelection& ts (selection->tracks);
-
- if (ts.empty()) {
- return;
- }
-
- for (TrackSelection::iterator x = ts.begin(); x != ts.end(); ++x) {
- AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (*x);
- if (atv) {
- atv->set_waveform_scale (ws);
- }
- }
-}
-
void
Editor::do_insert_time ()
{
return;
}
- nframes64_t pos = get_preferred_edit_position ();
ArdourDialog d (*this, _("Insert Time"));
- VButtonBox button_box;
- VBox option_box;
- RadioButtonGroup group;
- RadioButton leave_button (group, _("Stay in position"));
- RadioButton move_button (group, _("Move"));
- RadioButton split_button (group, _("Split & Later Section Moves"));
- Label intersect_option_label (_("Intersected regions should:"));
- CheckButton glue_button (_("Move Glued Regions"));
- CheckButton marker_button (_("Move Markers"));
- AudioClock clock ("insertTimeClock", true, X_("InsertTimeClock"), true, true, true);
- HBox clock_box;
- clock.set (0);
- clock.set_session (session);
- clock.set_bbt_reference (pos);
+ nframes64_t const pos = get_preferred_edit_position ();
- clock_box.pack_start (clock, false, true);
+ d.get_vbox()->set_border_width (12);
+ d.get_vbox()->set_spacing (4);
- option_box.set_spacing (6);
- option_box.pack_start (intersect_option_label, false, false);
- option_box.pack_start (button_box, false, false);
- option_box.pack_start (glue_button, false, false);
- option_box.pack_start (marker_button, false, false);
+ Table table (2, 2);
+ table.set_spacings (4);
- button_box.pack_start (leave_button, false, false);
- button_box.pack_start (move_button, false, false);
- button_box.pack_start (split_button, false, false);
-
- d.get_vbox()->set_border_width (12);
- d.get_vbox()->pack_start (clock_box, false, false);
- d.get_vbox()->pack_start (option_box, false, false);
-
- leave_button.show ();
- move_button.show ();
- split_button.show ();
- intersect_option_label.show ();
- option_box.show ();
- button_box.show ();
- glue_button.show ();
- clock.show_all();
- clock_box.show ();
- marker_button.show ();
+ Label time_label (_("Time to insert:"));
+ time_label.set_alignment (1, 0.5);
+ table.attach (time_label, 0, 1, 0, 1, FILL | EXPAND);
+ AudioClock clock ("insertTimeClock", true, X_("InsertTimeClock"), true, true, true);
+ clock.set (0);
+ clock.set_session (session);
+ clock.set_bbt_reference (pos);
+ table.attach (clock, 1, 2, 0, 1);
+
+ Label intersected_label (_("Intersected regions should:"));
+ intersected_label.set_alignment (1, 0.5);
+ table.attach (intersected_label, 0, 1, 1, 2, FILL | EXPAND);
+ ComboBoxText intersected_combo;
+ intersected_combo.append_text (_("stay in position"));
+ intersected_combo.append_text (_("move"));
+ intersected_combo.append_text (_("be split"));
+ intersected_combo.set_active (0);
+ table.attach (intersected_combo, 1, 2, 1, 2);
+
+ d.get_vbox()->pack_start (table);
+
+ CheckButton move_glued (_("Move glued regions"));
+ d.get_vbox()->pack_start (move_glued);
+ CheckButton move_markers (_("Move markers"));
+ d.get_vbox()->pack_start (move_markers);
+ CheckButton move_tempos (_("Move tempo and meter changes"));
+ d.get_vbox()->pack_start (move_tempos);
d.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
- d.add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
- d.show ();
+ d.add_button (_("Insert time"), Gtk::RESPONSE_OK);
+ d.show_all ();
int response = d.run ();
if (response != RESPONSE_OK) {
return;
}
-
+
nframes64_t distance = clock.current_duration (pos);
if (distance == 0) {
InsertTimeOption opt;
- if (leave_button.get_active()) {
+ switch (intersected_combo.get_active_row_number ()) {
+ case 0:
opt = LeaveIntersected;
- } else if (move_button.get_active()) {
+ break;
+ case 1:
opt = MoveIntersected;
- } else {
+ break;
+ case 2:
opt = SplitIntersected;
+ break;
}
- insert_time (pos, distance, opt, glue_button.get_active(), marker_button.get_active());
+ insert_time (pos, distance, opt, move_glued.get_active(), move_markers.get_active(), move_tempos.get_active());
}
void
-Editor::insert_time (nframes64_t pos, nframes64_t frames, InsertTimeOption opt,
- bool ignore_music_glue, bool markers_too)
+Editor::insert_time (nframes64_t pos, nframes64_t frames, InsertTimeOption opt,
+ bool ignore_music_glue, bool markers_too, bool tempo_too)
{
bool commit = false;
begin_reversible_command (_("insert time"));
for (TrackSelection::iterator x = selection->tracks.begin(); x != selection->tracks.end(); ++x) {
+ /* regions */
boost::shared_ptr<Playlist> pl = (*x)->playlist();
-
- if (!pl) {
- continue;
- }
- XMLNode &before = pl->get_state();
+ if (pl) {
- if (opt == SplitIntersected) {
- pl->split (pos);
- }
-
- pl->shift (pos, frames, (opt == MoveIntersected), ignore_music_glue);
+ XMLNode &before = pl->get_state();
- XMLNode &after = pl->get_state();
+ if (opt == SplitIntersected) {
+ pl->split (pos);
+ }
+
+ pl->shift (pos, frames, (opt == MoveIntersected), ignore_music_glue);
+
+ XMLNode &after = pl->get_state();
- session->add_command (new MementoCommand<Playlist> (*pl, &before, &after));
- commit = true;
+ session->add_command (new MementoCommand<Playlist> (*pl, &before, &after));
+ commit = true;
+ }
+
+ /* automation */
+ RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*x);
+ if (rtav) {
+ rtav->route ()->shift (pos, frames);
+ commit = true;
+ }
}
+ /* markers */
if (markers_too) {
bool moved = false;
XMLNode& before (session->locations()->get_state());
Locations::LocationList copy (session->locations()->list());
for (Locations::LocationList::iterator i = copy.begin(); i != copy.end(); ++i) {
-
+
Locations::LocationList::const_iterator tmp;
if ((*i)->start() >= pos) {
}
}
+ if (tempo_too) {
+ session->tempo_map().insert_time (pos, frames);
+ }
+
if (commit) {
commit_reversible_command ();
}
}
void
-Editor::fit_tracks ()
+Editor::fit_selected_tracks ()
{
- if (selection->tracks.empty()) {
+ fit_tracks (selection->tracks);
+}
+
+void
+Editor::fit_tracks (TrackSelection & tracks)
+{
+ if (tracks.empty()) {
return;
}
uint32_t child_heights = 0;
- for (TrackSelection::iterator t = selection->tracks.begin(); t != selection->tracks.end(); ++t) {
+ for (TrackSelection::iterator t = tracks.begin(); t != tracks.end(); ++t) {
if (!(*t)->marked_for_display()) {
continue;
}
- child_heights += ((*t)->effective_height - (*t)->current_height());
+ child_heights += (*t)->effective_height() - (*t)->current_height();
}
- uint32_t h = (uint32_t) floor ((canvas_height - child_heights)/selection->tracks.size());
+ uint32_t h = (uint32_t) floor ((_canvas_height - child_heights - canvas_timebars_vsize) / tracks.size());
double first_y_pos = DBL_MAX;
+ if (h < TimeAxisView::hSmall) {
+ MessageDialog msg (*this, _("There are too many tracks to fit in the current window"));
+ /* too small to be displayed */
+ return;
+ }
+
undo_visual_stack.push_back (current_visual_state());
-
- for (TrackSelection::iterator t = selection->tracks.begin(); t != selection->tracks.end(); ++t) {
- (*t)->set_height (h);
- first_y_pos = std::min ((*t)->y_position, first_y_pos);
+
+ /* operate on all tracks, hide unselected ones that are in the middle of selected ones */
+
+ bool prev_was_selected = false;
+ bool is_selected = tracks.contains (track_views.front());
+ bool next_is_selected;
+
+ for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) {
+
+ TrackViewList::iterator next;
+
+ next = t;
+ ++next;
+
+ if (next != track_views.end()) {
+ next_is_selected = tracks.contains (*next);
+ } else {
+ next_is_selected = false;
+ }
+
+ if (is_selected) {
+ (*t)->set_height (h);
+ first_y_pos = std::min ((*t)->y_position (), first_y_pos);
+ } else {
+ if (prev_was_selected && next_is_selected) {
+ hide_track_in_display (**t);
+ }
+ }
+
+ prev_was_selected = is_selected;
+ is_selected = next_is_selected;
}
+ /*
+ set the controls_layout height now, because waiting for its size
+ request signal handler will cause the vertical adjustment setting to fail
+ */
+
+ controls_layout.property_height () = full_canvas_height - canvas_timebars_vsize;
vertical_adjustment.set_value (first_y_pos);
redo_visual_stack.push_back (current_visual_state());
visual_states.push_back (0);
}
- if (visual_states[n] != 0) {
- delete visual_states[n];
- }
+ delete visual_states[n];
visual_states[n] = current_visual_state (true);
gdk_beep ();
void
Editor::start_visual_state_op (uint32_t n)
{
- cerr << "Start\n";
if (visual_state_op_connection.empty()) {
- cerr << "\tqueue\n";
visual_state_op_connection = Glib::signal_timeout().connect (bind (mem_fun (*this, &Editor::end_visual_state_op), n), 1000);
}
}
void
Editor::cancel_visual_state_op (uint32_t n)
{
- cerr << "Cancel\n";
if (!visual_state_op_connection.empty()) {
- cerr << "\tgoto\n";
visual_state_op_connection.disconnect();
goto_visual_state (n);
- }
+ } else {
+ //we land here if called from the menu OR if end_visual_state_op has been called
+ //so check if we are already in visual state n
+ // XXX not yet checking it at all, but redoing does not hurt
+ goto_visual_state (n);
+ }
}
bool
{
visual_state_op_connection.disconnect();
save_visual_state (n);
-
+
PopUp* pup = new PopUp (WIN_POS_MOUSE, 1000, true);
char buf[32];
snprintf (buf, sizeof (buf), _("Saved view %u"), n+1);
return false; // do not call again
}
+