edl->session->aspect_h,
w, h);
- for( Track *current = edl->tracks->first; current; current = NEXT ) {
+ for( Track *current=edl->tracks->first; current; current=NEXT ) {
if( current->data_type == TRACK_VIDEO /* &&
current->record */ ) {
current->track_w = w;
if( start == end ) return 1;
FileXML file;
- edl->copy(start, end, 0, 0, 0, &file, "", 1);
+ edl->copy(start, end, 0, &file, "", 1);
const char *file_string = file.string();
long file_length = strlen(file_string);
gui->to_clipboard(file_string, file_length, BC_PRIMARY_SELECTION);
edl->optimize();
save_backup();
- undo->update_undo_after(_("cut"), LOAD_EDITS | LOAD_TIMEBAR);
+ undo->update_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);
cwindow->refresh_frame(CHANGE_EDL);
}
-void MWindow::snap_left_edit()
+void MWindow::cut_left_edit()
{
double start_pos = edl->local_session->get_selectionstart(1);
double position = edl->prev_edit(start_pos);
cut(position, start_pos, position);
}
-void MWindow::snap_right_edit()
+void MWindow::cut_right_edit()
{
double end_pos = edl->local_session->get_selectionend(1);
double position = edl->next_edit(end_pos);
cut(end_pos, position, end_pos);
}
-void MWindow::snap_left_label()
+void MWindow::cut_left_label()
{
double start_pos = edl->local_session->get_selectionstart(1);
Label *left_label = edl->labels->prev_label(start_pos);
cut(position, start_pos, position);
}
-void MWindow::snap_right_label()
+void MWindow::cut_right_label()
{
double end_pos = edl->local_session->get_selectionend(1);
Label *right_label = edl->labels->next_label(end_pos);
}
-void MWindow::delete_inpoint()
-{
- edl->local_session->unset_inpoint();
- save_backup();
-}
-
-void MWindow::delete_outpoint()
-{
- edl->local_session->unset_outpoint();
- save_backup();
-}
-
-
void MWindow::delete_track()
{
if( edl->tracks->last )
undo->update_undo_before();
- for( int i = 0; i < session->drag_pluginservers->total; i++ ) {
+ for( int i=0; i<session->drag_pluginservers->total; ++i ) {
PluginServer *plugin = session->drag_pluginservers->values[i];
insert_effect(plugin->title, 0, dest_track,
i == 0 ? session->pluginset_highlighted : 0,
edl->local_session->get_selectionstart();
}
- for( int i = 0; i < session->drag_pluginservers->total; i++ ) {
+ for( int i=0; i<session->drag_pluginservers->total; ++i ) {
PluginServer *plugin = session->drag_pluginservers->values[i];
insert_effect(plugin->title, 0, dest_track, 0,
start, length, PLUGIN_STANDALONE);
SharedLocation shared_location_local;
shared_location_local.copy_from(shared_location);
int first_track = 1;
- for( ; current; current = NEXT) {
+ for( ; current; current=NEXT ) {
if( current->data_type == data_type &&
current->record ) {
insert_effect(title, &shared_location_local,
}
-void MWindow::overwrite(EDL *source)
+void MWindow::overwrite(EDL *source, int all)
{
FileXML file;
- double src_start = source->local_session->get_selectionstart();
- double overwrite_len = source->local_session->get_selectionend() - src_start;
+ double src_start = all ? 0 :
+ source->local_session->get_selectionstart();
+ double overwrite_len = all ? source->tracks->total_length() :
+ source->local_session->get_selectionend() - src_start;
double dst_start = edl->local_session->get_selectionstart();
double dst_len = edl->local_session->get_selectionend() - dst_start;
overwrite_len = dst_len;
}
- source->copy(src_start, src_start + overwrite_len,
- 0, 0, 0, &file, "", 1);
+ source->copy(src_start, src_start + overwrite_len, 0, &file, "", 1);
// HACK around paste_edl get_start/endselection on its own
// so we need to clear only when not using both io points
if( position < 0 ) position = edl->local_session->get_selectionstart();
ArrayList<EDL*> new_edls;
- for( int i = 0; i < new_assets->total; i++ ) {
+ for( int i=0; i<new_assets->total; ++i ) {
Indexable *indexable = new_assets->get(i);
if( indexable->is_asset ) {
remove_asset_from_caches((Asset*)indexable);
new_edl->copy_session(edl);
new_edls.append(new_edl);
-
- if( indexable->is_asset ) {
-if( debug ) printf("MWindow::load_assets %d\n", __LINE__);
-if( debug ) ((Asset*)indexable)->dump();
- asset_to_edl(new_edl, (Asset*)indexable);
+ if( !indexable->is_asset ) {
+ EDL *nested_edl = (EDL*)indexable;
+ new_edl->to_nested(nested_edl);
+ new_edl->local_session->set_clip_path(nested_edl);
+ }
+ else {
+ Asset *asset = (Asset*)indexable;
+ asset_to_edl(new_edl, asset);
}
- else
- edl_to_nested(new_edl, (EDL*)indexable);
-if( debug ) printf("MWindow::load_assets %d\n", __LINE__);
-
if( labels ) {
- for( RecordLabel *label = labels->first; label; label = label->next ) {
+ for( RecordLabel *label=labels->first; label; label=label->next ) {
new_edl->labels->toggle_label(label->position, label->position);
}
}
if( debug ) printf("MWindow::load_assets %d\n", __LINE__);
save_backup();
- for( int i = 0; i < new_edls.size(); i++ )
+ for( int i=0; i<new_edls.size(); ++i )
new_edls.get(i)->Garbage::remove_user();
if( debug ) printf("MWindow::load_assets %d\n", __LINE__);
load_mode == LOADMODE_NEW_TRACKS ) {
need_new_tracks = 1;
- for( int i = 0; i < new_edls->total; i++ ) {
+ for( int i=0; i<new_edls->total; ++i ) {
EDL *new_edl = new_edls->values[i];
- for( Track *current = new_edl->tracks->first;
- current;
- current = NEXT ) {
- if( current->data_type == TRACK_VIDEO ) {
+ for( Track *current=new_edl->tracks->first; current; current=NEXT ) {
+ switch( current->data_type ) {
+ case TRACK_VIDEO:
edl->tracks->add_video_track(0, 0);
if( current->draw ) edl->tracks->last->draw = 1;
- destination_tracks.append(edl->tracks->last);
- }
- else
- if( current->data_type == TRACK_AUDIO ) {
+ break;
+ case TRACK_AUDIO:
edl->tracks->add_audio_track(0, 0);
- destination_tracks.append(edl->tracks->last);
- }
- else
- if( current->data_type == TRACK_SUBTITLE ) {
+ break;
+ case TRACK_SUBTITLE:
edl->tracks->add_subttl_track(0, 0);
- destination_tracks.append(edl->tracks->last);
+ break;
+ default:
+ continue;
}
- edl->session->highlighted_track = edl->tracks->total() - 1;
+ destination_tracks.append(edl->tracks->last);
}
// Base track count on first EDL only for concatenation
if( load_mode == LOADMODE_REPLACE_CONCATENATE ) break;
}
-
+ edl->session->highlighted_track = edl->tracks->total() - 1;
}
else
// Recycle existing tracks of master EDL
// then be shifted back to their original locations without recursively
// shifting back every paste.
if( (load_mode == LOADMODE_PASTE || load_mode == LOADMODE_NESTED) &&
- edl->session->labels_follow_edits )
+ edl->session->labels_follow_edits )
edl->labels->clear(edl->local_session->get_selectionstart(),
- edl->local_session->get_selectionend(),
- 1);
+ edl->local_session->get_selectionend(), 1);
Track *current = first_track ? first_track : edl->tracks->first;
- for( ; current; current = NEXT) {
+ for( ; current; current=NEXT ) {
if( current->record ) {
destination_tracks.append(current);
}
double *paste_position = new double[destination_tracks.total];
// Iterate through the edls
- for( int i = 0; i < new_edls->total; i++ ) {
+ for( int i=0; i<new_edls->total; ++i ) {
EDL *new_edl = new_edls->values[i];
double edl_length = new_edl->local_session->clipboard_length ?
TRACK_VIDEO);
//PRINT_TRACE
// Add assets and prepare index files
- for( Asset *new_asset = new_edl->assets->first;
- new_asset;
- new_asset = new_asset->next ) {
+ for( Asset *new_asset=new_edl->assets->first;
+ new_asset; new_asset=new_asset->next ) {
mainindexes->add_next_asset(0, new_asset);
}
// Capture index file status from mainindex test
case LOADMODE_NESTED:
destination_track = 0;
if( i == 0 ) {
- for( int j = 0; j < destination_tracks.total; j++ ) {
+ for( int j=0; j<destination_tracks.total; ++j ) {
paste_position[j] = (current_position >= 0) ?
current_position :
edl->local_session->get_selectionstart();
edit_labels);
//PRINT_TRACE
- for( Track *new_track = new_edl->tracks->first;
- new_track;
- new_track = new_track->next ) {
+ for( Track *new_track=new_edl->tracks->first;
+ new_track; new_track=new_track->next ) {
// Get destination track of same type as new_track
for( int k = 0;
- k < destination_tracks.total &&
- destination_tracks.values[destination_track]->data_type != new_track->data_type;
- k++, destination_track++ ) {
+ k < destination_tracks.total &&
+ destination_tracks.values[destination_track]->data_type != new_track->data_type;
+ ++k, ++destination_track ) {
if( destination_track >= destination_tracks.total - 1 )
destination_track = 0;
}
// strange issue, for index not being shown
// Assume any paste operation from the same EDL won't contain any clips.
// If it did it would duplicate every clip here.
- for( int i = 0; i < new_edls->total; i++ ) {
- EDL *new_edl = new_edls->values[i];
+ for( int i=0; i<new_edls->total; ++i ) {
+ EDL *new_edl = new_edls->get(i);
- for( int j = 0; j < new_edl->clips.total; j++ ) {
- edl->add_clip(new_edl->clips.values[j]);
+ for( int j=0; j<new_edl->clips.size(); ++j ) {
+ 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]);
}
if( new_edl->total_vwindow_edls() ) {
// edl->vwindow_edl->create_objects();
// edl->vwindow_edl->copy_all(new_edl->vwindow_edl);
- for( int j = 0; j < new_edl->total_vwindow_edls(); j++ ) {
+ for( int j=0; j<new_edl->total_vwindow_edls(); ++j ) {
EDL *vwindow_edl = new EDL(edl);
vwindow_edl->create_objects();
vwindow_edl->copy_all(new_edl->get_vwindow_edl(j));
{
calling_window_gui->unlock_window();
stop_playback(0);
- close_mixers();
+ if( undo->redo_load_flags() & LOAD_SESSION )
+ close_mixers();
cwindow->gui->lock_window("MWindow::redo_entry 1");
- for( int i = 0; i < vwindows.size(); i++ ) {
+ for( int i=0; i<vwindows.size(); ++i ) {
if( vwindows.get(i)->is_running() ) {
if( calling_window_gui != vwindows.get(i)->gui ) {
vwindows.get(i)->gui->lock_window("MWindow::redo_entry 2");
cwindow->update(1, 1, 1, 1, 1);
cwindow->gui->unlock_window();
- for( int i = 0; i < vwindows.size(); i++ ) {
+ for( int i=0; i < vwindows.size(); ++i ) {
if( vwindows.get(i)->is_running() ) {
if( calling_window_gui != vwindows.get(i)->gui ) {
vwindows.get(i)->gui->unlock_window();
if( calling_window_gui != gui )
gui->unlock_window();
- open_mixers();
awindow->gui->async_update_assets();
cwindow->refresh_frame(CHANGE_ALL);
}
}
-void MWindow::splice(EDL *source)
+void MWindow::unset_inoutpoint(int is_mwindow)
+{
+ undo->update_undo_before();
+ edl->unset_inoutpoint();
+ save_backup();
+ undo->update_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->timebar->update(1);
+ if( is_mwindow ) {
+ cwindow->gui->unlock_window();
+ }
+}
+
+void MWindow::splice(EDL *source, int all)
{
FileXML file;
undo->update_undo_before();
- double source_start = source->local_session->get_selectionstart();
- double source_end = source->local_session->get_selectionend();
- source->copy(source_start, source_end, 1, 0, 0, &file, "", 1);
+ double source_start = all ? 0 :
+ source->local_session->get_selectionstart();
+ double source_end = all ? source->tracks->total_length() :
+ source->local_session->get_selectionend();
+ source->copy(source_start, source_end, 1, &file, "", 1);
//file.dump();
double start = edl->local_session->get_selectionstart();
//double end = edl->local_session->get_selectionend();
}
time_t now; time(&now);
- struct tm *tm = localtime(&now);
+ struct tm dtm; localtime_r(&now, &dtm);
char *cp = new_edl->local_session->clip_notes;
int n, sz = sizeof(new_edl->local_session->clip_notes)-1;
if( txt && *txt ) {
}
n = snprintf(cp, sz,
"%02d/%02d/%02d %02d:%02d:%02d, +%s\n",
- tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
- tm->tm_hour, tm->tm_min, tm->tm_sec, duration);
+ 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 ) {
FileSystem fs;
cp += n; sz -= n;
}
cp[n] = 0;
-
+ sprintf(new_edl->local_session->clip_icon,
+ "clip_%02d%02d%02d-%02d%02d%02d.png",
+ dtm.tm_year+1900, dtm.tm_mon+1, dtm.tm_mday,
+ dtm.tm_hour, dtm.tm_min, dtm.tm_sec);
edl->update_assets(new_edl);
int cur_x, cur_y;
gui->get_abs_cursor(cur_x, cur_y, 0);
gui->unlock_window();
awindow->clip_edit->create_clip(new_edl, cur_x, cur_y);
+ new_edl->remove_user();
gui->lock_window("MWindow::save_clip");
save_backup();
}
-void MWindow::to_clip(EDL *edl, const char *txt)
+void MWindow::to_clip(EDL *edl, const char *txt, int all)
{
FileXML file;
double start, end;
gui->lock_window("MWindow::to_clip 1");
- start = edl->local_session->get_selectionstart();
- end = edl->local_session->get_selectionend();
+ start = all ? 0 :
+ edl->local_session->get_selectionstart();
+ end = all ? edl->tracks->total_length() :
+ edl->local_session->get_selectionend();
if( EQUIV(end, start) ) {
start = 0;
}
// Don't copy all since we don't want the clips twice.
- edl->copy(start, end, 0, 0, 0, &file, "", 1);
+ edl->copy(start, end, 0, &file, "", 1);
EDL *new_edl = new EDL(edl);
new_edl->create_objects();
{
calling_window_gui->unlock_window();
stop_playback(0);
- close_mixers();
+ if( undo->undo_load_flags() & LOAD_SESSION )
+ close_mixers();
cwindow->gui->lock_window("MWindow::undo_entry 1");
- for( int i = 0; i < vwindows.size(); i++ ) {
+ for( int i=0; i<vwindows.size(); ++i ) {
if( vwindows.get(i)->is_running() ) {
if( calling_window_gui != vwindows.get(i)->gui ) {
vwindows.get(i)->gui->lock_window("MWindow::undo_entry 4");
cwindow->update(1, 1, 1, 1, 1);
cwindow->gui->unlock_window();
- for( int i = 0; i < vwindows.size(); i++ ) {
+ for( int i=0; i<vwindows.size(); ++i ) {
if( vwindows.get(i)->is_running() ) {
if( calling_window_gui != vwindows.get(i)->gui ) {
vwindows.get(i)->gui->unlock_window();
awindow->gui->async_update_assets();
- open_mixers();
cwindow->refresh_frame(CHANGE_ALL);
calling_window_gui->lock_window("MWindow::undo_entry 4");
}
{
int current_channel = 0;
int current_track = 0;
- for( Track *current = edl->tracks->first; current; current = NEXT ) {
+ for( Track *current=edl->tracks->first; current; current=NEXT ) {
if( current->data_type == TRACK_AUDIO &&
current->record ) {
Autos *pan_autos = current->automation->autos[AUTOMATION_PAN];
PanAuto *pan_auto = (PanAuto*)pan_autos->get_auto_for_editing(-1);
- for( int i = 0; i < MAXCHANNELS; i++ ) {
+ for( int i=0; i < MAXCHANNELS; ++i ) {
pan_auto->values[i] = 0.0;
}
if( pattern == MWindow::AUDIO_5_1_TO_2 ) {
switch( current_track ) {
case 0:
- pan_auto->values[0] = 0.5;
- pan_auto->values[1] = 0.5;
- break;
- case 1:
+ case 4:
pan_auto->values[0] = 1;
break;
- case 2:
+ case 1:
+ case 5:
pan_auto->values[1] = 1;
break;
+ case 2:
case 3:
- pan_auto->values[0] = 1;
- break;
- case 4:
- pan_auto->values[1] = 1;
- break;
- case 5:
pan_auto->values[0] = 0.5;
pan_auto->values[1] = 0.5;
break;
Asset *proxy_asset = edl->assets->update((Asset *)proxy_assets->get(i));
proxy_asset->awindow_folder = awindow_folder;
// replace track contents
- for( Track *track = edl->tracks->first; track; track = track->next ) {
+ for( Track *track=edl->tracks->first; track; track=track->next ) {
if( track->data_type != TRACK_VIDEO ) continue;
- for( Edit *edit = track->edits->first; edit; edit = edit->next ) {
+ for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
if( !edit->asset ) continue;
if( !strcmp(edit->asset->path, orig_assets->get(i)->path) ) {
edit->asset = proxy_asset;
Asset *proxy_asset = edl->assets->update((Asset *)proxy_assets->get(i));
proxy_asset->awindow_folder = AW_PROXY_FOLDER;
// replace track contents
- for( Track *track = edl->tracks->first; track; track = track->next ) {
+ for( Track *track=edl->tracks->first; track; track=track->next ) {
if( track->data_type != TRACK_VIDEO ) continue;
- for( Edit *edit = track->edits->first; edit; edit = edit->next ) {
+ for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
if( !edit->asset ) continue;
if( !strcmp(edit->asset->path, orig_assets->get(i)->path) ) {
edit->asset = proxy_asset;
projects / goodguy / history.git / blobdiff