Merge CV, ver=5.1; ops/methods from HV, and interface from CV where possible

[goodguy/history.git] / cinelerra-5.0 / cinelerra / vedit.h

diff --git a/cinelerra-5.0/cinelerra/vedit.h b/cinelerra-5.0/cinelerra/vedit.h
deleted file mode 100644 (file)
index c9752d5..0000000
--- a/cinelerra-5.0/cinelerra/vedit.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-/*
- * 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
- * 
- */
-
-#ifndef VEDIT_H
-#define VEDIT_H
-
-#include "guicast.h"
-#include "cache.inc"
-#include "edit.h"
-#include "vedits.inc"
-#include "vframe.inc"
-
-// UNITS ARE FRAMES
-
-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 direction,
-                       CICache *cache,
-                       int use_nudge,
-                       int use_cache,
-                       int use_asynchronous);
-       
-       
-       
-       
-       
-       
-
-       int load_properties_derived(FileXML *xml);
-
-// ========================================= editing
-
-       int copy_properties_derived(FileXML *xml, int64_t length_in_selection);
-
-
-       int dump_derived();
-       int64_t get_source_end(int64_t default_);
-
-private:
-       VEdits *vedits;
-};
-
-
-
-
-#endif