projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sams last ladspa icons, libopus/vp9, mixer fixer, plugin resets, fmt frmsz, shm fixes
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
edl.h
diff --git
a/cinelerra-5.1/cinelerra/edl.h
b/cinelerra-5.1/cinelerra/edl.h
index 45740cdf05f2ec9a6f412a9a17d006d57d15d89e..13fd8d5df61c41cbbd37f873cebb629334f36646 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edl.h
+++ b/
cinelerra-5.1/cinelerra/edl.h
@@
-50,6
+50,7
@@
#include "theme.inc"
#include "tracks.inc"
#include "vedit.inc"
#include "theme.inc"
#include "tracks.inc"
#include "vedit.inc"
+#include "zwindow.h"
// Loading and saving are built on load and copy except for automation:
// Loading and saving are built on load and copy except for automation:
@@
-94,7
+95,9
@@
public:
int direction,
PlayableTracks *playable_tracks);
int direction,
PlayableTracks *playable_tracks);
-// Convert position to frames if cursor alignment is enabled
+// Convert position to frame boundry times
+ double frame_align(double position, int round);
+// frame align if cursor alignment is enabled
double align_to_frame(double position, int round);
// increase track w/h to at least session w/h
double align_to_frame(double position, int round);
// increase track w/h to at least session w/h
@@
-110,6
+113,7
@@
public:
int copy_all(EDL *edl);
void copy_assets(EDL *edl);
void copy_clips(EDL *edl);
int copy_all(EDL *edl);
void copy_assets(EDL *edl);
void copy_clips(EDL *edl);
+ void copy_mixers(EDL *edl);
// Copy pan and fade settings from edl
void synchronize_params(EDL *edl);
// Determine if the positions are equivalent if they're within half a frame
// Copy pan and fade settings from edl
void synchronize_params(EDL *edl);
// Determine if the positions are equivalent if they're within half a frame
@@
-184,6
+188,7
@@
public:
int edit_autos);
void remove_from_project(ArrayList<Indexable*> *assets);
void remove_from_project(ArrayList<EDL*> *clips);
int edit_autos);
void remove_from_project(ArrayList<Indexable*> *assets);
void remove_from_project(ArrayList<EDL*> *clips);
+ int blade(double position);
int clear(double start,
double end,
int clear_labels,
int clear(double start,
double end,
int clear_labels,
@@
-245,6
+250,7
@@
public:
ArrayList<EDL*> vwindow_edls;
// is the vwindow_edl shared and therefore should not be deleted in destructor
// int vwindow_edl_shared;
ArrayList<EDL*> vwindow_edls;
// is the vwindow_edl shared and therefore should not be deleted in destructor
// int vwindow_edl_shared;
+ Mixers mixers;
// Media files
// Shared between all EDLs
// Media files
// Shared between all EDLs