upgrades to scopewindow, add blurbox, bd.sh sed tab test, tweak clk2play over window...

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

diff --git a/cinelerra-5.1/cinelerra/track.h b/cinelerra-5.1/cinelerra/track.h
index ada29f21e06c43132402d44183e40ae09b433b28..679c3a4997aeda50662464f5cbbdc5d113d721b0 100644 (file)
--- a/cinelerra-5.1/cinelerra/track.h
+++ b/cinelerra-5.1/cinelerra/track.h
@@ -112,7 +112,7 @@ public:
                double edl_length);
        void shuffle_edits(double start, double end, int first_track);
        void reverse_edits(double start, double end, int first_track);
-       void align_edits(double start, double end, ArrayList<double> *times);
+       void align_edits(double start, double end, Track *master_track);
 // Optimize editing
        void optimize();
        int is_muted(int64_t position, int direction);  // Test muting status
@@ -146,7 +146,7 @@ public:
 // Called by playable tracks to test for playable server.
 // Descends the plugin tree without creating a virtual console.
 // Used by PlayableTracks::is_playable.
-       int is_synthesis(int64_t position, int direction);
+       int is_synthesis(int64_t position, int direction, int depth=0);
 
 // Used by PlayableTracks::is_playable
 // Returns 1 if the track is in the output boundaries.
@@ -165,7 +165,7 @@ public:
        void shift_effects(int64_t position, int64_t length, int edit_autos, Edits *trim_edits);
        void change_plugins(SharedLocation &old_location, SharedLocation &new_location, int do_swap);
        void change_modules(int old_location, int new_location, int do_swap);
-       int plugin_exists(Plugin *plugin);
+       Plugin *plugin_exists(int plugin_id);
 
        EDL *edl;
        Tracks *tracks;