X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrack.C;h=5c07480e249799bbc242512d11764591a357cc6e;hp=a565c1fbfe91845ea95f2adef0d509699351616e;hb=ddfda6a8cc59bda4dc734973c1c5fecaa31ea487;hpb=48a6854a1ca58aa291ffc6fe3a48807492dfbef7 diff --git a/cinelerra-5.1/cinelerra/track.C b/cinelerra-5.1/cinelerra/track.C index a565c1fb..5c07480e 100644 --- a/cinelerra-5.1/cinelerra/track.C +++ b/cinelerra-5.1/cinelerra/track.C @@ -250,27 +250,28 @@ double Track::get_length() int Track::has_speed() { FloatAutos *autos = (FloatAutos*)automation->autos[AUTOMATION_SPEED]; - if(autos) - { - if(autos->first) - { - for(FloatAuto *current = (FloatAuto*)autos->first; - current; - current = (FloatAuto*)current->next) - { - if(!EQUIV(current->get_value(), 1.0) || - !EQUIV(current->get_control_in_value(), 0.0) || - !EQUIV(current->get_control_out_value(), 0.0)) - { - return 1; - } - } + if( autos ) { + FloatAuto *current = (FloatAuto*)autos->first; + for( ; current; current=(FloatAuto*)current->next ) { + if( !EQUIV(current->get_value(0), 1.0) || + !EQUIV(current->get_control_in_value(), 0.0) || + !EQUIV(current->get_control_out_value(), 0.0)) + return 1; + if( current->curve_mode == FloatAuto::BUMP && + !EQUIV(current->get_value(1), 1.0) ) + return 1; } } - return 0; } +int64_t Track::speed_length(int64_t start, int64_t end) +{ + if( !has_speed() ) return end - start; + FloatAutos *speeds = (FloatAutos *) automation->autos[AUTOMATION_SPEED]; + return speeds->automation_integral(start, end-start, PLAY_FORWARD); +} + int Track::show_assets() { return expand_view || edl->session->show_assets ? 1 : 0; @@ -480,90 +481,17 @@ void Track::insert_plugin_set(Track *track, shift_effects(position, min_length, edit_autos, 0); } - -Plugin* Track::insert_effect(const char *title, - SharedLocation *shared_location, - KeyFrame *default_keyframe, - PluginSet *plugin_set, - double start, - double length, - int plugin_type) +Plugin* Track::insert_effect(const char *title, SharedLocation *shared_location, + KeyFrame *default_keyframe, PluginSet *plugin_set, + double start, double length, int plugin_type) { - if(!plugin_set) - { + if( !plugin_set ) { plugin_set = new PluginSet(edl, this); this->plugin_set.append(plugin_set); } - - Plugin *plugin = 0; - -// Position is identical to source plugin - if(plugin_type == PLUGIN_SHAREDPLUGIN) - { - Track *source_track = tracks->get_item_number(shared_location->module); - if(source_track) - { - Plugin *source_plugin = source_track->get_current_plugin( - edl->local_session->get_selectionstart(1), - shared_location->plugin, - PLAY_FORWARD, - 1, - 0); - -// From an attach operation - if(source_plugin) - { - plugin = plugin_set->insert_plugin(title, - source_plugin->startproject, - source_plugin->length, - plugin_type, - shared_location, - default_keyframe, - 1); - } - else -// From a drag operation - { - plugin = plugin_set->insert_plugin(title, - to_units(start, 0), - to_units(length, 1), - plugin_type, - shared_location, - default_keyframe, - 1); - } - } - } - else - { -// This should be done in the caller - if(EQUIV(length, 0)) - { - if(edl->local_session->get_selectionend() > - edl->local_session->get_selectionstart()) - { - start = edl->local_session->get_selectionstart(); - length = edl->local_session->get_selectionend() - start; - } - else - { - start = 0; - length = get_length(); - } - } -//printf("Track::insert_effect %f %f %d %d\n", start, length, to_units(start, 0), -// to_units(length, 0)); - - plugin = plugin_set->insert_plugin(title, - to_units(start, 0), - to_units(length, 1), - plugin_type, - shared_location, - default_keyframe, - 1); - } -//printf("Track::insert_effect 2 %f %f\n", start, length); - + Plugin *plugin = plugin_set->insert_plugin(title, + to_units(start, 0), to_units(length, 1), plugin_type, + shared_location, default_keyframe, 1); expand_view = 1; return plugin; } @@ -641,8 +569,7 @@ void Track::remove_pluginset(PluginSet *plugin_set) if(plugin_set == this->plugin_set.values[i]) break; this->plugin_set.remove_object(plugin_set); - for(i++ ; i < this->plugin_set.total; i++) - { + for( ++i ; i<=this->plugin_set.total; ++i ) { SharedLocation old_location, new_location; new_location.module = old_location.module = tracks->number_of(this); old_location.plugin = i; @@ -668,26 +595,54 @@ void Track::shift_effects(int64_t position, int64_t length, int edit_autos, Edit void Track::detach_effect(Plugin *plugin) { //printf("Track::detach_effect 1\n"); - for(int i = 0; i < plugin_set.total; i++) - { - PluginSet *plugin_set = this->plugin_set.values[i]; - for(Plugin *dest = (Plugin*)plugin_set->first; - dest; - dest = (Plugin*)dest->next) - { - if(dest == plugin) - { - int64_t start = plugin->startproject; - int64_t end = plugin->startproject + plugin->length; - - plugin_set->clear(start, end, 1); - optimize(); + for( int i=0; ifirst; + while( dest && dest != plugin ) dest = (Plugin*)dest->next; + if( !dest ) continue; + tracks->detach_ganged_effects(plugin); + int64_t start = plugin->startproject; + int64_t end = start + plugin->length; + pluginset->clear(start, end, 1); + optimize(); //printf("Track::detach_effect 2 %d\n", plugin_set->length()); // Delete 0 length pluginsets - return; - } + return; + } +} + +void Track::detach_shared_effects(int module) +{ + for( int i=0; iplugin_set[i]; + Plugin *dest = (Plugin*)pluginset->first; + for( ; dest; dest=(Plugin*)dest->next ) { + if( (dest->plugin_type != PLUGIN_SHAREDPLUGIN && + dest->plugin_type != PLUGIN_SHAREDMODULE) ) continue; + if( dest->shared_location.module != module ) continue; + int64_t start = dest->startproject; + int64_t end = start + dest->length; + pluginset->clear(start, end, 1); } } + optimize(); +} + +void Track::detach_ganged_effects(Plugin *plugin) +{ + for( int i=0; iplugin_set[i]; + Plugin *dest = (Plugin*)pluginset->first; + for( ; dest; dest=(Plugin*)dest->next ) { + if( strcmp(dest->title, plugin->title) != 0 ) continue; + if( dest->startproject != plugin->startproject ) continue; + if( dest->length != plugin->length ) continue; + int64_t start = dest->startproject; + int64_t end = start + dest->length; + pluginset->clear(start, end, 1); + } + } + optimize(); } void Track::resample(double old_rate, double new_rate) @@ -699,25 +654,6 @@ void Track::resample(double old_rate, double new_rate) nudge = (int64_t)(nudge * new_rate / old_rate); } -void Track::detach_shared_effects(int module) -{ - for(int i = 0; i < plugin_set.size(); i++) { - PluginSet *plugin_set = this->plugin_set.get(i); - for(Plugin *dest = (Plugin*)plugin_set->first; dest; ) { - if( (dest->plugin_type == PLUGIN_SHAREDPLUGIN || - dest->plugin_type == PLUGIN_SHAREDMODULE) && - dest->shared_location.module == module ) { - int64_t start = dest->startproject; - int64_t end = dest->startproject + dest->length; - plugin_set->clear(start, end, 1); - } - - if(dest) dest = (Plugin*)dest->next; - } - } - optimize(); -} - void Track::optimize() { @@ -930,18 +866,16 @@ 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(FileXML *file, + double selectionstart, double src_length, double src_rate, + int default_only, int active_only) { // Only used for pasting automation alone. - double scale = data_type == TRACK_AUDIO ? - edl->session->sample_rate / sample_rate : - edl->session->frame_rate / frame_rate ; - - total_length *= scale; - int64_t start = to_units(selectionstart, 0); - int64_t length = to_units(total_length, 1); + double dst_rate = data_type == TRACK_AUDIO ? + edl->session->sample_rate : edl->session->frame_rate; + double scale = dst_rate / src_rate; + int64_t start = to_units(selectionstart, 1); + int64_t length = to_units(selectionstart + src_length, 1) - start; int result = 0; int current_pluginset = 0; //printf("Track::paste_automation 1\n"); @@ -1120,6 +1054,8 @@ int Track::clear(int64_t start, int64_t end, int edit_edits, int edit_labels, int edit_plugins, int edit_autos, Edits *trim_edits) { + if( edit_edits ) + edits->clear(start, end); //printf("Track::clear 1 %d %d %d\n", edit_edits, edit_labels, edit_plugins); if( edit_autos ) automation->clear(start, end, 0, 1); @@ -1130,8 +1066,6 @@ int Track::clear(int64_t start, int64_t end, plugin_set.values[i]->clear(start, end, edit_keyframes); } } - if( edit_edits ) - edits->clear(start, end); return 0; } @@ -1856,19 +1790,11 @@ void Track::set_camera(float x, float y, float z) set_fauto_xyz(AUTOMATION_CAMERA_X, x, y, z); } -Track *Track::gang_master() -{ - if( edl->session->gang_tracks == GANG_NONE ) return this; - Track *track = this; - while( track && !track->master ) track = track->previous; - return !track ? tracks->first : track; -} - int Track::is_hidden() { if( master ) return 0; - if( edl->session->gang_tracks == GANG_MEDIA ) return 1; - if( edl->session->gang_tracks == GANG_CHANNELS ) { + if( edl->local_session->gang_tracks == GANG_MEDIA ) return 1; + if( edl->local_session->gang_tracks == GANG_CHANNELS ) { for( Track *track=previous; track; track=track->previous ) { if( track->data_type == data_type ) return 1; if( track->master ) return 0; @@ -1876,19 +1802,54 @@ int Track::is_hidden() } return 0; } + +Track *Track::gang_master() +{ + Track *track = this; + switch( edl->local_session->gang_tracks ) { + case GANG_NONE: + return track; + case GANG_CHANNELS: { + Track *current = track; + int data_type = track->data_type; + while( current && !current->master ) { + if( !(current = current->previous) ) break; + if( current->data_type == data_type ) track = current; + } + break; } + case GANG_MEDIA: { + while( track && !track->master ) track = track->previous; + break; } + } + if( !track ) track = tracks->first; + return track; +} + +int Track::in_gang(Track *track) +{ + if( edl->local_session->gang_tracks == GANG_NONE ) return ganged; + Track *current = this; + while( current && !current->master ) current = current->previous; + while( track && !track->master ) track = track->previous; + return current == track ? 1 : 0; +} + int Track::is_armed() { - return gang_master()->armed; + return armed && gang_master()->armed; } + int Track::is_ganged() { - return gang_master()->ganged; + return ganged && gang_master()->ganged; } int Track::armed_gang(Track *track) { - if( edl->session->gang_tracks == GANG_NONE ) return ganged; + if( !track->ganged ) return 0; + if( edl->local_session->gang_tracks == GANG_NONE ) return ganged; Track *current = gang_master(); + if( !current->ganged ) return 0; for(;;) { if( track == current ) return 1; current = current->next; @@ -1897,6 +1858,10 @@ int Track::armed_gang(Track *track) return 1; } +int Track::plays() +{ + return play && gang_master()->play; +} int Track::index_in(Mixer *mixer) { @@ -1906,3 +1871,15 @@ int Track::index_in(Mixer *mixer) return k; } +void Track::create_keyframes(double position, int mask, int mode) +{ + for( int idx=0; idx>=1,++idx ) { + if( !(mask & 1) ) continue; + Autos *autos = automation->autos[idx]; + if( !autos ) continue; + FloatAuto *float_auto = (FloatAuto *) + autos->get_auto_for_editing(position, -1); + float_auto->change_curve_mode((FloatAuto::t_mode)mode, 0); + } +} +