X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.h;h=bb40ed4a32957a3577c2f021e6eff6bde48e346a;hb=81fc9cd689dd964a4736fa1f8986a64db6b4a937;hp=92b15794ced82f6f31a2144c87ad78c114564cf4;hpb=01c087cf8b098c6cd424cb2cb3778f3b1317fa21;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/asset.h b/cinelerra-5.1/cinelerra/asset.h
index 92b15794..bb40ed4a 100644
--- a/cinelerra-5.1/cinelerra/asset.h
+++ b/cinelerra-5.1/cinelerra/asset.h
@@ -36,12 +36,6 @@
 #include "pluginserver.inc"
 
 
-// Time code formats
-#define TC_DROPFRAME 0
-#define TC_NONDROPFRAME 1
-#define TC_PAL 2
-#define TC_FILM 3
-
 class Asset : public Indexable, public ListItem<Asset>
 {
 public:
@@ -147,16 +141,16 @@ public:
 
 	int actual_width, actual_height;
 	int width, height;
-// scale factor or 0 if not proxy
-	int proxy_scale;
+// scale factor or 0 if not proxy, proxy_edl if proxyed from nested_edl
+	int proxy_scale, proxy_edl;
 // String or FourCC describing compression
 	char vcodec[BCTEXTLEN];
 
 // Length in frames
 // -1 means a still photo
 	int64_t video_length;
-
-
+// timecode, unknown=-2, no timecode=-1, timecode>=0 
+	double timecode;
 
 // mp3 compression
 	int mp3_bitrate;