add adams 4.6->4.6.1 (mostly)

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

diff --git a/cinelerra-5.0/cinelerra/asset.h b/cinelerra-5.0/cinelerra/asset.h
index f20fbf452b40d623448cf0d7630446b9c391a475..a449896f3377622b84e7195f9b647cf4e8752868 100644 (file)
--- 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.
@@ -147,13 +139,6 @@ public:
 
        int64_t audio_length;
 
-// Timecode information. User setable, in case of errors in source
-       char reel_name[BCTEXTLEN];
-       int reel_number;
-       int64_t tcstart;
-       int64_t tcend;
-       int tcformat;
-
 // contains video data
        int video_data;       
        int layers, program;
@@ -168,6 +153,9 @@ public:
 
 
 
+// mp3 compression
+       int mp3_bitrate;
+
 // mpeg audio information
        int ampeg_bitrate;
 // 2 - 3
@@ -188,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;
 
@@ -220,32 +200,13 @@ public:
        int vmpeg_field_order;
        int vmpeg_pframe_distance;
 
-
-
-
-
-
-
-
-// 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;
+// ffmpeg muxer file extension
+       char fformat[BCSTRLEN];
+       char ff_audio_options[BCTEXTLEN];
+       char ff_video_options[BCTEXTLEN];
+       int ff_audio_bitrate;
+       int ff_video_bitrate;
+       int ff_video_quality;
 
 // PNG video compression
        int png_use_alpha;
@@ -258,28 +219,14 @@ 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;
 
-       char pipe[BCTEXTLEN];
-       int use_pipe;
-
 // Image file sequences.  Background rendering doesn't want to write a 
 // sequence header but instead wants to start the sequence numbering at a certain
 // number.  This ensures deletion of all the frames which aren't being used.
 // 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;
-
-
 };