void MWindow::add_audio_track_entry(int above, Track *dst)
{
- undo->update_undo_before();
+ undo_before();
add_audio_track(above, dst);
save_backup();
- undo->update_undo_after(_("add track"), LOAD_ALL);
+ undo_after(_("add track"), LOAD_ALL);
restart_brender();
gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
void MWindow::add_video_track_entry(Track *dst)
{
- undo->update_undo_before();
+ undo_before();
add_video_track(1, dst);
- undo->update_undo_after(_("add track"), LOAD_ALL);
+ undo_after(_("add track"), LOAD_ALL);
restart_brender();
void MWindow::add_subttl_track_entry(Track *dst)
{
- undo->update_undo_before();
+ undo_before();
add_subttl_track(1, dst);
- undo->update_undo_after(_("add track"), LOAD_ALL);
+ undo_after(_("add track"), LOAD_ALL);
restart_brender();
{
int w, h;
- undo->update_undo_before();
+ undo_before();
// Get w and h
w = indexable->get_w();
save_backup();
- undo->update_undo_after(_("asset to all"), LOAD_ALL);
+ undo_after(_("asset to all"), LOAD_ALL);
restart_brender();
gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0);
sync_parameters(CHANGE_ALL);
if( indexable->have_video() ) {
int w, h;
- undo->update_undo_before();
+ undo_before();
// Get w and h
w = indexable->get_w();
save_backup();
- undo->update_undo_after(_("asset to size"), LOAD_ALL);
+ undo_after(_("asset to size"), LOAD_ALL);
restart_brender();
sync_parameters(CHANGE_ALL);
}
session->drag_assets->get(0)->have_video() ) {
double new_framerate = session->drag_assets->get(0)->get_frame_rate();
double old_framerate = edl->session->frame_rate;
- undo->update_undo_before();
+ undo_before();
edl->session->frame_rate = new_framerate;
edl->resample(old_framerate, new_framerate, TRACK_VIDEO);
save_backup();
- undo->update_undo_after(_("asset to rate"), LOAD_ALL);
+ undo_after(_("asset to rate"), LOAD_ALL);
restart_brender();
gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0);
sync_parameters(CHANGE_ALL);
void MWindow::clear_entry()
{
- undo->update_undo_before();
+ undo_before();
clear(1);
edl->optimize();
save_backup();
- undo->update_undo_after(_("clear"), LOAD_EDITS | LOAD_TIMEBAR);
+ undo_after(_("clear"), LOAD_EDITS | LOAD_TIMEBAR);
restart_brender();
update_plugin_guis();
void MWindow::set_automation_mode(int mode)
{
- undo->update_undo_before();
+ undo_before();
speed_before();
edl->tracks->set_automation_mode(
edl->local_session->get_selectionstart(),
save_backup();
char string[BCSTRLEN];
sprintf(string,"set %s", FloatAuto::curve_name(mode));
- undo->update_undo_after(string,
+ undo_after(string,
!changed_edl ? LOAD_AUTOMATION :
LOAD_AUTOMATION + LOAD_EDITS + LOAD_TIMEBAR);
update_gui(changed_edl);
void MWindow::clear_automation()
{
- undo->update_undo_before();
+ undo_before();
speed_before();
edl->tracks->clear_automation(edl->local_session->get_selectionstart(),
edl->local_session->get_selectionend());
int changed_edl = speed_after(1);
save_backup();
- undo->update_undo_after(_("clear keyframes"),
+ undo_after(_("clear keyframes"),
!changed_edl ? LOAD_AUTOMATION :
LOAD_AUTOMATION + LOAD_EDITS + LOAD_TIMEBAR);
update_gui(changed_edl);
int MWindow::clear_default_keyframe()
{
- undo->update_undo_before();
+ undo_before();
speed_before();
edl->tracks->clear_default_keyframe();
int changed_edl = speed_after(1);
save_backup();
- undo->update_undo_after(_("clear default keyframe"),
+ undo_after(_("clear default keyframe"),
!changed_edl ? LOAD_AUTOMATION :
LOAD_AUTOMATION + LOAD_EDITS + LOAD_TIMEBAR);
update_gui(changed_edl);
void MWindow::clear_labels()
{
- undo->update_undo_before();
+ undo_before();
clear_labels(edl->local_session->get_selectionstart(),
edl->local_session->get_selectionend());
- undo->update_undo_after(_("clear labels"), LOAD_TIMEBAR);
+ undo_after(_("clear labels"), LOAD_TIMEBAR);
gui->update_timebar(1);
cwindow->update(0, 0, 0, 0, 1);
void MWindow::concatenate_tracks()
{
- undo->update_undo_before();
+ undo_before();
edl->tracks->concatenate_tracks(edl->session->plugins_follow_edits,
edl->session->autos_follow_edits);
save_backup();
- undo->update_undo_after(_("concatenate tracks"), LOAD_EDITS);
+ undo_after(_("concatenate tracks"), LOAD_EDITS);
restart_brender();
gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
void MWindow::crop_video()
{
- undo->update_undo_before();
+ undo_before();
// Clamp EDL crop region
if( edl->session->crop_x1 > edl->session->crop_x2 ) {
edl->session->crop_x1 ^= edl->session->crop_x2;
edl->session->output_h);
}
- undo->update_undo_after(_("crop"), LOAD_ALL);
+ undo_after(_("crop"), LOAD_ALL);
restart_brender();
cwindow->refresh_frame(CHANGE_ALL);
void MWindow::blade(double position)
{
- undo->update_undo_before();
+ undo_before();
edl->blade(position);
edl->optimize();
save_backup();
- undo->update_undo_after(_("blade"), LOAD_EDITS | LOAD_TIMEBAR);
+ undo_after(_("blade"), LOAD_EDITS | LOAD_TIMEBAR);
restart_brender();
update_plugin_guis();
gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0);
void MWindow::cut(double start, double end, double new_position)
{
- undo->update_undo_before();
+ undo_before();
copy(start, end);
edl->clear(start, end,
edl->session->labels_follow_edits,
edl->optimize();
save_backup();
- undo->update_undo_after(_("split | cut"), LOAD_EDITS | LOAD_TIMEBAR);
+ undo_after(_("split | cut"), LOAD_EDITS | LOAD_TIMEBAR);
if( new_position >= 0 ) {
edl->local_session->set_selectionstart(new_position);
edl->local_session->set_selectionend(new_position);
int MWindow::cut_automation()
{
- undo->update_undo_before();
+ undo_before();
speed_before();
copy_automation();
edl->tracks->clear_automation(edl->local_session->get_selectionstart(),
edl->local_session->get_selectionend());
int changed_edl = speed_after(1);
save_backup();
- undo->update_undo_after(_("cut keyframes"),
+ undo_after(_("cut keyframes"),
!changed_edl ? LOAD_AUTOMATION :
LOAD_AUTOMATION + LOAD_EDITS + LOAD_TIMEBAR);
update_gui(changed_edl);
int MWindow::cut_default_keyframe()
{
- undo->update_undo_before();
+ undo_before();
speed_before();
copy_default_keyframe();
edl->tracks->clear_default_keyframe();
int changed_edl = speed_after(1);
save_backup();
- undo->update_undo_after(_("cut default keyframe"),
+ undo_after(_("cut default keyframe"),
!changed_edl ? LOAD_AUTOMATION :
LOAD_AUTOMATION + LOAD_EDITS + LOAD_TIMEBAR);
update_gui(changed_edl);
void MWindow::delete_tracks()
{
- undo->update_undo_before();
+ undo_before();
edl->tracks->delete_tracks();
- undo->update_undo_after(_("delete tracks"), LOAD_ALL);
+ undo_after(_("delete tracks"), LOAD_ALL);
save_backup();
restart_brender();
void MWindow::delete_track(Track *track)
{
- undo->update_undo_before();
+ undo_before();
edl->tracks->delete_track(track);
- undo->update_undo_after(_("delete track"), LOAD_ALL);
+ undo_after(_("delete track"), LOAD_ALL);
restart_brender();
update_plugin_states();
Track *dest_track = session->track_highlighted;
if( !dest_track ) return;
- undo->update_undo_before();
+ undo_before();
for( int i=0; i<session->drag_pluginservers->total; ++i ) {
PluginServer *plugin = session->drag_pluginservers->values[i];
}
save_backup();
- undo->update_undo_after(_("insert effect"), LOAD_EDITS | LOAD_PATCHES);
+ undo_after(_("insert effect"), LOAD_EDITS | LOAD_PATCHES);
restart_brender();
sync_parameters(CHANGE_EDL);
// GUI updated in TrackCanvas, after current_operations are reset
{
if( !dest_track ) return;
- undo->update_undo_before();
+ undo_before();
double start = 0;
double length = dest_track->get_length();
}
save_backup();
- undo->update_undo_after(_("insert effect"), LOAD_EDITS | LOAD_PATCHES);
+ undo_after(_("insert effect"), LOAD_EDITS | LOAD_PATCHES);
restart_brender();
sync_parameters(CHANGE_EDL);
gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
int MWindow::modify_edithandles()
{
- undo->update_undo_before();
+ undo_before();
+ int handle_mode = edl->session->edit_handle_mode[session->drag_button];
edl->modify_edithandles(session->drag_start,
- session->drag_position,
- session->drag_handle,
- edl->session->edit_handle_mode[session->drag_button],
+ session->drag_position, session->drag_handle, handle_mode,
edl->session->labels_follow_edits,
edl->session->plugins_follow_edits,
- edl->session->autos_follow_edits);
-
+ edl->session->autos_follow_edits,
+ session->drag_edit->group_id);
finish_modify_handles();
//printf("MWindow::modify_handles 1\n");
return 0;
int MWindow::modify_pluginhandles()
{
- undo->update_undo_before();
+ undo_before();
edl->modify_pluginhandles(session->drag_start,
session->drag_position,
void MWindow::finish_modify_handles()
{
int edit_mode = edl->session->edit_handle_mode[session->drag_button];
-
- if( (session->drag_handle == 1 && edit_mode != MOVE_NO_EDITS) ||
- (session->drag_handle == 0 && edit_mode == MOVE_ONE_EDIT) ) {
-//printf("MWindow::finish_modify_handles %d\n", __LINE__);
- edl->local_session->set_selectionstart(session->drag_position);
- edl->local_session->set_selectionend(session->drag_position);
- }
- else
- if( edit_mode != MOVE_NO_EDITS ) {
-//printf("MWindow::finish_modify_handles %d\n", __LINE__);
- edl->local_session->set_selectionstart(session->drag_start);
- edl->local_session->set_selectionend(session->drag_start);
+ double position = -1;
+ switch( edit_mode ) {
+ case MOVE_RIPPLE:
+ case MOVE_ROLL:
+ case MOVE_SLIDE:
+ position = session->drag_position;
+ break;
+ case MOVE_SLIP:
+ case MOVE_EDGE:
+ position = session->drag_start;
+ break;
}
-
-// clamp the selection to 0
- if( edl->local_session->get_selectionstart(1) < 0 ) {
- edl->local_session->set_selectionstart(0);
- edl->local_session->set_selectionend(0);
+ if( position >= 0 ) {
+ edl->local_session->set_selectionstart(position);
+ edl->local_session->set_selectionend(position);
}
- undo->update_undo_after(_("drag handle"), LOAD_EDITS | LOAD_TIMEBAR);
+ undo_after(_("drag handle"), LOAD_EDITS | LOAD_TIMEBAR);
save_backup();
restart_brender();
void MWindow::match_output_size(Track *track)
{
- undo->update_undo_before();
+ undo_before();
track->track_w = edl->session->output_w;
track->track_h = edl->session->output_h;
save_backup();
- undo->update_undo_after(_("match output size"), LOAD_ALL);
+ undo_after(_("match output size"), LOAD_ALL);
restart_brender();
sync_parameters(CHANGE_EDL);
if( !new_track )
new_track = new_edl->add_new_track(track->data_type);
int64_t edit_pos = edit_start_pos - start_pos;
- if( !packed ) {
- if( edit_pos > startproject ) {
- Edit *silence = new Edit(new_edl, new_track);
- silence->startproject = startproject;
- silence->length = edit_pos - startproject;
- new_track->edits->append(silence);
- startproject = edit_pos;
- }
+ if( !packed && edit_pos > startproject ) {
+ Edit *silence = new Edit(new_edl, new_track);
+ silence->startproject = startproject;
+ silence->length = edit_pos - startproject;
+ new_track->edits->append(silence);
+ startproject = edit_pos;
}
int64_t clip_start_pos = startproject;
Edit *clip_edit = new Edit(new_edl, new_track);
plugin_end_pos = edit_end_pos;
if( plugin_start_pos >= plugin_end_pos ) continue;
int64_t plugin_pos = plugin_start_pos - start_pos;
- if( plugin_pos > startplugin ) {
+ if( !packed && plugin_pos > startplugin ) {
Plugin *silence = new Plugin(new_edl, new_track, "");
silence->startproject = startplugin;
silence->length = plugin_pos - startplugin;
KeyFrames *keyframes = plugin->keyframes;
KeyFrames *new_keyframes = new_plugin->keyframes;
new_keyframes->default_auto->copy_from(keyframes->default_auto);
- new_keyframes->default_auto->position = startplugin;
+ new_keyframes->default_auto->position = new_plugin->startproject;
KeyFrame *keyframe = (KeyFrame*)keyframes->first;
for( ; keyframe; keyframe=(KeyFrame*)keyframe->next ) {
if( keyframe->position < edit_start_pos ) continue;
if( keyframe->position >= edit_end_pos ) break;
KeyFrame *clip_keyframe = new KeyFrame(new_edl, new_keyframes);
clip_keyframe->copy_from(keyframe);
- int64_t clip_position = keyframe->position - start_pos;
- clip_keyframe->position = clip_position;
+ int64_t key_position = keyframe->position - start_pos;
+ if( packed )
+ key_position += new_plugin->startproject - plugin_pos;
+ clip_keyframe->position = key_position;
new_keyframes->append(clip_keyframe);
}
}
void MWindow::delete_edits(ArrayList<Edit*> *edits, const char *msg, int collapse)
{
if( !edits->size() ) return;
- undo->update_undo_before();
+ undo_before();
+ if( edl->session->labels_follow_edits )
+ edl->delete_edit_labels(edits, collapse);
edl->delete_edits(edits, collapse);
+ edl->optimize();
save_backup();
- undo->update_undo_after(msg, LOAD_EDITS);
+ undo_after(msg, LOAD_EDITS);
restart_brender();
cwindow->refresh_frame(CHANGE_EDL);
void MWindow::move_edits(ArrayList<Edit*> *edits,
- Track *track,
- double position,
- int behaviour)
+ Track *track, double position, int mode)
{
- undo->update_undo_before();
-
- edl->tracks->move_edits(edits,
- track,
- position,
+ undo_before();
+// lockout timebar labels update
+// labels can be deleted with tooltip repeater running
+ cwindow->gui->lock_window("Tracks::move_edits");
+ edl->tracks->move_edits(edits, track, position,
edl->session->labels_follow_edits,
edl->session->plugins_follow_edits,
- edl->session->autos_follow_edits,
- behaviour);
+ edl->session->autos_follow_edits, mode);
+ cwindow->gui->timebar->update(1);
+ cwindow->gui->unlock_window();
save_backup();
- undo->update_undo_after(_("move edit"), LOAD_ALL);
+ undo_after(_("move edit"), LOAD_ALL);
restart_brender();
cwindow->refresh_frame(CHANGE_EDL);
gui->update(1, NORMAL_DRAW, 1, 0, 0, 0, 0);
}
-void MWindow::move_group(EDL *group, Track *first_track, double position)
+void MWindow::paste_edits(EDL *clip, Track *first_track, double position, int overwrite,
+ int edit_edits, int edit_labels, int edit_autos, int edit_plugins)
{
- undo->update_undo_before();
- ArrayList<Edit *>edits;
- edl->tracks->get_selected_edits(&edits);
- edl->delete_edits(&edits, 0);
- Track *src = group->tracks->first;
+ if( !first_track )
+ first_track = edl->tracks->first;
+ Track *src = clip->tracks->first;
for( Track *track=first_track; track && src; track=track->next ) {
if( !track->record ) continue;
int64_t pos = track->to_units(position, 0);
- for( Edit *edit=src->edits->first; edit; edit=edit->next ) {
- if( edit->silence() ) continue;
- int64_t start = pos + edit->startproject;
- int64_t end = start + edit->length;
- track->edits->clear(start, end);
- Edit *dst = track->edits->insert_new_edit(start);
- dst->copy_from(edit);
- dst->startproject = start;
- dst->is_selected = 1;
- while( (dst=dst->next) != 0 )
- dst->startproject += edit->length;
+ if( edit_edits ) {
+ for( Edit *edit=src->edits->first; edit; edit=edit->next ) {
+ if( edit->silence() ) continue;
+ int64_t start = pos + edit->startproject;
+ int64_t len = edit->length, end = start + len;
+ if( overwrite )
+ track->edits->clear(start, end);
+ Edit *dst = track->edits->insert_new_edit(start);
+ dst->copy_from(edit);
+ dst->startproject = start;
+ dst->is_selected = 1;
+ while( (dst=dst->next) != 0 )
+ dst->startproject += edit->length;
+ if( overwrite ) continue;
+ if( edit_labels && track == first_track ) {
+ double dst_pos = track->from_units(start);
+ double dst_len = track->from_units(len);
+ for( Label *label=edl->labels->first; label; label=label->next ) {
+ if( label->position >= dst_pos )
+ label->position += dst_len;
+ }
+ }
+ if( edit_autos ) {
+ for( int i=0; i<AUTOMATION_TOTAL; ++i ) {
+ Autos *autos = track->automation->autos[i];
+ if( !autos ) continue;
+ for( Auto *aut0=autos->first; aut0; aut0=aut0->next ) {
+ if( aut0->position >= start )
+ aut0->position += edit->length;
+ }
+ }
+ }
+ if( edit_plugins ) {
+ for( int i=0; i<track->plugin_set.size(); ++i ) {
+ PluginSet *plugin_set = track->plugin_set[i];
+ Plugin *plugin = (Plugin *)plugin_set->first;
+ for( ; plugin; plugin=(Plugin *)plugin->next ) {
+ if( plugin->startproject >= start )
+ plugin->startproject += edit->length;
+ else if( plugin->startproject+plugin->length > end )
+ plugin->length += edit->length;
+ Auto *default_keyframe = plugin->keyframes->default_auto;
+ if( default_keyframe->position >= start )
+ default_keyframe->position += edit->length;
+ KeyFrame *keyframe = (KeyFrame*)plugin->keyframes->first;
+ for( ; keyframe; keyframe=(KeyFrame*)keyframe->next ) {
+ if( keyframe->position >= start )
+ keyframe->position += edit->length;
+ }
+ }
+ plugin_set->optimize();
+ }
+ }
+ }
}
- if( edl->session->autos_follow_edits ) {
+ if( edit_autos ) {
for( int i=0; i<AUTOMATION_TOTAL; ++i ) {
Autos *src_autos = src->automation->autos[i];
if( !src_autos ) continue;
Autos *autos = track->automation->autos[i];
for( Auto *aut0=src_autos->first; aut0; aut0=aut0->next ) {
- int64_t position = pos + aut0->position;
- autos->insert_auto(position, aut0);
+ int64_t auto_pos = pos + aut0->position;
+ autos->insert_auto(auto_pos, aut0);
}
}
}
- if( edl->session->plugins_follow_edits ) {
+ if( edit_plugins ) {
for( int i=0; i<src->plugin_set.size(); ++i ) {
PluginSet *plugin_set = src->plugin_set[i];
if( !plugin_set ) continue;
for( ; plugin; plugin=(Plugin *)plugin->next ) {
int64_t start = pos + plugin->startproject;
int64_t end = start + plugin->length;
- dst_plugin_set->clear(start, end, 1);
- Plugin *dst = dst_plugin_set->insert_plugin(
- plugin->title, start, end-start,
- plugin->plugin_type, &plugin->shared_location,
+ if( overwrite || edit_edits )
+ dst_plugin_set->clear(start, end, 1);
+ Plugin *new_plugin = dst_plugin_set->insert_plugin(plugin->title,
+ start, end-start, plugin->plugin_type, &plugin->shared_location,
(KeyFrame*)plugin->keyframes->default_auto, 0);
KeyFrame *keyframe = (KeyFrame*)plugin->keyframes->first;
for( ; keyframe; keyframe=(KeyFrame*)keyframe->next ) {
- int64_t position = pos + keyframe->position;
- dst->keyframes->insert_auto(position, keyframe);
+ int64_t keyframe_pos = pos + keyframe->position;
+ new_plugin->keyframes->insert_auto(keyframe_pos, keyframe);
+ }
+ while( (new_plugin=(Plugin *)new_plugin->next) ) {
+ KeyFrame *keyframe = (KeyFrame*)new_plugin->keyframes->first;
+ for( ; keyframe; keyframe=(KeyFrame*)keyframe->next )
+ keyframe->position += plugin->length;
}
}
}
}
- track->optimize();
src = src->next;
}
+ if( edit_labels ) {
+ Label *edl_label = edl->labels->first;
+ for( Label *label=clip->labels->first; label; label=label->next ) {
+ double label_pos = position + label->position;
+ int exists = 0;
+ while( edl_label &&
+ !(exists=edl->equivalent(edl_label->position, label_pos)) &&
+ edl_label->position < position ) edl_label = edl_label->next;
+ if( exists ) continue;
+ edl->labels->insert_before(edl_label,
+ new Label(edl, edl->labels, label_pos, label->textstr));
+ }
+ }
+ edl->optimize();
+}
+
+void MWindow::paste_clipboard(Track *first_track, double position, int overwrite,
+ int edit_edits, int edit_labels, int edit_autos, int edit_plugins)
+{
+ int64_t len = gui->clipboard_len(BC_PRIMARY_SELECTION);
+ if( !len ) return;
+ char *string = new char[len];
+ gui->from_clipboard(string, len, BC_PRIMARY_SELECTION);
+ FileXML file;
+ file.read_from_string(string);
+ delete [] string;
+ EDL *clip = new EDL();
+ clip->create_objects();
+ if( !clip->load_xml(&file, LOAD_ALL) ) {
+ undo_before();
+ paste_edits(clip, first_track, position, overwrite,
+ edit_edits, edit_labels, edit_autos, edit_plugins);
+ save_backup();
+ undo_after(_("paste clip"), LOAD_ALL);
+ restart_brender();
+ cwindow->refresh_frame(CHANGE_EDL);
+
+ update_plugin_guis();
+ gui->update(1, NORMAL_DRAW, 1, 0, 0, 0, 0);
+ }
+ clip->remove_user();
+}
+
+void MWindow::move_group(EDL *group, Track *first_track, double position, int overwrite)
+{
+ undo_before();
+// lockout timebar labels update
+// labels can be deleted with tooltip repeater running
+ cwindow->gui->lock_window("Tracks::move_group");
+
+ ArrayList<Edit *>edits;
+ edl->tracks->get_selected_edits(&edits);
+ if( edl->session->labels_follow_edits )
+ edl->delete_edit_labels(&edits, 0);
+ edl->delete_edits(&edits, 0);
+ paste_edits(group, first_track, position, overwrite, 1,
+ edl->session->labels_follow_edits,
+ edl->session->autos_follow_edits,
+ edl->session->plugins_follow_edits);
+ cwindow->gui->timebar->update(1);
+ cwindow->gui->unlock_window();
// big debate over whether to do this, must either clear selected, or no tweaking
// edl->tracks->clear_selected_edits();
save_backup();
- undo->update_undo_after(_("move group"), LOAD_ALL);
+ undo_after(_("move group"), LOAD_ALL);
restart_brender();
cwindow->refresh_frame(CHANGE_EDL);
void MWindow::move_effect(Plugin *plugin, Track *track, int64_t position)
{
- undo->update_undo_before();
+ undo_before();
edl->tracks->move_effect(plugin, track, position);
save_backup();
- undo->update_undo_after(_("paste effect"), LOAD_ALL);
+ undo_after(_("paste effect"), LOAD_ALL);
restart_brender();
cwindow->refresh_frame(CHANGE_EDL);
void MWindow::move_effect(Plugin *plugin, PluginSet *plugin_set, int64_t position)
{
- undo->update_undo_before();
+ undo_before();
edl->tracks->move_effect(plugin, plugin_set, position);
save_backup();
- undo->update_undo_after(_("move effect"), LOAD_ALL);
+ undo_after(_("move effect"), LOAD_ALL);
restart_brender();
cwindow->refresh_frame(CHANGE_EDL);
void MWindow::move_plugins_up(PluginSet *plugin_set)
{
- undo->update_undo_before();
+ undo_before();
plugin_set->track->move_plugins_up(plugin_set);
save_backup();
- undo->update_undo_after(_("move effect up"), LOAD_ALL);
+ undo_after(_("move effect up"), LOAD_ALL);
restart_brender();
gui->update(1, NORMAL_DRAW, 0, 0, 0, 0, 0);
sync_parameters(CHANGE_EDL);
void MWindow::move_plugins_down(PluginSet *plugin_set)
{
- undo->update_undo_before();
+ undo_before();
plugin_set->track->move_plugins_down(plugin_set);
save_backup();
- undo->update_undo_after(_("move effect down"), LOAD_ALL);
+ undo_after(_("move effect down"), LOAD_ALL);
restart_brender();
gui->update(1, NORMAL_DRAW, 0, 0, 0, 0, 0);
sync_parameters(CHANGE_EDL);
void MWindow::move_track_down(Track *track)
{
- undo->update_undo_before();
+ undo_before();
edl->tracks->move_track_down(track);
save_backup();
- undo->update_undo_after(_("move track down"), LOAD_ALL);
+ undo_after(_("move track down"), LOAD_ALL);
restart_brender();
gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
void MWindow::move_tracks_down()
{
- undo->update_undo_before();
+ undo_before();
edl->tracks->move_tracks_down();
save_backup();
- undo->update_undo_after(_("move tracks down"), LOAD_ALL);
+ undo_after(_("move tracks down"), LOAD_ALL);
restart_brender();
gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
void MWindow::move_track_up(Track *track)
{
- undo->update_undo_before();
+ undo_before();
edl->tracks->move_track_up(track);
save_backup();
- undo->update_undo_after(_("move track up"), LOAD_ALL);
+ undo_after(_("move track up"), LOAD_ALL);
restart_brender();
gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
sync_parameters(CHANGE_EDL);
void MWindow::move_tracks_up()
{
- undo->update_undo_before();
+ undo_before();
edl->tracks->move_tracks_up();
save_backup();
- undo->update_undo_after(_("move tracks up"), LOAD_ALL);
+ undo_after(_("move tracks up"), LOAD_ALL);
restart_brender();
gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
sync_parameters(CHANGE_EDL);
double start = edl->local_session->get_selectionstart();
double end = edl->local_session->get_selectionend();
if( start != end ) {
- undo->update_undo_before();
+ undo_before();
edl->clear(start, end, 0,
edl->session->plugins_follow_edits,
edl->session->autos_follow_edits);
edl->session->autos_follow_edits);
save_backup();
- undo->update_undo_after(_("mute"), LOAD_EDITS);
+ undo_after(_("mute"), LOAD_EDITS);
restart_brender();
update_plugin_guis();
double dst_start = edl->local_session->get_selectionstart();
double dst_len = edl->local_session->get_selectionend() - dst_start;
- undo->update_undo_before();
+ undo_before();
if( !EQUIV(dst_len, 0) && (dst_len < overwrite_len) ) {
// in/out points or selection present and shorter than overwrite range
// shorten the copy range
edl->local_session->set_selectionend(dst_start + overwrite_len);
save_backup();
- undo->update_undo_after(_("overwrite"), LOAD_EDITS);
+ undo_after(_("overwrite"), LOAD_EDITS);
restart_brender();
update_plugin_guis();
if( len ) {
char *string = new char[len];
- undo->update_undo_before();
+ undo_before();
gui->from_clipboard(string, len, BC_PRIMARY_SELECTION);
FileXML file;
file.read_from_string(string);
save_backup();
- undo->update_undo_after(_("paste"), LOAD_EDITS | LOAD_TIMEBAR);
+ undo_after(_("paste"), LOAD_EDITS | LOAD_TIMEBAR);
restart_brender();
update_plugin_guis();
gui->update(1, FORCE_REDRAW, 1, 1, 0, 1, 0);
int MWindow::paste_assets(double position, Track *dest_track, int overwrite)
{
int result = 0;
- undo->update_undo_before();
+ undo_before();
if( session->drag_assets->total ) {
load_assets(session->drag_assets,
save_backup();
- undo->update_undo_after(_("paste assets"), LOAD_EDITS);
+ undo_after(_("paste assets"), LOAD_EDITS);
restart_brender();
gui->update(1, FORCE_REDRAW, 1, 0, 0, 1, 0);
sync_parameters(CHANGE_EDL);
int64_t len = gui->clipboard_len(BC_PRIMARY_SELECTION);
if( len ) {
- undo->update_undo_before();
+ undo_before();
speed_before();
char *string = new char[len];
gui->from_clipboard(string, len, BC_PRIMARY_SELECTION);
edl->session->typeless_keyframes);
int changed_edl = speed_after(1);
save_backup();
- undo->update_undo_after(_("paste keyframes"),
+ undo_after(_("paste keyframes"),
!changed_edl ? LOAD_AUTOMATION :
LOAD_AUTOMATION + LOAD_EDITS + LOAD_TIMEBAR);
update_gui(changed_edl);
int64_t len = gui->clipboard_len(BC_PRIMARY_SELECTION);
if( len ) {
- undo->update_undo_before();
+ undo_before();
speed_before();
char *string = new char[len];
gui->from_clipboard(string, len, BC_PRIMARY_SELECTION);
edl->session->typeless_keyframes);
// edl->tracks->paste_default_keyframe(&file);
int changed_edl = speed_after(1);
- undo->update_undo_after(_("paste default keyframe"),
+ undo_after(_("paste default keyframe"),
!changed_edl ? LOAD_AUTOMATION :
LOAD_AUTOMATION + LOAD_EDITS + LOAD_TIMEBAR);
save_backup();
if( load_mode != LOADMODE_RESOURCESONLY &&
load_mode != LOADMODE_ASSETSONLY ) {
// Insert labels
+ if( edl->session->labels_follow_edits ) {
//printf("MWindow::paste_edls %f %f\n", current_position, edl_length);
- if( load_mode == LOADMODE_PASTE ||
- load_mode == LOADMODE_NESTED )
- edl->labels->insert_labels(new_edl->labels,
- destination_tracks.total ? paste_position[0] : 0.0,
- edl_length,
- edit_labels);
- else
- edl->labels->insert_labels(new_edl->labels,
- current_position,
- edl_length,
- edit_labels);
+ if( load_mode == LOADMODE_PASTE || load_mode == LOADMODE_NESTED )
+ edl->labels->insert_labels(new_edl->labels,
+ destination_tracks.total ? paste_position[0] : 0.0,
+ edl_length, edit_labels);
+ else
+ edl->labels->insert_labels(new_edl->labels, current_position,
+ edl_length, edit_labels);
+ }
//PRINT_TRACE
double total_length = new_edl->tracks->total_length();
for( Track *new_track=new_edl->tracks->first;
if( edl->session->frame_rate > 0 )
end += 1./edl->session->frame_rate;
}
- undo->update_undo_before(_("silence"), this);
+ undo_before(_("silence"), this);
edl->paste_silence(start, end,
edl->session->labels_follow_edits,
edl->session->plugins_follow_edits,
edl->session->autos_follow_edits);
edl->optimize();
save_backup();
- undo->update_undo_after(_("silence"), LOAD_EDITS | LOAD_TIMEBAR);
+ undo_after(_("silence"), LOAD_EDITS | LOAD_TIMEBAR);
update_plugin_guis();
restart_brender();
void MWindow::detach_transition(Transition *transition)
{
- undo->update_undo_before();
+ undo_before();
hide_plugin(transition, 1);
int is_video = (transition->edit->track->data_type == TRACK_VIDEO);
transition->edit->detach_transition();
save_backup();
- undo->update_undo_after(_("detach transition"), LOAD_ALL);
+ undo_after(_("detach transition"), LOAD_ALL);
if( is_video ) restart_brender();
gui->update(0, NORMAL_DRAW, 0, 0, 0, 0, 0);
{
gui->lock_window("MWindow::detach_transitions 1");
- undo->update_undo_before();
+ undo_before();
double start = edl->local_session->get_selectionstart();
double end = edl->local_session->get_selectionend();
edl->tracks->clear_transitions(start, end);
save_backup();
- undo->update_undo_after(_("detach transitions"), LOAD_EDITS);
+ undo_after(_("detach transitions"), LOAD_EDITS);
sync_parameters(CHANGE_EDL);
gui->update(0, NORMAL_DRAW, 0, 0, 0, 0, 0);
// Only the first transition gets dropped.
PluginServer *server = session->drag_pluginservers->values[0];
- undo->update_undo_before();
+ undo_before();
edl->tracks->paste_transition(server, session->edit_highlighted);
save_backup();
- undo->update_undo_after(_("transition"), LOAD_EDITS);
+ undo_after(_("transition"), LOAD_EDITS);
if( server->video ) restart_brender();
sync_parameters(CHANGE_ALL);
{
gui->lock_window("MWindow::detach_transitions 1");
- undo->update_undo_before();
+ undo_before();
double start = edl->local_session->get_selectionstart();
double end = edl->local_session->get_selectionend();
edl->tracks->paste_transitions(start, end, track_type, title);
save_backup();
- undo->update_undo_after(_("attach transitions"), LOAD_EDITS);
+ undo_after(_("attach transitions"), LOAD_EDITS);
sync_parameters(CHANGE_EDL);
gui->update(0, NORMAL_DRAW, 0, 0, 0, 0, 0);
void MWindow::paste_transition_cwindow(Track *dest_track)
{
PluginServer *server = session->drag_pluginservers->values[0];
- undo->update_undo_before();
+ undo_before();
edl->tracks->paste_video_transition(server, 1);
save_backup();
- undo->update_undo_after(_("transition"), LOAD_EDITS);
+ undo_after(_("transition"), LOAD_EDITS);
restart_brender();
gui->update(0, NORMAL_DRAW, 0, 0, 0, 0, 0);
sync_parameters(CHANGE_ALL);
return;
}
- undo->update_undo_before();
+ undo_before();
edl->tracks->paste_audio_transition(server);
save_backup();
- undo->update_undo_after(_("transition"), LOAD_EDITS);
+ undo_after(_("transition"), LOAD_EDITS);
sync_parameters(CHANGE_EDL);
gui->update(0, NORMAL_DRAW, 0, 0, 0, 0, 0);
return;
}
- undo->update_undo_before();
+ undo_before();
edl->tracks->paste_video_transition(server);
save_backup();
- undo->update_undo_after(_("transition"), LOAD_EDITS);
+ undo_after(_("transition"), LOAD_EDITS);
sync_parameters(CHANGE_EDL);
restart_brender();
{
gui->lock_window("MWindow::shuffle_edits 1");
- undo->update_undo_before();
+ undo_before();
double start = edl->local_session->get_selectionstart();
double end = edl->local_session->get_selectionend();
edl->tracks->shuffle_edits(start, end);
save_backup();
- undo->update_undo_after(_("shuffle edits"), LOAD_EDITS | LOAD_TIMEBAR);
+ undo_after(_("shuffle edits"), LOAD_EDITS | LOAD_TIMEBAR);
sync_parameters(CHANGE_EDL);
restart_brender();
{
gui->lock_window("MWindow::reverse_edits 1");
- undo->update_undo_before();
+ undo_before();
double start = edl->local_session->get_selectionstart();
double end = edl->local_session->get_selectionend();
edl->tracks->reverse_edits(start, end);
save_backup();
- undo->update_undo_after(_("reverse edits"), LOAD_EDITS | LOAD_TIMEBAR);
+ undo_after(_("reverse edits"), LOAD_EDITS | LOAD_TIMEBAR);
sync_parameters(CHANGE_EDL);
restart_brender();
{
gui->lock_window("MWindow::align_edits 1");
- undo->update_undo_before();
+ undo_before();
double start = edl->local_session->get_selectionstart();
double end = edl->local_session->get_selectionend();
edl->tracks->align_edits(start, end);
save_backup();
- undo->update_undo_after(_("align edits"), LOAD_EDITS | LOAD_TIMEBAR);
+ undo_after(_("align edits"), LOAD_EDITS | LOAD_TIMEBAR);
sync_parameters(CHANGE_EDL);
restart_brender();
{
gui->lock_window("MWindow::set_edit_length 1");
- undo->update_undo_before();
+ undo_before();
double start = edl->local_session->get_selectionstart();
double end = edl->local_session->get_selectionend();
edl->tracks->set_edit_length(start, end, length);
save_backup();
- undo->update_undo_after(_("edit length"), LOAD_EDITS | LOAD_TIMEBAR);
+ undo_after(_("edit length"), LOAD_EDITS | LOAD_TIMEBAR);
sync_parameters(CHANGE_EDL);
restart_brender();
{
gui->lock_window("MWindow::set_transition_length 1");
- undo->update_undo_before();
+ undo_before();
//double start = edl->local_session->get_selectionstart();
//double end = edl->local_session->get_selectionend();
edl->tracks->set_transition_length(transition, length);
save_backup();
- undo->update_undo_after(_("transition length"), LOAD_EDITS);
+ undo_after(_("transition length"), LOAD_EDITS);
edl->session->default_transition_length = length;
sync_parameters(CHANGE_PARAMS);
{
gui->lock_window("MWindow::set_transition_length 2");
- undo->update_undo_before();
+ undo_before();
double start = edl->local_session->get_selectionstart();
double end = edl->local_session->get_selectionend();
edl->tracks->set_transition_length(start, end, length);
save_backup();
- undo->update_undo_after(_("transition length"), LOAD_EDITS);
+ undo_after(_("transition length"), LOAD_EDITS);
edl->session->default_transition_length = length;
sync_parameters(CHANGE_PARAMS);
void MWindow::resize_track(Track *track, int w, int h)
{
- undo->update_undo_before();
+ undo_before();
// We have to move all maskpoints so they do not move in relation to image areas
((MaskAutos*)track->automation->autos[AUTOMATION_MASK])->translate_masks(
(w - track->track_w) / 2,
(h - track->track_h) / 2);
track->track_w = w;
track->track_h = h;
- undo->update_undo_after(_("resize track"), LOAD_ALL);
+ undo_after(_("resize track"), LOAD_ALL);
save_backup();
restart_brender();
}
-void MWindow::set_inpoint(int is_mwindow)
+void MWindow::set_inpoint()
{
- undo->update_undo_before();
+ undo_before();
edl->set_inpoint(edl->local_session->get_selectionstart(1));
save_backup();
- undo->update_undo_after(_("in point"), LOAD_TIMEBAR);
-
- if( !is_mwindow ) {
- gui->lock_window("MWindow::set_inpoint 1");
- }
+ undo_after(_("in point"), LOAD_TIMEBAR);
gui->update_timebar(1);
- if( !is_mwindow ) {
- gui->unlock_window();
- }
- if( is_mwindow ) {
- cwindow->gui->lock_window("MWindow::set_inpoint 2");
- }
+ cwindow->gui->lock_window("MWindow::set_inpoint 2");
cwindow->gui->timebar->update(1);
- if( is_mwindow ) {
- cwindow->gui->unlock_window();
- }
+ cwindow->gui->unlock_window();
}
-void MWindow::set_outpoint(int is_mwindow)
+void MWindow::set_outpoint()
{
- undo->update_undo_before();
+ undo_before();
edl->set_outpoint(edl->local_session->get_selectionend(1));
save_backup();
- undo->update_undo_after(_("out point"), LOAD_TIMEBAR);
+ undo_after(_("out point"), LOAD_TIMEBAR);
- if( !is_mwindow ) {
- gui->lock_window("MWindow::set_outpoint 1");
- }
gui->update_timebar(1);
- if( !is_mwindow ) {
- gui->unlock_window();
- }
-
- if( is_mwindow ) {
- cwindow->gui->lock_window("MWindow::set_outpoint 2");
- }
+ cwindow->gui->lock_window("MWindow::set_outpoint 2");
cwindow->gui->timebar->update(1);
- if( is_mwindow ) {
- cwindow->gui->unlock_window();
- }
+ cwindow->gui->unlock_window();
}
-void MWindow::unset_inoutpoint(int is_mwindow)
+void MWindow::unset_inoutpoint()
{
- undo->update_undo_before();
+ undo_before();
edl->unset_inoutpoint();
save_backup();
- undo->update_undo_after(_("clear in/out"), LOAD_TIMEBAR);
+ undo_after(_("clear in/out"), LOAD_TIMEBAR);
- if( !is_mwindow ) {
- gui->lock_window("MWindow::unset_inoutpoint 1");
- }
gui->update_timebar(1);
- if( !is_mwindow ) {
- gui->unlock_window();
- }
-
- if( is_mwindow ) {
- cwindow->gui->lock_window("MWindow::unset_inoutpoint 2");
- }
+ cwindow->gui->lock_window("MWindow::unset_inoutpoint 2");
cwindow->gui->timebar->update(1);
- if( is_mwindow ) {
- cwindow->gui->unlock_window();
- }
+ cwindow->gui->unlock_window();
}
void MWindow::splice(EDL *source, int all)
FileXML file;
LocalSession *src = source->local_session;
- undo->update_undo_before();
+ undo_before();
double source_start = all ? 0 :
src->inpoint_valid() ? src->get_inpoint() :
src->outpoint_valid() ? 0 : src->get_selectionstart();
edl->local_session->set_selectionend(start + source_end - source_start);
save_backup();
- undo->update_undo_after(_("splice"), LOAD_EDITS | LOAD_TIMEBAR);
+ undo_after(_("splice"), LOAD_EDITS | LOAD_TIMEBAR);
update_plugin_guis();
restart_brender();
gui->update(1, NORMAL_DRAW, 1, 1, 0, 1, 0);
gui->unlock_window();
}
-int MWindow::toggle_label(int is_mwindow)
+int MWindow::toggle_label()
{
double position1, position2;
- undo->update_undo_before();
-
- if( cwindow->playback_engine->is_playing_back ) {
- position1 = position2 =
- cwindow->playback_engine->get_tracking_position();
- }
- else {
- position1 = edl->local_session->get_selectionstart(1);
- position2 = edl->local_session->get_selectionend(1);
- }
+ undo_before();
+ position1 = edl->local_session->get_selectionstart(1);
+ position2 = edl->local_session->get_selectionend(1);
position1 = edl->align_to_frame(position1, 0);
position2 = edl->align_to_frame(position2, 0);
-//printf("MWindow::toggle_label 1\n");
-
edl->labels->toggle_label(position1, position2);
save_backup();
- if( !is_mwindow ) {
- gui->lock_window("MWindow::toggle_label 1");
- }
gui->update_timebar(0);
gui->activate_timeline();
gui->flush();
- if( !is_mwindow ) {
- gui->unlock_window();
- }
- if( is_mwindow ) {
- cwindow->gui->lock_window("MWindow::toggle_label 2");
- }
+ cwindow->gui->lock_window("MWindow::toggle_label 2");
cwindow->gui->timebar->update(1);
- if( is_mwindow ) {
- cwindow->gui->unlock_window();
- }
-
+ cwindow->gui->unlock_window();
awindow->gui->async_update_assets();
- undo->update_undo_after(_("label"), LOAD_TIMEBAR);
+ undo_after(_("label"), LOAD_TIMEBAR);
return 0;
}
void MWindow::trim_selection()
{
- undo->update_undo_before();
+ undo_before();
edl->trim_selection(edl->local_session->get_selectionstart(),
edl->session->autos_follow_edits);
save_backup();
- undo->update_undo_after(_("trim selection"), LOAD_EDITS | LOAD_TIMEBAR);
+ undo_after(_("trim selection"), LOAD_EDITS | LOAD_TIMEBAR);
update_plugin_guis();
gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0);
cwindow->update(1, 0, 0, 0, 1);
void MWindow::new_folder(const char *new_folder, int is_clips)
{
- undo->update_undo_before();
+ undo_before();
if( edl->new_folder(new_folder, is_clips) ) {
MainError::show_error(_("create new folder failed"));
}
- undo->update_undo_after(_("new folder"), LOAD_ALL);
+ undo_after(_("new folder"), LOAD_ALL);
awindow->gui->async_update_assets();
}
void MWindow::delete_folder(char *folder)
{
- undo->update_undo_before();
+ undo_before();
if( edl->delete_folder(folder) < 0 ) {
MainError::show_error(_("delete folder failed"));
}
- undo->update_undo_after(_("del folder"), LOAD_ALL);
+ undo_after(_("del folder"), LOAD_ALL);
awindow->gui->async_update_assets();
}
void MWindow::map_audio(int pattern)
{
- undo->update_undo_before();
+ undo_before();
remap_audio(pattern);
- undo->update_undo_after(
+ undo_after(
pattern == MWindow::AUDIO_1_TO_1 ? _("map 1:1") : _("map 5.1:2"),
LOAD_AUTOMATION);
sync_parameters(CHANGE_PARAMS);
void MWindow::cut_commercials()
{
#ifdef HAVE_COMMERCIAL
- undo->update_undo_before();
+ undo_before();
commercials->scan_media();
edl->optimize();
save_backup();
- undo->update_undo_after(_("cut ads"), LOAD_EDITS | LOAD_TIMEBAR);
+ undo_after(_("cut ads"), LOAD_EDITS | LOAD_TIMEBAR);
restart_brender();
update_plugin_guis();
projects / goodguy / cinelerra.git / blobdiff