X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrack.C;h=91bf401afb22a675bd22c2092aec9927a01f2a1e;hp=6bebe819d2f61d5fa762d776fe294c672337cd86;hb=04293346a5ef49683cfa6ca3a98ef6cbfcdf7732;hpb=6050493632cb3681227b7ec8c12decd449dcf66f diff --git a/cinelerra-5.1/cinelerra/track.C b/cinelerra-5.1/cinelerra/track.C index 6bebe819..91bf401a 100644 --- a/cinelerra-5.1/cinelerra/track.C +++ b/cinelerra-5.1/cinelerra/track.C @@ -33,6 +33,7 @@ #include "keyframe.h" #include "labels.h" #include "localsession.h" +#include "maskauto.h" #include "module.h" #include "patch.h" #include "patchbay.h" @@ -67,6 +68,7 @@ Track::Track(EDL *edl, Tracks *tracks) : ListItem() track_h = edl->session->output_h; id = EDL::next_id(); mixer_id = -1; + masks = (1<play = track->play; this->track_w = track->track_w; this->track_h = track->track_h; + this->masks = track->masks; strcpy(this->title, track->title); return 0; } @@ -163,31 +166,17 @@ void Track::equivalent_output(Track *track, double *result) } -int Track::is_synthesis(int64_t position, - int direction) +int Track::is_synthesis(int64_t position, int direction, int depth) { - int is_synthesis = 0; - for(int i = 0; i < plugin_set.total; i++) - { - Plugin *plugin = get_current_plugin(position, - i, - direction, - 0, - 0); - if(plugin) - { + int result = 0; + for( int i = 0; !result && iplugin_type == PLUGIN_SHAREDMODULE) - is_synthesis = 1; - else - is_synthesis = plugin->is_synthesis(position, - direction); - -//printf("Track::is_synthesis %d %d\n", __LINE__, is_synthesis); - if(is_synthesis) break; - } + result = plugin->plugin_type == PLUGIN_SHAREDMODULE ? 1 : + plugin->is_synthesis(position, direction, depth); } - return is_synthesis; + return result; } void Track::copy_from(Track *track) @@ -334,6 +323,7 @@ int Track::load(FileXML *file, int track_offset, uint32_t load_flags) expand_view = file->tag.get_property("EXPAND", expand_view); track_w = file->tag.get_property("TRACK_W", track_w); track_h = file->tag.get_property("TRACK_H", track_h); + masks = file->tag.get_property("MASKS", masks); load_header(file, load_flags); @@ -850,46 +840,22 @@ void Track::synchronize_params(Track *track) } - - - int Track::dump(FILE *fp) { - fprintf(fp," Data type %d\n", data_type); + fprintf(fp," Data type %d, draw %d, gang %d, play %d, record %d, nudge %jd, masks 0x%04x\n", + data_type, draw, gang, play, record, nudge, masks); fprintf(fp," Title %s\n", title); fprintf(fp," Edits:\n"); for(Edit* current = edits->first; current; current = NEXT) - { current->dump(fp); - } automation->dump(fp); fprintf(fp," Plugin Sets: %d\n", plugin_set.total); - for(int i = 0; i < plugin_set.total; i++) - plugin_set.values[i]->dump(fp); -//printf("Track::dump 2\n"); + for( int i=0; idump(fp); return 0; } - - - - - - - - - - - - - - - - - - - Track::Track() : ListItem() { @@ -973,56 +939,37 @@ int Track::copy_automation(double selectionstart, return 0; } -int Track::paste_automation(double selectionstart, - double total_length, - double frame_rate, - int64_t sample_rate, - FileXML *file, - int default_only, - int active_only) +int Track::paste_automation(double selectionstart, double total_length, + double frame_rate, int64_t sample_rate, + FileXML *file, int default_only, int active_only) { // Only used for pasting automation alone. - int64_t start; - int64_t length; - int result; - double scale; - int current_pluginset; - - if(data_type == TRACK_AUDIO) - scale = edl->session->sample_rate / sample_rate; - else - scale = edl->session->frame_rate / frame_rate; + double scale = data_type == TRACK_AUDIO ? + edl->session->sample_rate / sample_rate : + edl->session->frame_rate / frame_rate ; total_length *= scale; - start = to_units(selectionstart, 0); - length = to_units(total_length, 1); - result = 0; - current_pluginset = 0; + int64_t start = to_units(selectionstart, 0); + int64_t length = to_units(total_length, 1); + int result = 0; + int current_pluginset = 0; //printf("Track::paste_automation 1\n"); - while(!result) - { - result = file->read_tag(); - - if(!result) - { - if(file->tag.title_is("/TRACK")) - result = 1; - else - if(automation->paste(start, length, scale, file, - default_only, active_only, 0)) {} - else if(file->tag.title_is("PLUGINSET")) { - if(current_pluginset < plugin_set.total) { - plugin_set.values[current_pluginset]-> - paste_keyframes(start, length, file, + while( !(result = file->read_tag()) ) { + if( file->tag.title_is("/TRACK") ) break; + if( automation->paste(start, length, scale, file, + default_only, active_only, 0) ) + continue; + if( file->tag.title_is("PLUGINSET") ) { + if( current_pluginset < plugin_set.total ) { + plugin_set.values[current_pluginset]-> + paste_keyframes(start, length, file, default_only, active_only); - current_pluginset++; - } + ++current_pluginset; } } } - return 0; } @@ -1080,6 +1027,7 @@ int Track::copy(int copy_flags, double start, double end, file->tag.set_property("EXPAND", expand_view); file->tag.set_property("TRACK_W", track_w); file->tag.set_property("TRACK_H", track_h); + file->tag.set_property("MASKS", masks); save_header(file); file->append_tag(); file->append_newline(); @@ -1161,7 +1109,7 @@ int Track::blade(double position) { int64_t start = to_units(position, 0); Edit *edit = edits->split_edit(start); - if( !edit ) return 1; + if( !edit || edit->silence() ) return 1; edit->hard_left = 1; if( edit->previous ) edit->previous->hard_right = 1; return 0; @@ -1707,64 +1655,63 @@ void Track::reverse_edits(double start, double end, int first_track) } } -void Track::align_edits(double start, - double end, - ArrayList *times) +void Track::align_edits(double start, double end, Track *master_track) { int64_t start_units = to_units(start, 0); int64_t end_units = to_units(end, 0); -// If 1st track with data, times is empty & we need to collect the edit times. - if(!times->size()) - { - for(Edit *current = edits->first; current; current = NEXT) - { - if(current->startproject >= start_units && - current->startproject + current->length <= end_units) - { - times->append(from_units(current->startproject)); - } - } - } - else // All other tracks get silence or cut to align the edits on the times. - { - int current_time = 0; - for(Edit *current = edits->first; - current && current_time < times->size(); ) - { - if(current->startproject >= start_units && - current->startproject + current->length <= end_units) - { - int64_t desired_startunits = to_units(times->get(current_time), 0); - int64_t current_startunits = current->startproject; + Edit *master = master_track->edits->first; + for(Edit *current = edits->first; current && master; ) { + if( current->startproject >= start_units && + current->startproject + current->length <= end_units ) { +// edit is in highlighted region + int64_t master_length_units = to_units(master_track->from_units(master->length), 0); +// starting time of master edit + int64_t master_start_units = to_units(master_track->from_units(master->startproject), 0); +// starting time of current edit + int64_t current_startunits = current->startproject; + +// the following occur if multiple aligns are performed +// master edit is not silence but current edit is silence + if( !master->silence() && current->silence() ) { +// try again with next edit current = NEXT; + continue; + } + if( master->silence() && !current->silence() ) { +// master edit is silence but current edit is not silence + master = master->next; + continue; + } + if( current->length < master_length_units / 2 ) { +// current edit is a glitch edit between 2 required edits + current = NEXT; + continue; + } - - if(current_startunits < desired_startunits) - { + current = NEXT; +// current edit starts before master edit + if( current_startunits < master_start_units ) { //printf("Track::align_edits %d\n", __LINE__); - edits->paste_silence(current_startunits, - desired_startunits); - shift_keyframes(current_startunits, - desired_startunits - current_startunits); - } - else - if(current_startunits > desired_startunits) - { - edits->clear(desired_startunits, - current_startunits); - if(edl->session->autos_follow_edits) - shift_keyframes(desired_startunits, - current_startunits - desired_startunits); - } - - current_time++; + edits->paste_silence(current_startunits, master_start_units); + shift_keyframes(current_startunits, + master_start_units - current_startunits); } - else - { - current = NEXT; + else if( current_startunits > master_start_units ) { +// current edit starts after master edit + edits->clear(master_start_units, + current_startunits); + if(edl->session->autos_follow_edits) + shift_keyframes(master_start_units, + current_startunits - master_start_units); } + + master = master->next; + } + else { + current = NEXT; + master = master->next; } } @@ -1882,3 +1829,42 @@ int Track::get_mixer_id() return mixer_id; } +void Track::get_fauto_xyz(int fauto, float &x, float &y, float &z) +{ + FloatAutos **fautos = (FloatAutos **)&automation->autos; + FloatAuto *xauto = (FloatAuto *)fautos[fauto+0]->get_auto_for_editing(-1, 1); + if( xauto ) x = xauto->get_value(); + FloatAuto *yauto = (FloatAuto *)fautos[fauto+1]->get_auto_for_editing(-1, 1); + if( yauto ) y = yauto->get_value(); + FloatAuto *zauto = (FloatAuto *)fautos[fauto+2]->get_auto_for_editing(-1, 1); + if( zauto ) z = zauto->get_value(); +} +void Track::set_fauto_xyz(int fauto, float x, float y, float z) +{ + FloatAutos **fautos = (FloatAutos **)&automation->autos; + FloatAuto *xauto = (FloatAuto *)fautos[fauto+0]->get_auto_for_editing(-1, 1); + if( xauto ) xauto->set_value(x); + FloatAuto *yauto = (FloatAuto *)fautos[fauto+1]->get_auto_for_editing(-1, 1); + if( yauto ) yauto->set_value(y); + FloatAuto *zauto = (FloatAuto *)fautos[fauto+2]->get_auto_for_editing(-1, 1); + if( zauto ) zauto->set_value(z); +} + +void Track::get_projector(float &x, float &y, float &z) +{ + get_fauto_xyz(AUTOMATION_PROJECTOR_X, x, y, z); +} +void Track::set_projector(float x, float y, float z) +{ + set_fauto_xyz(AUTOMATION_PROJECTOR_X, x, y, z); +} + +void Track::get_camera(float &x, float &y, float &z) +{ + get_fauto_xyz(AUTOMATION_CAMERA_X, x, y, z); +} +void Track::set_camera(float x, float y, float z) +{ + set_fauto_xyz(AUTOMATION_CAMERA_X, x, y, z); +} +