Credit Andrew - fix vorbis audio which was scratchy and ensure aging plugin does...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / strack.C

diff --git a/cinelerra-5.1/cinelerra/strack.C b/cinelerra-5.1/cinelerra/strack.C
index ffa6a5b1e1f5c29f80b3b8986ea9062ce9cd1267..53050399bd2cb041ca4c84394d8cf2e1ed5abd47 100644 (file)
--- a/cinelerra-5.1/cinelerra/strack.C
+++ b/cinelerra-5.1/cinelerra/strack.C
@@ -1,3 +1,23 @@
+/*
+ * CINELERRA
+ * Copyright (C) 2016-2020 William Morrow
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
 #include "clip.h"
 #include "edit.h"
 #include "edits.h"
@@ -18,6 +38,7 @@ STrack::STrack(EDL *edl, Tracks *tracks)
  : Track(edl, tracks)
 {
        data_type = TRACK_SUBTITLE;
+       data_h = edl->local_session->zoom_atrack;
 }
 
 STrack::~STrack()
@@ -65,8 +86,10 @@ void STrack::create_objects()
 int STrack::vertical_span(Theme *theme)
 {
        int track_h = Track::vertical_span(theme);
-       int patch_h = 0;
-       return track_h + patch_h;
+       int patch_h = theme->title_h;
+       if( expand_view )
+               patch_h += theme->play_h;
+       return MAX(track_h, patch_h);
 }