ff tooltip, shcmds doc, bld_prepare fix, edl load_xml fix

[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..9e14b082d9c003af3c534cee3bff931f5718054b 100644 (file)
--- a/cinelerra-5.1/cinelerra/edl.C
+++ b/cinelerra-5.1/cinelerra/edl.C
@@ -301,7 +301,8 @@ int EDL::load_xml(FileXML *file,
                                else
                                if(file->tag.title_is("ASSETS"))
                                {
-                                       if(load_flags & LOAD_ASSETS)
+                                       if((load_flags & LOAD_ASSETS) &&
+                                               !parent_edl)
                                                assets->load(file, load_flags);
                                        else
                                                result = file->skip_tag();
@@ -1022,19 +1023,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)
 {
-       w = session->output_w;
-       h = session->output_h;
-
        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
-       {
-               w = (float)w *
-                       (h * get_aspect_ratio() / session->output_w);
-       }
+               w = (h = session->output_h) * get_aspect_ratio();
 }
 
 float EDL::get_aspect_ratio()