projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add missed mod last chkin, tweak cuda drop compute_30
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
mwindow.h
diff --git
a/cinelerra-5.1/cinelerra/mwindow.h
b/cinelerra-5.1/cinelerra/mwindow.h
index 8f80280f13ef45a412969db698e89a0b6e35bf03..65a284123b6e9a66a98a7ba5df25eaa681619c4d 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.h
+++ b/
cinelerra-5.1/cinelerra/mwindow.h
@@
-292,6
+292,8
@@
public:
void start_mixer();
int select_zwindow(ZWindow *zwindow);
void tile_mixers();
void start_mixer();
int select_zwindow(ZWindow *zwindow);
void tile_mixers();
+ int masters_to_mixers();
+ void mix_masters();
void set_gang_tracks(int v);
int load_filenames(ArrayList<char*> *filenames,
int load_mode = LOADMODE_REPLACE,
void set_gang_tracks(int v);
int load_filenames(ArrayList<char*> *filenames,
int load_mode = LOADMODE_REPLACE,
@@
-332,6
+334,9
@@
public:
void toggle_projector_xyz();
double get_position();
void set_position(double position);
void toggle_projector_xyz();
double get_position();
void set_position(double position);
+ double get_timecode_offset();
+ void set_timecode_offset(double offset);
+ void align_timecodes();
// seek to labels
// shift_down must be passed by the caller because different windows call
// seek to labels
// shift_down must be passed by the caller because different windows call