undo->update_undo_after(_("add track"), LOAD_ALL);
restart_brender();
- gui->update(1, 1, 0, 0, 1, 0, 0);
+ gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
gui->activate_timeline();
// gui->get_scrollbars(0);
restart_brender();
- gui->update(1, 1, 0, 0, 1, 0, 0);
+ gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
gui->activate_timeline();
// gui->get_scrollbars(0);
// gui->canvas->draw();
restart_brender();
- gui->update(1, 1, 0, 0, 1, 0, 0);
+ gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
gui->activate_timeline();
// gui->get_scrollbars(0);
// gui->canvas->draw();
undo->update_undo_after(_("asset to all"), LOAD_ALL);
restart_brender();
- gui->update(1, 2, 1, 1, 1, 1, 0);
+ gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0);
sync_parameters(CHANGE_ALL);
}
}
undo->update_undo_after(_("asset to rate"), LOAD_ALL);
restart_brender();
- gui->update(1, 2, 1, 1, 1, 1, 0);
+ gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0);
sync_parameters(CHANGE_ALL);
}
}
restart_brender();
update_plugin_guis();
- gui->update(1, 2, 1, 1, 1, 1, 0);
+ gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0);
cwindow->update(1, 0, 0, 0, 1);
cwindow->refresh_frame(CHANGE_EDL);
}
restart_brender();
update_plugin_guis();
if( changed_edl ) {
- gui->update(1, 2, 1, 1, 1, 1, 0);
+ gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0);
cwindow->update(1, 0, 0, 0, 1);
cwindow->refresh_frame(CHANGE_EDL);
}
undo->update_undo_after(_("concatenate tracks"), LOAD_EDITS);
restart_brender();
- gui->update(1, 1, 0, 0, 1, 0, 0);
+ gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
cwindow->refresh_frame(CHANGE_EDL);
}
undo->update_undo_after(_("blade"), LOAD_EDITS | LOAD_TIMEBAR);
restart_brender();
update_plugin_guis();
- gui->update(1, 2, 1, 1, 1, 1, 0);
+ gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0);
cwindow->update(1, 0, 0, 0, 1);
awindow->gui->async_update_assets();
cwindow->refresh_frame(CHANGE_EDL);
}
restart_brender();
update_plugin_guis();
- gui->update(1, 2, 1, 1, 1, 1, 0);
+ gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0);
cwindow->update(1, 0, 0, 0, 1);
awindow->gui->async_update_assets();
cwindow->refresh_frame(CHANGE_EDL);
restart_brender();
update_plugin_states();
- gui->update(1, 1, 1, 0, 1, 0, 0);
+ gui->update(1, NORMAL_DRAW, 1, 0, 1, 0, 0);
cwindow->refresh_frame(CHANGE_EDL);
}
restart_brender();
update_plugin_states();
- gui->update(1, 1, 1, 0, 1, 0, 0);
+ gui->update(1, NORMAL_DRAW, 1, 0, 1, 0, 0);
cwindow->refresh_frame(CHANGE_EDL);
save_backup();
}
// Insert data from clipboard
void MWindow::insert(double position, FileXML *file,
int edit_labels, int edit_plugins, int edit_autos,
- EDL *parent_edl)
+ EDL *parent_edl, Track *first_track, int overwrite)
{
// For clipboard pasting make the new edl use a separate session
// from the master EDL. Then it can be resampled to the master rates.
- paste_edls(&new_edls, LOADMODE_PASTE, 0, position,
- edit_labels, edit_plugins, edit_autos, 0); // overwrite
+ paste_edls(&new_edls, LOADMODE_PASTE, first_track, position,
+ edit_labels, edit_plugins, edit_autos, overwrite);
// if( vwindow->edl )
// printf("MWindow::insert 5 %f %f\n",
// vwindow->edl->local_session->in_point,
undo->update_undo_after(_("insert effect"), LOAD_EDITS | LOAD_PATCHES);
restart_brender();
sync_parameters(CHANGE_EDL);
- gui->update(1, 1, 0, 0, 1, 0, 0);
+ gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
}
void MWindow::insert_effect(char *title,
restart_brender();
sync_parameters(CHANGE_EDL);
update_plugin_guis();
- gui->update(1, 2, 1, 1, 1, 1, 0);
+ gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0);
// label list can be modified
awindow->gui->async_update_assets();
cwindow->update(1, 0, 0, 0, 1);
}
+void MWindow::selected_to_clipboard(int packed)
+{
+ double start = DBL_MAX, end = DBL_MIN;
+ Track *first_track=0, *last_track = 0;
+ for( Track *track=edl->tracks->first; track; track=track->next ) {
+ if( !track->record ) continue;
+ int empty = 1;
+ for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+ if( !edit->is_selected || edit->silence() ) continue;
+ double edit_pos = track->from_units(edit->startproject);
+ if( start > edit_pos ) start = edit_pos;
+ if( end < (edit_pos+=edit->length) ) end = edit_pos;
+ empty = 0;
+ }
+ if( empty ) continue;
+ if( !first_track ) first_track = track;
+ last_track = track;
+ }
+ if( !first_track ) return;
+ EDL *new_edl = new EDL();
+ new_edl->create_objects();
+ new_edl->copy_session(edl);
+ const char *text = _("new_edl edit");
+ new_edl->set_path(text);
+ strcpy(new_edl->local_session->clip_title, text);
+ strcpy(new_edl->local_session->clip_notes, text);
+ new_edl->session->video_tracks = 0;
+ new_edl->session->audio_tracks = 0;
+ for( Track *track=edl->tracks->first; track; track=track->next ) {
+ if( !track->record ) continue;
+ if( first_track ) {
+ if( first_track != track ) continue;
+ first_track = 0;
+ }
+ Track *new_track = 0;
+ if( !packed )
+ new_track = new_edl->add_new_track(track->data_type);
+ int64_t start_pos = track->to_units(start, 0);
+ int64_t end_pos = track->to_units(end, 0);
+ int64_t startproject = 0;
+ for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+ if( edit->startproject < start_pos ) continue;
+ if( edit->startproject >= end_pos ) break;
+ if( !edit->is_selected || edit->silence() ) continue;
+ if( !new_track )
+ new_track = new_edl->add_new_track(track->data_type);
+ if( new_track ) {
+ if( !packed ) {
+ int64_t edit_position = edit->startproject - start_pos;
+ if( edit_position > startproject ) {
+ Edit *silence = new Edit(new_edl, new_track);
+ silence->startproject = startproject;
+ silence->length = edit_position - startproject;
+ new_track->edits->append(silence);
+ startproject = edit_position;
+ }
+ }
+ Edit *clip_edit = new Edit(new_edl, new_track);
+ clip_edit->copy_from(edit);
+ clip_edit->startproject = startproject;
+ startproject += clip_edit->length;
+ new_track->edits->append(clip_edit);
+ }
+ }
+ if( last_track == track ) break;
+ }
+ double length = new_edl->tracks->total_length();
+ FileXML file;
+ new_edl->copy(0, length, 1, &file, "", 1);
+ const char *file_string = file.string();
+ long file_length = strlen(file_string);
+ gui->to_clipboard(file_string, file_length, BC_PRIMARY_SELECTION);
+ gui->to_clipboard(file_string, file_length, SECONDARY_SELECTION);
+ new_edl->remove_user();
+}
+
+void MWindow::delete_edit(Edit *edit, const char *msg, int collapse)
+{
+ ArrayList<Edit*> edits;
+ edits.append(edit);
+ delete_edits(&edits, msg, collapse);
+}
+
+void MWindow::delete_edits(ArrayList<Edit*> *edits, const char *msg, int collapse)
+{
+ if( !edits->size() ) return;
+ undo->update_undo_before();
+ for( Track *track=edl->tracks->first; track; track=track->next ) {
+ for( Edit *next=track->edits->first; next; ) {
+ Edit *edit = next; next = edit->next;
+ if( !edit->is_selected ) continue;
+ int64_t len = edit->length;
+ delete edit;
+ if( !collapse ) continue;
+ for( edit=next; edit; edit=edit->next )
+ edit->startproject -= len;
+ }
+ }
+ edl->optimize();
+ save_backup();
+ undo->update_undo_after(msg, LOAD_EDITS);
+
+ restart_brender();
+ cwindow->refresh_frame(CHANGE_EDL);
+ update_plugin_guis();
+ gui->update(1, NORMAL_DRAW, 1, 0, 0, 0, 0);
+}
+
+void MWindow::delete_edits(int collapse)
+{
+ ArrayList<Edit*> edits;
+ edl->tracks->get_selected_edits(&edits);
+ delete_edits(&edits,_("del edit"), collapse);
+}
+
+// collapse - delete from timeline, not collapse replace with silence
+// packed - omit unselected from selection, unpacked - replace unselected with silence
+void MWindow::cut_selected_edits(int collapse, int packed)
+{
+ selected_to_clipboard(packed);
+ ArrayList<Edit*> edits;
+ edl->tracks->get_selected_edits(&edits);
+ delete_edits(&edits, _("cut edit"), collapse);
+}
+
+
void MWindow::move_edits(ArrayList<Edit*> *edits,
Track *track,
double position,
cwindow->refresh_frame(CHANGE_EDL);
update_plugin_guis();
- gui->update(1, 1, // 1 for incremental drawing. 2 for full refresh
- 1, 0, 0, 0, 0);
+ gui->update(1, NORMAL_DRAW, 1, 0, 0, 0, 0);
}
void MWindow::move_effect(Plugin *plugin, Track *track, int64_t position)
restart_brender();
cwindow->refresh_frame(CHANGE_EDL);
update_plugin_guis();
- gui->update(1, 1, // 1 for incremental drawing. 2 for full refresh
- 0, 0, 0, 0, 0);
+ gui->update(1, NORMAL_DRAW, 0, 0, 0, 0, 0);
}
void MWindow::move_effect(Plugin *plugin, PluginSet *plugin_set, int64_t position)
restart_brender();
cwindow->refresh_frame(CHANGE_EDL);
update_plugin_guis();
- gui->update(1, 1, // 1 for incremental drawing. 2 for full refresh
- 0, 0, 0, 0, 0);
+ gui->update(1, NORMAL_DRAW, 0, 0, 0, 0, 0);
}
void MWindow::move_plugins_up(PluginSet *plugin_set)
save_backup();
undo->update_undo_after(_("move effect up"), LOAD_ALL);
restart_brender();
- gui->update(1, 1, // 1 for incremental drawing. 2 for full refresh
- 0, 0, 0, 0, 0);
+ gui->update(1, NORMAL_DRAW, 0, 0, 0, 0, 0);
sync_parameters(CHANGE_EDL);
}
save_backup();
undo->update_undo_after(_("move effect down"), LOAD_ALL);
restart_brender();
- gui->update(1, 1, // 1 for incremental drawing. 2 for full refresh
- 0, 0, 0, 0, 0);
+ gui->update(1, NORMAL_DRAW, 0, 0, 0, 0, 0);
sync_parameters(CHANGE_EDL);
}
undo->update_undo_after(_("move track down"), LOAD_ALL);
restart_brender();
- gui->update(1, 1, 0, 0, 1, 0, 0);
+ gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
sync_parameters(CHANGE_EDL);
save_backup();
}
undo->update_undo_after(_("move tracks down"), LOAD_ALL);
restart_brender();
- gui->update(1, 1, 0, 0, 1, 0, 0);
+ gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
sync_parameters(CHANGE_EDL);
save_backup();
}
save_backup();
undo->update_undo_after(_("move track up"), LOAD_ALL);
restart_brender();
- gui->update(1, 1, 0, 0, 1, 0, 0);
+ gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
sync_parameters(CHANGE_EDL);
save_backup();
}
save_backup();
undo->update_undo_after(_("move tracks up"), LOAD_ALL);
restart_brender();
- gui->update(1, 1, 0, 0, 1, 0, 0);
+ gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
sync_parameters(CHANGE_EDL);
}
restart_brender();
update_plugin_guis();
- gui->update(1, 2, 1, 1, 1, 1, 0);
+ gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0);
cwindow->refresh_frame(CHANGE_EDL);
}
}
edl->local_session->get_outpoint() < 0 )
edl->clear(dst_start, dst_start + overwrite_len, 0, 0, 0);
- paste(dst_start, dst_start + overwrite_len,
- &file, 0, 0, 0);
+ paste(dst_start, dst_start + overwrite_len, &file, 0, 0, 0, 0, 0);
edl->local_session->set_selectionstart(dst_start + overwrite_len);
edl->local_session->set_selectionend(dst_start + overwrite_len);
restart_brender();
update_plugin_guis();
- gui->update(1, 1, 1, 1, 0, 1, 0);
+ gui->update(1, NORMAL_DRAW, 1, 1, 0, 1, 0);
sync_parameters(CHANGE_EDL);
}
// For splice and overwrite
-int MWindow::paste(double start,
- double end,
- FileXML *file,
- int edit_labels,
- int edit_plugins,
- int edit_autos)
+int MWindow::paste(double start, double end, FileXML *file,
+ int edit_labels, int edit_plugins, int edit_autos,
+ Track *first_track, int overwrite)
{
clear(0);
// Want to insert with assets shared with the master EDL.
insert(start, file,
edit_labels, edit_plugins, edit_autos,
- edl);
+ edl, first_track, overwrite);
return 0;
}
// For editing using insertion point
void MWindow::paste()
{
- double start = edl->local_session->get_selectionstart();
+ paste(edl->local_session->get_selectionstart(), 0, 1, 0);
+}
+
+void MWindow::paste(double start, Track *first_track, int clear_selection, int overwrite)
+{
//double end = edl->local_session->get_selectionend();
int64_t len = gui->clipboard_len(BC_PRIMARY_SELECTION);
gui->from_clipboard(string, len, BC_PRIMARY_SELECTION);
FileXML file;
file.read_from_string(string);
- clear(0);
+ if( clear_selection ) clear(0);
insert(start, &file,
edl->session->labels_follow_edits,
edl->session->plugins_follow_edits,
edl->session->autos_follow_edits,
- 0);
+ 0, first_track, overwrite);
edl->optimize();
delete [] string;
undo->update_undo_after(_("paste"), LOAD_EDITS | LOAD_TIMEBAR);
restart_brender();
update_plugin_guis();
- gui->update(1, 2, 1, 1, 0, 1, 0);
+ gui->update(1, FORCE_REDRAW, 1, 1, 0, 1, 0);
awindow->gui->async_update_assets();
sync_parameters(CHANGE_EDL);
}
undo->update_undo_after(_("paste assets"), LOAD_EDITS);
restart_brender();
- gui->update(1, 2, 1, 0, 0, 1, 0);
+ gui->update(1, FORCE_REDRAW, 1, 0, 0, 1, 0);
sync_parameters(CHANGE_EDL);
return result;
}
edl_length,
edit_labels);
//PRINT_TRACE
-
+ double total_length = new_edl->tracks->total_length();
for( Track *new_track=new_edl->tracks->first;
new_track; new_track=new_track->next ) {
// Get destination track of same type as new_track
break;
}
if( overwrite ) {
+ double length = overwrite >= 0 ?
+ new_track->get_length() : total_length;
track->clear(current_position,
- current_position + new_track->get_length(),
+ current_position + length,
1, // edit edits
edit_labels, edit_plugins, edit_autos,
1, // convert units
update_plugin_guis();
restart_brender();
- gui->update(1, 2, 1, 1, 1, 1, 0);
+ gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0);
cwindow->update(1, 0, 0, 0, 1);
cwindow->refresh_frame(CHANGE_EDL);
}
undo->update_undo_after(_("detach transition"), LOAD_ALL);
if( is_video ) restart_brender();
- gui->update(0, 1, 0, 0, 0, 0, 0);
+ gui->update(0, NORMAL_DRAW, 0, 0, 0, 0, 0);
sync_parameters(CHANGE_EDL);
}
undo->update_undo_after(_("detach transitions"), LOAD_EDITS);
sync_parameters(CHANGE_EDL);
- gui->update(0, 1, 0, 0, 0, 0, 0);
+ gui->update(0, NORMAL_DRAW, 0, 0, 0, 0, 0);
gui->unlock_window();
}
undo->update_undo_after(_("attach transitions"), LOAD_EDITS);
sync_parameters(CHANGE_EDL);
- gui->update(0, 1, 0, 0, 0, 0, 0);
+ gui->update(0, NORMAL_DRAW, 0, 0, 0, 0, 0);
gui->unlock_window();
}
save_backup();
undo->update_undo_after(_("transition"), LOAD_EDITS);
restart_brender();
- gui->update(0, 1, 0, 0, 0, 0, 0);
+ gui->update(0, NORMAL_DRAW, 0, 0, 0, 0, 0);
sync_parameters(CHANGE_ALL);
}
undo->update_undo_after(_("transition"), LOAD_EDITS);
sync_parameters(CHANGE_EDL);
- gui->update(0, 1, 0, 0, 0, 0, 0);
+ gui->update(0, NORMAL_DRAW, 0, 0, 0, 0, 0);
}
void MWindow::paste_video_transition()
sync_parameters(CHANGE_EDL);
restart_brender();
- gui->update(0, 1, 0, 0, 0, 0, 0);
+ gui->update(0, NORMAL_DRAW, 0, 0, 0, 0, 0);
}
void MWindow::shuffle_edits()
sync_parameters(CHANGE_EDL);
restart_brender();
- gui->update(0, 1, 1, 0, 0, 0, 0);
+ gui->update(0, NORMAL_DRAW, 1, 0, 0, 0, 0);
gui->unlock_window();
}
sync_parameters(CHANGE_EDL);
restart_brender();
- gui->update(0, 1, 1, 0, 0, 0, 0);
+ gui->update(0, NORMAL_DRAW, 1, 0, 0, 0, 0);
gui->unlock_window();
}
sync_parameters(CHANGE_EDL);
restart_brender();
- gui->update(0, 1, 1, 0, 0, 0, 0);
+ gui->update(0, NORMAL_DRAW, 1, 0, 0, 0, 0);
gui->unlock_window();
}
sync_parameters(CHANGE_EDL);
restart_brender();
- gui->update(0, 1, 1, 0, 0, 0, 0);
+ gui->update(0, NORMAL_DRAW, 1, 0, 0, 0, 0);
gui->unlock_window();
}
edl->session->default_transition_length = length;
sync_parameters(CHANGE_PARAMS);
- gui->update(0, 1, 0, 0, 0, 0, 0);
+ gui->update(0, NORMAL_DRAW, 0, 0, 0, 0, 0);
gui->unlock_window();
}
edl->session->default_transition_length = length;
sync_parameters(CHANGE_PARAMS);
restart_brender();
- gui->update(0, 1, 0, 0, 0, 0, 0);
+ gui->update(0, NORMAL_DRAW, 0, 0, 0, 0, 0);
gui->unlock_window();
}
update_plugin_states();
update_plugin_guis();
- gui->update(1, 2, 1, 1, 1, 1, 1);
+ gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 1);
gui->update_proxy_toggle();
gui->unlock_window();
cwindow->update(1, 1, 1, 1, 1);
paste(start, start, &file,
edl->session->labels_follow_edits,
edl->session->plugins_follow_edits,
- edl->session->autos_follow_edits);
+ edl->session->autos_follow_edits,
+ 0, 0);
// Position at end of clip
edl->local_session->set_selectionstart(start + source_end - source_start);
undo->update_undo_after(_("splice"), LOAD_EDITS | LOAD_TIMEBAR);
update_plugin_guis();
restart_brender();
- gui->update(1, 1, 1, 1, 0, 1, 0);
+ gui->update(1, NORMAL_DRAW, 1, 1, 0, 1, 0);
sync_parameters(CHANGE_EDL);
}
save_backup();
undo->update_undo_after(_("trim selection"), LOAD_EDITS | LOAD_TIMEBAR);
update_plugin_guis();
- gui->update(1, 2, 1, 1, 1, 1, 0);
+ gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0);
cwindow->update(1, 0, 0, 0, 1);
awindow->gui->async_update_assets();
restart_brender();
update_plugin_states();
update_plugin_guis();
- gui->update(1, 2, 1, 1, 1, 1, 1);
+ gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 1);
gui->update_proxy_toggle();
gui->unlock_window();
cwindow->update(1, 1, 1, 1, 1);
pattern == MWindow::AUDIO_1_TO_1 ? _("map 1:1") : _("map 5.1:2"),
LOAD_AUTOMATION);
sync_parameters(CHANGE_PARAMS);
- gui->update(0, 1, 0, 0, 1, 0, 0);
+ gui->update(0, NORMAL_DRAW, 0, 0, 1, 0, 0);
}
void MWindow::remap_audio(int pattern)
restart_brender();
update_plugin_guis();
- gui->update(1, 2, 1, 1, 1, 1, 0);
+ gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0);
cwindow->update(1, 0, 0, 0, 1);
cwindow->refresh_frame(CHANGE_EDL);
#endif
projects / goodguy / cinelerra.git / blobdiff