add haupauge-1657 dual usb capture support, add deinterlace to recordmonitor, asset...

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

diff --git a/cinelerra-5.1/cinelerra/edl.h b/cinelerra-5.1/cinelerra/edl.h
index e8dadce02355589cae147f3b6b5f4278402cdbcf..8656c6080c2f95e44c70a90ef5e329c8582f4a62 100644 (file)
--- a/cinelerra-5.1/cinelerra/edl.h
+++ b/cinelerra-5.1/cinelerra/edl.h
@@ -196,9 +196,11 @@ public:
        int copy_assets(int copy_flags, double start, double end,
                FileXML *file, const char *output_path);
        void copy_indexables(EDL *edl);
-       EDL *new_nested(EDL *edl, const char *path);
+       EDL *new_nested_edl(EDL *edl, const char *path);
+       EDL *get_nested_edl();
        EDL *create_nested_clip(EDL *nested);
        void create_nested(EDL *nested);
+       void overwrite_clip(EDL *clip);
        void paste_silence(double start, double end,
                int edit_labels /* = 1 */,
                int edit_plugins,
@@ -211,7 +213,7 @@ public:
                int clear_labels,
                int clear_plugins,
                int edit_autos);
-       void deglitch(double position);
+       int clear_hard_edges(double start, double end);
 // Insert the asset at a point in the EDL
        void insert_asset(Asset *asset,
                EDL *nested_edl,
@@ -230,6 +232,7 @@ public:
        void paste_edits(EDL *clip, Track *first_track, double position, int overwrite,
                int edit_edits, int edit_labels, int edit_autos, int edit_plugins);
        void paste_edits(EDL *clip, Track *first_track, double position, int overwrite);
+       void replace_assets(ArrayList<Indexable*> &orig_idxbls, ArrayList<Asset*> &new_assets);
 // resequence group ids starting at next_id
        int regroup(int next_id);
 
@@ -238,8 +241,9 @@ public:
        void get_shared_tracks(Track *track, ArrayList<SharedLocation*> *module_locations,
                int omit_recordable, int data_type);
 
-    int get_tracks_height(Theme *theme);
-    int64_t get_tracks_width();
+       int get_tracks_height(Theme *theme);
+       int64_t get_tracks_width();
+
 // Return dimensions for canvas if smaller dimensions has zoom of 1
        void calculate_conformed_dimensions(int single_channel, float &w, float &h);
 // Get the total output size scaled to aspect ratio
@@ -269,8 +273,7 @@ public:
        void rescale_proxy(int orig_scale, int new_scale);
        void set_proxy(int new_scale, int use_scaler,
                ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets);
-       void add_proxy(int use_scaler,
-               ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets);
+       void add_proxy(ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets);
        Asset *get_proxy_asset();
        Track *add_new_track(int data_type);