delete stray line in last checkin

[goodguy/history.git] / cinelerra-5.1 / cinelerra / mwindow.h

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 12dac24fac63ff96cb299d3c6ee8875ef0510820..dfce9b11abc171c760a87fad8d63a44e1f762db6 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -146,10 +146,6 @@ public:
        int asset_to_edl(EDL *new_edl,
                Asset *new_asset,
                RecordLabels *labels = 0);
-// Convert nested_edl to a nested EDL in new_edl
-// suitable for pasting in paste_edls
-       int edl_to_nested(EDL *new_edl,
-               EDL *nested_edl);
 
 // Entry point to insert assets and insert edls.  Called by TrackCanvas
 // and AssetPopup when assets are dragged in from AWindow.
@@ -199,13 +195,15 @@ public:
 // Find the plugin whose title matches title and return it
        static PluginServer* scan_plugindb(char *title,
                int data_type);
+       static void fix_plugin_title(char *title);
        static int plugin_exists(const char *plugin_path, ArrayList<PluginServer*> &plugins);
        static int plugin_exists(char *plugin_path);
        void dump_plugindb(FILE *fp);
        void stop_playback(int wait);
+       void stop_transport();
 
        void queue_mixers(EDL *edl, int command, int wait_tracking,
-               int use_inout, int update_refresh, int toggle_audio);
+               int use_inout, int update_refresh, int toggle_audio, int loop_play);
        void create_mixers();
        void refresh_mixers();
        void stop_mixers();
@@ -341,11 +339,11 @@ public:
        void cut();
        void blade(double position);
        void cut(double start, double end, double new_position=-1);
-// snap off edit from current position to handle/label
-       void snap_left_edit();
-       void snap_right_edit();
-       void snap_left_label();
-       void snap_right_label();
+// cut edit from current position to handle/label
+       void cut_left_edit();
+       void cut_right_edit();
+       void cut_left_label();
+       void cut_right_label();
 
 // Calculate aspect ratio from pixel counts
        static int create_aspect_ratio(float &w, float &h, int width, int height);