dynamic keyframes, textbox rework, andrea ffmpeg.opts, perpetual chkpt undo, lv2...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / track.C

diff --git a/cinelerra-5.1/cinelerra/track.C b/cinelerra-5.1/cinelerra/track.C
index bfd53ecac49b3cdc63cd162d27f255bd58a13053..bac9abd68050bed5c1f8908fa9e92e239f8e4b7d 100644 (file)
--- a/cinelerra-5.1/cinelerra/track.C
+++ b/cinelerra-5.1/cinelerra/track.C
@@ -218,16 +218,13 @@ printf("Track::operator= 1\n");
 int Track::vertical_span(Theme *theme)
 {
        int result = 0;
-       if(expand_view)
-               result = edl->local_session->zoom_track +
-                       plugin_set.total *
-                       theme->get_image("plugin_bg_data")->get_h();
-       else
-               result = edl->local_session->zoom_track;
-
-       if(edl->session->show_titles)
+       if( show_titles() )
                result += theme->get_image("title_bg_data")->get_h();
-
+       if( show_assets() )
+               result += edl->local_session->zoom_track;
+       if( expand_view )
+               result += plugin_set.total * theme->get_image("plugin_bg_data")->get_h();
+       result = MAX(result, theme->title_h);
        return result;
 }
 
@@ -284,7 +281,20 @@ int Track::has_speed()
        return 0;
 }
 
+int Track::show_assets()
+{
+       return expand_view || edl->session->show_assets ? 1 : 0;
+}
+
+int Track::show_titles()
+{
+       return expand_view || edl->session->show_titles ? 1 : 0;
+}
 
+int Track::show_transitions()
+{
+       return expand_view || edl->session->auto_conf->transitions ? 1 : 0;
+}
 
 void Track::get_source_dimensions(double position, int &w, int &h)
 {
@@ -342,7 +352,10 @@ int Track::load(FileXML *file, int track_offset, uint32_t load_flags)
                        else
                        if(file->tag.title_is("TITLE"))
                        {
-                               file->read_text_until("/TITLE", title, BCTEXTLEN);
+                               XMLBuffer data;
+                               file->read_text_until("/TITLE", &data);
+                               memset(title, 0, sizeof(title));
+                               strncpy(title, data.cstr(), sizeof(title)-1);
                        }
                        else
                        if(load_flags && automation->load(file)
@@ -1856,6 +1869,13 @@ double Track::from_units(int64_t position)
        return (double)position;
 }
 
+int64_t Track::frame_align(int64_t position, int round)
+{
+       if( data_type != TRACK_VIDEO && edl->session->cursor_on_frames )
+               position = to_units(edl->align_to_frame(from_units(position), round), round);
+       return position;
+}
+
 int Track::plugin_exists(Plugin *plugin)
 {
        for(int number = 0; number < plugin_set.size(); number++)