}
}
+void MWindow::update_gui(int changed_edl)
+{
+ restart_brender();
+ update_plugin_guis();
+ if( changed_edl ) {
+ gui->update(1, 2, 1, 1, 1, 1, 0);
+ cwindow->update(1, 0, 0, 0, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
+ }
+ else {
+ gui->draw_overlays(1);
+ sync_parameters(CHANGE_PARAMS);
+ gui->update_patchbay();
+ cwindow->update(1, 0, 0);
+ }
+}
+
void MWindow::set_automation_mode(int mode)
{
undo->update_undo_before();
+ speed_before();
edl->tracks->set_automation_mode(
edl->local_session->get_selectionstart(),
edl->local_session->get_selectionend(),
mode);
+ int changed_edl = speed_after(1);
save_backup();
char string[BCSTRLEN];
sprintf(string,"set %s", FloatAuto::curve_name(mode));
- undo->update_undo_after(string, LOAD_AUTOMATION);
-
- restart_brender();
- update_plugin_guis();
- gui->draw_overlays(1);
- sync_parameters(CHANGE_PARAMS);
- gui->update_patchbay();
- cwindow->update(1, 0, 0);
+ undo->update_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();
+ 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"), LOAD_AUTOMATION);
-
- restart_brender();
- update_plugin_guis();
- gui->draw_overlays(1);
- sync_parameters(CHANGE_PARAMS);
- gui->update_patchbay();
- cwindow->update(1, 0, 0);
+ undo->update_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();
+ speed_before();
edl->tracks->clear_default_keyframe();
+ int changed_edl = speed_after(1);
save_backup();
- undo->update_undo_after(_("clear default keyframe"), LOAD_AUTOMATION);
-
- restart_brender();
- gui->draw_overlays(1);
- sync_parameters(CHANGE_PARAMS);
- gui->update_patchbay();
- cwindow->update(1, 0, 0);
-
+ undo->update_undo_after(_("clear default keyframe"),
+ !changed_edl ? LOAD_AUTOMATION :
+ LOAD_AUTOMATION + LOAD_EDITS + LOAD_TIMEBAR);
+ update_gui(changed_edl);
return 0;
}
int MWindow::cut_automation()
{
undo->update_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"), LOAD_AUTOMATION);
-
-
- restart_brender();
- update_plugin_guis();
- gui->draw_overlays(1);
- sync_parameters(CHANGE_PARAMS);
- gui->update_patchbay();
- cwindow->update(1, 0, 0);
+ undo->update_undo_after(_("cut keyframes"),
+ !changed_edl ? LOAD_AUTOMATION :
+ LOAD_AUTOMATION + LOAD_EDITS + LOAD_TIMEBAR);
+ update_gui(changed_edl);
return 0;
}
{
undo->update_undo_before();
+ speed_before();
copy_default_keyframe();
edl->tracks->clear_default_keyframe();
- undo->update_undo_after(_("cut default keyframe"), LOAD_AUTOMATION);
-
- restart_brender();
- gui->draw_overlays(1);
- sync_parameters(CHANGE_PARAMS);
- gui->update_patchbay();
- cwindow->update(1, 0, 0);
+ int changed_edl = speed_after(1);
save_backup();
-
-
+ undo->update_undo_after(_("cut default keyframe"),
+ !changed_edl ? LOAD_AUTOMATION :
+ LOAD_AUTOMATION + LOAD_EDITS + LOAD_TIMEBAR);
+ update_gui(changed_edl);
return 0;
}
EDL *new_edl = new EDL;
new_edl->create_objects();
new_edl->copy_session(edl);
- new_edls.append(new_edl);
-
if( !indexable->is_asset ) {
EDL *nested_edl = (EDL*)indexable;
- new_edl->to_nested(nested_edl);
- new_edl->local_session->set_clip_path(nested_edl);
+ new_edl->create_nested(nested_edl);
+ new_edl->set_path(indexable->path);
}
else {
Asset *asset = (Asset*)indexable;
asset_to_edl(new_edl, asset);
}
+ new_edls.append(new_edl);
if( labels ) {
for( RecordLabel *label=labels->first; label; label=label->next ) {
if( len ) {
undo->update_undo_before();
+ speed_before();
char *string = new char[len];
gui->from_clipboard(string, len, BC_PRIMARY_SELECTION);
FileXML file;
file.read_from_string(string);
-
+ delete [] string;
double start = edl->local_session->get_selectionstart();
double end = edl->local_session->get_selectionend();
edl->tracks->clear_automation(start, end);
edl->tracks->paste_automation(start, &file, 0, 1,
edl->session->typeless_keyframes);
+ int changed_edl = speed_after(1);
save_backup();
- undo->update_undo_after(_("paste keyframes"), LOAD_AUTOMATION);
- delete [] string;
-
- restart_brender();
- update_plugin_guis();
- gui->draw_overlays(1);
- sync_parameters(CHANGE_PARAMS);
- gui->update_patchbay();
- cwindow->update(1, 0, 0);
+ undo->update_undo_after(_("paste keyframes"),
+ !changed_edl ? LOAD_AUTOMATION :
+ LOAD_AUTOMATION + LOAD_EDITS + LOAD_TIMEBAR);
+ update_gui(changed_edl);
}
return 0;
if( len ) {
undo->update_undo_before();
+ speed_before();
char *string = new char[len];
gui->from_clipboard(string, len, BC_PRIMARY_SELECTION);
FileXML file;
file.read_from_string(string);
+ delete [] string;
double start = edl->local_session->get_selectionstart();
edl->tracks->paste_automation(start, &file, 1, 0,
edl->session->typeless_keyframes);
// edl->tracks->paste_default_keyframe(&file);
- undo->update_undo_after(_("paste default keyframe"), LOAD_AUTOMATION);
-
- restart_brender();
- update_plugin_guis();
- gui->draw_overlays(1);
- sync_parameters(CHANGE_PARAMS);
- gui->update_patchbay();
- cwindow->update(1, 0, 0);
- delete [] string;
+ int changed_edl = speed_after(1);
+ undo->update_undo_after(_("paste default keyframe"),
+ !changed_edl ? LOAD_AUTOMATION :
+ LOAD_AUTOMATION + LOAD_EDITS + LOAD_TIMEBAR);
save_backup();
+ update_gui(changed_edl);
}
return 0;
edl->add_clip(new_edl->clips[j]);
}
for( int j=0; j<new_edl->nested_edls.size(); ++j ) {
- edl->nested_edls.get_copy(new_edl->nested_edls[j]);
+ edl->nested_edls.get_nested(new_edl->nested_edls[j]);
}
if( new_edl->total_vwindow_edls() ) {
{
double start = edl->local_session->get_selectionstart();
double end = edl->local_session->get_selectionend();
+ if( EQUIV(start, end) ) {
+ if( edl->session->frame_rate > 0 )
+ end += 1./edl->session->frame_rate;
+ }
undo->update_undo_before();
edl->paste_silence(start, end,
edl->session->labels_follow_edits,
double end = edl->local_session->get_selectionend();
edl->tracks->paste_transitions(start, end, track_type, title);
+ switch( track_type ) {
+ case TRACK_AUDIO:
+ strcpy(edl->session->default_atransition, title);
+ break;
+ case TRACK_VIDEO:
+ strcpy(edl->session->default_vtransition, title);
+ break;
+ }
+
save_backup();
undo->update_undo_after(_("attach transitions"), LOAD_EDITS);
void MWindow::set_edit_length(double length)
{
- gui->lock_window("MWindow::detach_transitions 1");
+ gui->lock_window("MWindow::set_edit_length 1");
undo->update_undo_before();
double start = edl->local_session->get_selectionstart();
void MWindow::set_transition_length(Transition *transition, double length)
{
- gui->lock_window("MWindow::detach_transitions 1");
+ gui->lock_window("MWindow::set_transition_length 1");
undo->update_undo_before();
//double start = edl->local_session->get_selectionstart();
void MWindow::set_transition_length(double length)
{
- gui->lock_window("MWindow::detach_transitions 1");
+ gui->lock_window("MWindow::set_transition_length 2");
undo->update_undo_before();
double start = edl->local_session->get_selectionstart();
n = snprintf(cp, sz, "%s", txt);
cp += n; sz -= n;
}
- n = snprintf(cp, sz,
+ n = snprintf(cp, sz,
"%02d/%02d/%02d %02d:%02d:%02d, +%s\n",
- dtm.tm_year+1900, dtm.tm_mon+1, dtm.tm_mday,
+ dtm.tm_year+1900, dtm.tm_mon+1, dtm.tm_mday,
dtm.tm_hour, dtm.tm_min, dtm.tm_sec, duration);
cp += n; sz -= n;
if( path && *path ) {
}
}
+
+void MWindow::rescale_proxy(EDL *clip, int orig_scale, int new_scale)
+{
+ if( orig_scale == new_scale ) return;
+// project size
+ float orig_w = (float)clip->session->output_w * orig_scale;
+ float orig_h = (float)clip->session->output_h * orig_scale;
+ if( !clip->parent_edl ) {
+ clip->session->output_w = Units::round(orig_w / new_scale);
+ clip->session->output_h = Units::round(orig_h / new_scale);
+ }
+
+// track sizes
+ for( Track *track=clip->tracks->first; track; track=track->next ) {
+ if( track->data_type != TRACK_VIDEO ) continue;
+ orig_w = (float)track->track_w * orig_scale;
+ orig_h = (float)track->track_h * orig_scale;
+ track->track_w = Units::round(orig_w / new_scale);
+ track->track_h = Units::round(orig_h / new_scale);
+ ((MaskAutos*)track->automation->autos[AUTOMATION_MASK])->
+ set_proxy(orig_scale, new_scale);
+ ((FloatAutos*)track->automation->autos[AUTOMATION_CAMERA_X])->
+ set_proxy(orig_scale, new_scale);
+ ((FloatAutos*)track->automation->autos[AUTOMATION_CAMERA_Y])->
+ set_proxy(orig_scale, new_scale);
+ ((FloatAutos*)track->automation->autos[AUTOMATION_PROJECTOR_X])->
+ set_proxy(orig_scale, new_scale);
+ ((FloatAutos*)track->automation->autos[AUTOMATION_PROJECTOR_Y])->
+ set_proxy(orig_scale, new_scale);
+ }
+}
+
void MWindow::set_proxy(int use_scaler, int new_scale, int auto_scale,
ArrayList<Indexable*> *orig_assets,
ArrayList<Indexable*> *proxy_assets)
new_scale = 1;
}
- if( !orig_use_scaler && new_scale != orig_scale ) {
-// project size
- float orig_w = (float)edl->session->output_w * orig_scale;
- float orig_h = (float)edl->session->output_h * orig_scale;
- edl->session->output_w = Units::round(orig_w / new_scale);
- edl->session->output_h = Units::round(orig_h / new_scale);
-
-// track sizes
- for( Track *track=edl->tracks->first; track; track=track->next ) {
- if( track->data_type != TRACK_VIDEO ) continue;
- orig_w = (float)track->track_w * orig_scale;
- orig_h = (float)track->track_h * orig_scale;
- track->track_w = Units::round(orig_w / new_scale);
- track->track_h = Units::round(orig_h / new_scale);
- ((MaskAutos*)track->automation->autos[AUTOMATION_MASK])->
- set_proxy(orig_scale, new_scale);
- ((FloatAutos*)track->automation->autos[AUTOMATION_CAMERA_X])->
- set_proxy(orig_scale, new_scale);
- ((FloatAutos*)track->automation->autos[AUTOMATION_CAMERA_Y])->
- set_proxy(orig_scale, new_scale);
- ((FloatAutos*)track->automation->autos[AUTOMATION_PROJECTOR_X])->
- set_proxy(orig_scale, new_scale);
- ((FloatAutos*)track->automation->autos[AUTOMATION_PROJECTOR_Y])->
- set_proxy(orig_scale, new_scale);
- }
- }
+ if( !orig_use_scaler )
+ rescale_proxy(edl, orig_scale, new_scale);
// change original assets to proxy assets
int awindow_folder = use_scaler || new_scale != 1 ? AW_PROXY_FOLDER : AW_MEDIA_FOLDER;
}
}
}
+ for( int j=0,m=edl->clips.size(); j<m; ++j ) {
+ EDL *clip = edl->clips[j];
+ int has_proxy = 0;
+ for( Track *track=clip->tracks->first; track; track=track->next ) {
+ if( track->data_type != TRACK_VIDEO ) continue;
+ for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+ if( !edit->asset ) continue;
+ if( !strcmp(edit->asset->path, orig_assets->get(i)->path) ) {
+ has_proxy = 1;
+ edit->asset = proxy_asset;
+ }
+ }
+ }
+ if( has_proxy && !orig_use_scaler )
+ rescale_proxy(clip, orig_scale, new_scale);
+ }
}
}
cwindow->refresh_frame(CHANGE_EDL);
}
+int MWindow::normalize_speed(EDL *old_edl, EDL *new_edl)
+{
+ int result = 0;
+ Track *old_track = old_edl->tracks->first;
+ Track *new_track = new_edl->tracks->first;
+ for( ; old_track && new_track; old_track=old_track->next, new_track=new_track->next ) {
+ if( old_track->data_type != new_track->data_type ) continue;
+ FloatAutos *old_speeds = (FloatAutos *)old_track->automation->autos[AUTOMATION_SPEED];
+ FloatAutos *new_speeds = (FloatAutos *)new_track->automation->autos[AUTOMATION_SPEED];
+ if( !old_speeds || !new_speeds ) continue;
+ FloatAuto *old_speed = (FloatAuto *)old_speeds->first;
+ FloatAuto *new_speed = (FloatAuto *)new_speeds->first;
+ while( old_speed && new_speed && old_speed->equals(new_speed) ) {
+ old_speed = (FloatAuto *)old_speed->next;
+ new_speed = (FloatAuto *)new_speed->next;
+ }
+ Edit *old_edit = old_track->edits->first;
+ Edit *new_edit = new_track->edits->first;
+ for( ; old_edit && new_edit; old_edit=old_edit->next, new_edit=new_edit->next ) {
+ int64_t edit_start = old_edit->startproject, edit_end = edit_start + old_edit->length;
+ if( old_speed || new_speed ) {
+ double orig_start = old_speeds->automation_integral(0, edit_start, PLAY_FORWARD);
+ double orig_end = old_speeds->automation_integral(0, edit_end, PLAY_FORWARD);
+ edit_start = new_speeds->speed_position(orig_start);
+ edit_end = new_speeds->speed_position(orig_end);
+ result = 1;
+ }
+ new_edit->startproject = edit_start;
+ new_edit->length = edit_end - edit_start;
+ }
+ }
+ return result;
+}
+
+void MWindow::speed_before()
+{
+ if( !speed_edl ) {
+ speed_edl = new EDL;
+ speed_edl->create_objects();
+ }
+ speed_edl->copy_all(edl);
+}
+
+int MWindow::speed_after(int done)
+{
+ int result = 0;
+ if( speed_edl && done >= 0 )
+ result = normalize_speed(speed_edl, edl);
+ if( done ) {
+ speed_edl->remove_user();
+ speed_edl = 0;
+ }
+ return result;
+}
projects / goodguy / history.git / blobdiff