projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add default:all target to plugin Makefile, fix ffmpeg load_filter buffer refs
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
edl.C
diff --git
a/cinelerra-5.1/cinelerra/edl.C
b/cinelerra-5.1/cinelerra/edl.C
index cf1d0968ae738b0105be07b122b1697e59f36e90..5d9ff496238e1f15727fe154c333bf04ae015786 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edl.C
+++ b/
cinelerra-5.1/cinelerra/edl.C
@@
-609,14
+609,9
@@
int EDL::copy(double start,
// Media
// Don't replicate all assets for every clip.
// Media
// Don't replicate all assets for every clip.
-// The assets for the clips are probably in the mane EDL.
- if(!is_clip)
- copy_assets(start,
- end,
- file,
- all,
- output_path);
-
+// The assets for the clips are probably in the main EDL.
+ if( !is_clip )
+ copy_assets(start, end, file, all, output_path);
// Clips
// Don't want this if using clipboard
if(all)
// Clips
// Don't want this if using clipboard
if(all)
@@
-649,10
+644,9
@@
int EDL::copy(double start,
//printf("EDL::copy 2\n");
// terminate file
//printf("EDL::copy 2\n");
// terminate file
- if(
is_clip
)
+ if(
is_clip
)
file->tag.set_title("/CLIP_EDL");
file->tag.set_title("/CLIP_EDL");
- else
- if(is_vwindow)
+ else if( is_vwindow )
file->tag.set_title("/VWINDOW_EDL");
else
file->tag.set_title("/EDL");
file->tag.set_title("/VWINDOW_EDL");
else
file->tag.set_title("/EDL");
@@
-1022,19
+1016,10
@@
int64_t EDL::get_tracks_width()
// Get the total output size scaled to aspect ratio
void EDL::calculate_conformed_dimensions(int single_channel, float &w, float &h)
{
// Get the total output size scaled to aspect ratio
void EDL::calculate_conformed_dimensions(int single_channel, float &w, float &h)
{
- w = session->output_w;
- h = session->output_h;
-
if((float)session->output_w / session->output_h > get_aspect_ratio())
if((float)session->output_w / session->output_h > get_aspect_ratio())
- {
- h = (float)h *
- (session->output_w / get_aspect_ratio() / session->output_h);
- }
+ h = (w = session->output_w) / get_aspect_ratio();
else
else
- {
- w = (float)w *
- (h * get_aspect_ratio() / session->output_w);
- }
+ w = (h = session->output_h) * get_aspect_ratio();
}
float EDL::get_aspect_ratio()
}
float EDL::get_aspect_ratio()