gui->draw_overlays(1);
}
-void MWindow::select_edits()
+void MWindow::select_edits(int v)
{
double start = edl->local_session->get_selectionstart();
double end = edl->local_session->get_selectionend();
- edl->tracks->select_edits(start, end);
+ edl->tracks->select_edits(start, end, v);
gui->draw_overlays(1);
}
ArrayList<SharedLocation> shared_locations;
PluginSet *pluginset = session->pluginset_highlighted;
- int gang = edl->session->gang_tracks != GANG_NONE ? 1 : 0;
+ int gang = edl->local_session->gang_tracks != GANG_NONE ? 1 : 0;
int data_type = dest_track->data_type;
int first_track = 1;
SharedLocation shared_location_local;
shared_location_local.copy_from(shared_location);
int first_track = 1;
- double start_pos = edl->local_session->get_selectionstart(1);
- double end_pos = edl->local_session->get_selectionend(1);
+ double start_pos = edl->local_session->get_selectionstart();
+ double end_pos = edl->local_session->get_selectionend();
for( ; current; current=NEXT ) {
if( current->data_type != data_type ) continue;
if( !current->is_armed() ) continue;
sync_parameters(CHANGE_EDL);
}
-void MWindow::move_track_down(Track *track)
+void MWindow::roll_track_down(Track *track)
{
undo_before();
- edl->tracks->move_track_down(track);
+ edl->tracks->roll_track_down(track);
save_backup();
undo_after(_("move track down"), LOAD_ALL);
save_backup();
}
-void MWindow::move_tracks_down()
+void MWindow::roll_tracks_down()
{
undo_before();
- edl->tracks->move_tracks_down();
+ edl->tracks->roll_tracks_down();
save_backup();
undo_after(_("move tracks down"), LOAD_ALL);
save_backup();
}
-void MWindow::move_track_up(Track *track)
+void MWindow::roll_track_up(Track *track)
{
undo_before();
- edl->tracks->move_track_up(track);
+ edl->tracks->roll_track_up(track);
save_backup();
undo_after(_("move track up"), LOAD_ALL);
restart_brender();
save_backup();
}
-void MWindow::move_tracks_up()
+void MWindow::roll_tracks_up()
{
undo_before();
- edl->tracks->move_tracks_up();
+ edl->tracks->roll_tracks_up();
save_backup();
undo_after(_("move tracks up"), LOAD_ALL);
restart_brender();
}
-void MWindow::swap_track_down(Track *track)
+void MWindow::move_track_down(Track *track)
{
undo_before();
- edl->tracks->swap_track_down(track);
+ edl->tracks->move_track_down(track);
save_backup();
undo_after(_("swap track down"), LOAD_ALL);
save_backup();
}
-void MWindow::swap_tracks_down()
+void MWindow::move_tracks_down()
{
undo_before();
- edl->tracks->swap_tracks_down();
+ edl->tracks->move_tracks_down();
save_backup();
undo_after(_("swap tracks down"), LOAD_ALL);
save_backup();
}
-void MWindow::swap_track_up(Track *track)
+void MWindow::move_track_up(Track *track)
{
undo_before();
- edl->tracks->swap_track_up(track);
+ edl->tracks->move_track_up(track);
save_backup();
undo_after(_("swap track up"), LOAD_ALL);
restart_brender();
save_backup();
}
-void MWindow::swap_tracks_up()
+void MWindow::move_tracks_up()
{
undo_before();
- edl->tracks->swap_tracks_up();
+ edl->tracks->move_tracks_up();
save_backup();
undo_after(_("swap tracks up"), LOAD_ALL);
restart_brender();
for( ; track && !track->master; track=track->next )
mixer_last = track;
Track *next_track = track;
+ if( !master_track->armed ) {
+ master_track = next_track;
+ continue;
+ }
Mixer *master_mixer = 0;
for( int i=0, n=edl->mixers.size(); i<n; ++i ) {
if( master_track->index_in(edl->mixers[i]) >= 0 ) {