projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proxy bug fixes, add moveobj, sams icons, ladspa fixes, pot sigfpe
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
edlsession.h
diff --git
a/cinelerra-5.1/cinelerra/edlsession.h
b/cinelerra-5.1/cinelerra/edlsession.h
index a919b1037b7c8165723e75f5577d4f9f04728466..28c3c6236848b475ca8fbf03d6d0d2f8d5169eba 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edlsession.h
+++ b/
cinelerra-5.1/cinelerra/edlsession.h
@@
-64,9
+64,6
@@
public:
void equivalent_output(EDLSession *session, double *result);
void dump();
void equivalent_output(EDLSession *session, double *result);
void dump();
-// calculates the frame offset for programme timecode
- int64_t get_frame_offset();
-
// Audio
int achannel_positions[MAXCHANNELS];
// AWindow format
// Audio
int achannel_positions[MAXCHANNELS];
// AWindow format
@@
-83,8
+80,9
@@
public:
int autos_follow_edits;
// Generate keyframes for every tweek
int auto_keyframes;
int autos_follow_edits;
// Generate keyframes for every tweek
int auto_keyframes;
-// Where to
start
background rendering
+// Where to
do
background rendering
double brender_start;
double brender_start;
+ double brender_end;
// Length of clipboard if pasting
double clipboard_length;
// Colormodel for intermediate frames
// Length of clipboard if pasting
double clipboard_length;
// Colormodel for intermediate frames
@@
-145,7
+143,7
@@
public:
int labels_follow_edits;
int mpeg4_deblock;
int plugins_follow_edits;
int labels_follow_edits;
int mpeg4_deblock;
int plugins_follow_edits;
-// For main menu plugin attaching,
+// For main menu plugin attaching,
// // attach 1 standalone on the first track and share it with other tracks
int single_standalone;
int meter_format;
// // attach 1 standalone on the first track and share it with other tracks
int single_standalone;
int meter_format;
@@
-161,6
+159,8
@@
public:
int label_cells;
int program_no;
int playback_software_position;
int label_cells;
int program_no;
int playback_software_position;
+// current settings are scaled this much from the original settings
+ int proxy_use_scaler, proxy_scale;
// int playback_strategy;
// Play audio in realtime priority
int real_time_playback;
// int playback_strategy;
// Play audio in realtime priority
int real_time_playback;