X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.h;h=73a37489d8049b7d755c9bfcab96cbd48bbcb1ab;hb=190b4810ec184c74ceab3fcd6faf09a91c92c53c;hp=fe068d25e67a9473943d7c3921dee60a3064f024;hpb=87141f1b454130848c34efdea9cf832d17463830;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.h b/cinelerra-5.1/cinelerra/fileffmpeg.h index fe068d25..73a37489 100644 --- a/cinelerra-5.1/cinelerra/fileffmpeg.h +++ b/cinelerra-5.1/cinelerra/fileffmpeg.h @@ -3,10 +3,11 @@ #include "asset.inc" #include "bcwindowbase.inc" -#include "bcprogressbox.inc" #include "bitspopup.inc" #include "filebase.h" #include "fileffmpeg.inc" +#include "indexfile.inc" +#include "mainprogress.inc" #include "mutex.h" #include "thread.h" #include "vframe.inc" @@ -50,7 +51,7 @@ public: int get_audio_for_video(int vstream, int astream, int64_t &channel_mask); static void get_info(char *path,char *text,int len); int open_file(int rd,int wr); - int get_index(char *index_filename); + int get_index(IndexFile *index_file, MainProgressBar *progress_bar); int close_file(void); int write_samples(double **buffer,int64_t len); int write_frames(VFrame ***frames,int len); @@ -217,12 +218,14 @@ public: class FFMPEGScanProgress : public Thread { public: + IndexFile *index_file; + MainProgressBar *progress_bar; char progress_title[BCTEXTLEN]; - BC_ProgressBox *progress; int64_t length, *position; int done, *canceled; - FFMPEGScanProgress(const char *title, int64_t length, int64_t *position, int *canceled); + FFMPEGScanProgress(IndexFile *index_file, MainProgressBar *progress_bar, + const char *title, int64_t length, int64_t *position, int *canceled); ~FFMPEGScanProgress(); void run(); };