From 195866cbfd6dbb005766f60a8f13836407d56c49 Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 3 Dec 2011 19:04:50 +0000 Subject: [PATCH] Bugfix: dont start palying video chunks created by copying when chunk playback is disabled svn path=/trunk/; revision=7 --- timeline.py | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/timeline.py b/timeline.py index 5482800..eb454a4 100644 --- a/timeline.py +++ b/timeline.py @@ -1,20 +1,20 @@ #encoding: utf-8 #Copyright 2009 - 2011 Paul Hänsch -#This file is part of Viper. - -#Viper 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 3 of the License, or -#(at your option) any later version. - -#Viper 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 Viper. If not, see +# This file is part of Viper. +# +# Viper 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 3 of the License, or +# (at your option) any later version. +# +# Viper 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 Viper. If not, see from Tkinter import * from vchunk import * @@ -121,7 +121,7 @@ class Timeline(Frame): ) new.played.set(value = vc.played.get()) new.marked.set(value = vc.marked.get()) - new.play() + if self.animChunks.get(): new.play() new.pack(before = vc, side=LEFT) self.chunks.insert(index, new) self.chunks.remove(vc) @@ -188,7 +188,8 @@ class Timeline(Frame): new.filters = list(vc.filters) new.played.set(value = vc.played.get()) new.marked.set(value = vc.marked.get()) - new.play() + if self.animChunks.get(): new.play() + else: new.stop() new.pack(before = vc, side=LEFT) self.chunks.insert(index, new) vc.schedule = '' -- 2.39.2