projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 31c5be709d439ce210db37cf4291392a7536488a..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);
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.
// Entry point to insert assets and insert edls. Called by TrackCanvas
// and AssetPopup when assets are dragged in from AWindow.
@@
-204,9
+200,10
@@
public:
static int plugin_exists(char *plugin_path);
void dump_plugindb(FILE *fp);
void stop_playback(int wait);
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,
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();
void create_mixers();
void refresh_mixers();
void stop_mixers();
@@
-342,11
+339,11
@@
public:
void cut();
void blade(double position);
void cut(double start, double end, double new_position=-1);
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);
// Calculate aspect ratio from pixel counts
static int create_aspect_ratio(float &w, float &h, int width, int height);