projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
auto bump fixes, undo tweaks, add drag_speed_highlight, ffmpeg filter setup fixes...
[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 049694ed3ef1c057d8436c1622848e5e1e1587ee..954d245a7e9889575c51ab84de13a6bb4d50a034 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.h
+++ b/
cinelerra-5.1/cinelerra/mwindow.h
@@
-156,6
+156,18
@@
public:
MWindow *mwindow;
};
MWindow *mwindow;
};
+class ConfirmRefWindow : public BC_Window
+{
+public:
+ ConfirmRefWindow(MWindow *mwindow, char *path,
+ int px, int py, int cw, int ch);
+ ~ConfirmRefWindow();
+ void create_objects();
+
+ MWindow *mwindow;
+ const char *path;
+};
+
class MWindow : public Thread
{
class MWindow : public Thread
{
@@
-188,7
+200,7
@@
public:
// Total horizontal pixels in timeline
int get_tracks_width();
// session stack
// Total horizontal pixels in timeline
int get_tracks_width();
// session stack
- void stack_push(EDL *edl, Indexable *idxbl
, Edit *edit=0
);
+ void stack_push(EDL *edl, Indexable *idxbl);
void stack_pop();
int save(EDL *edl, char *filename, int stat);
int save(int save_as);
void stack_pop();
int save(EDL *edl, char *filename, int stat);
int save(int save_as);
@@
-292,6
+304,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
+346,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
@@
-500,6
+517,10
@@
public:
void move_tracks_down();
void move_track_up(Track *track);
void move_tracks_up();
void move_tracks_down();
void move_track_up(Track *track);
void move_tracks_up();
+ void swap_track_down(Track *track);
+ void swap_tracks_down();
+ void swap_track_up(Track *track);
+ void swap_tracks_up();
void mute_selection();
void new_folder(const char *new_folder, int is_clips);
void delete_folder(char *folder);
void mute_selection();
void new_folder(const char *new_folder, int is_clips);
void delete_folder(char *folder);
@@
-592,6
+613,7
@@
public:
// in the clipboard.
int paste_default_keyframe();
int clear_default_keyframe();
// in the clipboard.
int paste_default_keyframe();
int clear_default_keyframe();
+ void create_keyframes(int mask, int mode);
FloatAuto* get_float_auto(PatchGUI *patch,int idx);
IntAuto* get_int_auto(PatchGUI *patch,int idx);
FloatAuto* get_float_auto(PatchGUI *patch,int idx);
IntAuto* get_int_auto(PatchGUI *patch,int idx);
@@
-817,8
+839,8
@@
public:
static void add_plugins(ArrayList<PluginServer*> &plugins);
static void delete_plugins();
void speed_before();
static void add_plugins(ArrayList<PluginServer*> &plugins);
static void delete_plugins();
void speed_before();
- int speed_after(int done);
- int normalize_speed(EDL *old_edl, EDL *new_edl);
+ int speed_after(int done
, int edit_speed
);
+ int normalize_speed(EDL *old_edl, EDL *new_edl
, int edit_speed
);
int get_cpus(int out_w, int out_h);
int get_cpus();
//
int get_cpus(int out_w, int out_h);
int get_cpus();
//