vicon drawing segv fix, beeper consolidation, render_effect resize wdw fix, valgrind...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / convert.h

diff --git a/cinelerra-5.1/cinelerra/convert.h b/cinelerra-5.1/cinelerra/convert.h
index a1de04b8bb28c41b7389ddf63fb69cb1c16b25be..36c2c8c7c9cc74f04950750b5654868559f8ab3a 100644 (file)
--- a/cinelerra-5.1/cinelerra/convert.h
+++ b/cinelerra-5.1/cinelerra/convert.h
@@ -39,7 +39,7 @@
 class ConvertRender : public Thread
 {
 public:
-       ConvertRender(MWindow *mwindow, const char *suffix);
+       ConvertRender(MWindow *mwindow);
        ~ConvertRender();
        void reset();
        void to_convert_path(char *new_path, Indexable *idxbl);
@@ -50,6 +50,10 @@ public:
        ArrayList<Indexable *> needed_idxbls;   // originals which match the needed_assets
        ArrayList<Asset *> needed_copies;       // assets which must be created
 
+       double get_video_length(Indexable *idxbl);
+       double get_audio_length(Indexable *idxbl);
+       double get_length(Indexable *idxbl);
+       int match_format(Asset *asset);
        EDL *convert_edl(EDL *edl, Indexable *idxbl);  // create render edl for this indexable
        int add_original(EDL *edl, Indexable *idxbl);
        void add_needed(Indexable *idxbl, Asset *convert);
@@ -57,7 +61,7 @@ public:
 
 // if user canceled progress bar
        int is_canceled();
-       void set_format(Asset *asset);
+       void set_format(Asset *asset, const char *suffix);
        void start_convert(float beep, int remove_originals);
        void run();
        void create_copy(int i);
@@ -200,24 +204,4 @@ public:
        float beep;
 };
 
-class ConvertBeep : public Thread
-{
-public:
-       enum { BEEP_SAMPLE_RATE=48000 };
-       typedef int16_t audio_data_t;
-       ConvertBeep(MWindow *mwindow);
-       ~ConvertBeep();
-
-       void run();
-       void start();
-       void stop(int wait);
-       void tone(double freq, double secs, double gain);
-
-       MWindow *mwindow;
-       double freq, secs, gain;
-       AudioDevice *audio;
-       int playing_audio, interrupted;
-       int audio_pos;
-};
-
 #endif