X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.h;h=907a65637e1094039024646b616d93d712afcded;hp=fe068d25e67a9473943d7c3921dee60a3064f024;hb=788dfe4aae1aef521caddcc68dec7369a996dce7;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.h b/cinelerra-5.1/cinelerra/fileffmpeg.h
index fe068d25..907a6563 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);
@@ -58,7 +59,7 @@ public:
 	int read_frame(VFrame *frame);
 	int64_t get_memory_usage(void);
 	int colormodel_supported(int colormodel);
-	int get_best_colormodel(Asset *asset,int driver);
+	static int get_best_colormodel(Asset *asset, int driver);
 	int select_video_stream(Asset *asset, int vstream);
 	int select_audio_stream(Asset *asset, int astream);
 };
@@ -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();
 };