X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvedit.h;h=4830ef7347f71726da65e39cac604eadfd7a3a52;hb=60f8df69db9ddd8148bfc41a17bb0955b52a45e6;hp=f6600936a167392616568c5303e45642bdb4a30f;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/vedit.h b/cinelerra-5.1/cinelerra/vedit.h index f6600936..4830ef73 100644 --- a/cinelerra-5.1/cinelerra/vedit.h +++ b/cinelerra-5.1/cinelerra/vedit.h @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * 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 - * + * */ #ifndef VEDIT_H @@ -35,19 +35,19 @@ class VEdit : public Edit public: VEdit(EDL *edl, Edits *edits); ~VEdit(); - + // Functions for direct copying Asset* get_nested_asset(int64_t *source_position, int64_t position, int direction); - int read_frame(VFrame *video_out, - int64_t input_position, + int read_frame(VFrame *video_out, + int64_t input_position, int direction, CICache *cache, int use_nudge, int use_cache, int use_asynchronous); - + int load_properties_derived(FileXML *xml); // ========================================= editing