X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fasset.h;h=a449896f3377622b84e7195f9b647cf4e8752868;hb=63c49c5fdda77aadc2d0addc26a6884aadec8542;hp=8fe38692f4910824840d397f8d49a888bcbb2b62;hpb=3564c71f425f390745eb7c75d5121689d53e14c2;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/cinelerra/asset.h b/cinelerra-5.0/cinelerra/asset.h
index 8fe38692..a449896f 100644
--- a/cinelerra-5.0/cinelerra/asset.h
+++ b/cinelerra-5.0/cinelerra/asset.h
@@ -30,6 +30,7 @@
 #include "filexml.inc"
 #include "indexable.h"
 #include "indexfile.inc"
+#include "indexstate.inc"
 #include "linklist.h"
 #include "pluginserver.inc"
 
@@ -79,7 +80,6 @@ public:
 
 
 // Executed during index building only
-	void update_index(Asset *asset);
 	int equivalent(Asset &asset, 
 		int test_audio, 
 		int test_video);
@@ -96,17 +96,11 @@ public:
 	int read_index(FileXML *xml);
 	void reset_audio();
 	void reset_video();
-	void reset_index();  // When the index file is wrong, reset the asset values
 	int reset_timecode();
 
 // Output path is the path of the output file if name truncation is desired.
 // It is a "" if; complete names should be used.
-	int write(FileXML *file, 
-		int include_index, 
-		const char *output_path);
-// Write the index data and asset info.  Used by IndexThread.
-	int write_index(const char *path, int data_bytes);
-
+	int write(FileXML *file, int include_index, const char *output_path);
 
 // For Indexable
 	int get_audio_channels();
@@ -126,8 +120,6 @@ public:
 	int write_audio(FileXML *xml);
 	int write_video(FileXML *xml);
 	int write_index(FileXML *xml);
-	int update_path(char *new_path);
-
 
 
 // Format of file.  An enumeration from file.inc.
@@ -161,6 +153,9 @@ public:
 
 
 
+// mp3 compression
+	int mp3_bitrate;
+
 // mpeg audio information
 	int ampeg_bitrate;
 // 2 - 3
@@ -181,14 +176,6 @@ public:
 	int theora_keyframe_force_frequency;
 
 
-// mp3 compression
-	int mp3_bitrate;
-
-// mp4a compression
-	int mp4a_bitrate;
-	int mp4a_quantqual;
-
-
 // Set by package render during file creation. -1 means square pixels.
 	double aspect_ratio;
 
@@ -221,26 +208,6 @@ public:
 	int ff_video_bitrate;
 	int ff_video_quality;
 
-// Divx video compression
-	int divx_bitrate;
-	int divx_rc_period;
-	int divx_rc_reaction_ratio;
-	int divx_rc_reaction_period;
-	int divx_max_key_interval;
-	int divx_max_quantizer;
-	int divx_min_quantizer;
-	int divx_quantizer;
-	int divx_quality;
-	int divx_fix_bitrate;
-
-// h264 video compression
-	int h264_bitrate;
-	int h264_quantizer;
-	int h264_fix_bitrate;
-
-// Divx video decompression
-	int divx_use_deblocking;
-
 // PNG video compression
 	int png_use_alpha;
 
@@ -252,15 +219,6 @@ public:
 	int tiff_cmodel;
 	int tiff_compression;
 
-// Microsoft MPEG-4
-	int ms_bitrate;
-	int ms_bitrate_tolerance;
-	int ms_interlaced;
-	int ms_quantization;
-	int ms_gop_size;
-	int ms_fix_bitrate;
-
-
 	int ac3_bitrate;
 
 // Image file sequences.  Background rendering doesn't want to write a 
@@ -269,8 +227,6 @@ public:
 // We still want sequence headers sometimes because loading a directory full of images
 // for editing would create new assets for every image.
 	int use_header;
-
-
 };