Credit Andrew - add sample aspect ratio for ffmpeg stream except in some cases; add...

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

diff --git a/cinelerra-5.1/cinelerra/timelinepane.C b/cinelerra-5.1/cinelerra/timelinepane.C
index 09455b84d58b7c927949f5e6e7fb345b934a9a72..0a067938988aa61e12c70726c24f927145d5d167 100644 (file)
--- a/cinelerra-5.1/cinelerra/timelinepane.C
+++ b/cinelerra-5.1/cinelerra/timelinepane.C
@@ -1,3 +1,23 @@
+/*
+ * CINELERRA
+ * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
+ * 
+ * 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 "bcsignals.h"
 #include "edl.h"
 #include "timelinepane.h"
@@ -288,15 +308,13 @@ void TimelinePane::update(int scrollbars,
        int patchbay)
 {
        if(timebar && this->timebar) this->timebar->update(0);
-       if(scrollbars)
-       {
+       if(scrollbars) {
                if(samplescroll && this->samplescroll) samplescroll->set_position();
                if(trackscroll && this->trackscroll) trackscroll->set_position();
        }
        if(patchbay && this->patchbay) this->patchbay->update();
 
-       if(do_canvas)
-       {
+       if( do_canvas != NO_DRAW ) {
                this->canvas->draw(do_canvas, 1);
                this->cursor->show();
                this->canvas->flash(0);