projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve delays created by vicon drawing locks, reset_cache segv fix, gang track toolt...
[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 109f4ecece9f9a600c1663a5a97d9349dad8dabe..d01f9ddb1299ec93dda1c127704148b9a6242e3c 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.h
+++ b/
cinelerra-5.1/cinelerra/mwindow.h
@@
-112,8
+112,10
@@
class StackItem
public:
EDL *edl, *new_edl;
Indexable *idxbl;
public:
EDL *edl, *new_edl;
Indexable *idxbl;
+ Edit *edit;
MainUndo *undo;
int64_t mtime;
MainUndo *undo;
int64_t mtime;
+ double duration;
};
class Stack : public ArrayList<StackItem>
};
class Stack : public ArrayList<StackItem>
@@
-144,6
+146,17
@@
public:
};
};
+class DrawTrackMovement : public Thread
+{
+public:
+ DrawTrackMovement(MWindow *mwindow);
+ ~DrawTrackMovement();
+ void run();
+
+ MWindow *mwindow;
+};
+
+
class MWindow : public Thread
{
public:
class MWindow : public Thread
{
public:
@@
-169,13
+182,17
@@
public:
int load_defaults();
int save_defaults();
int set_filename(const char *filename);
int load_defaults();
int save_defaults();
int set_filename(const char *filename);
+ int set_titlebar(const char *filename);
// Total vertical pixels in timeline
int get_tracks_height();
// Total horizontal pixels in timeline
int get_tracks_width();
// session stack
// Total vertical pixels in timeline
int get_tracks_height();
// Total horizontal pixels in timeline
int get_tracks_width();
// session stack
- void stack_push(EDL *edl, Indexable *idxbl);
+ void stack_push(EDL *edl, Indexable *idxbl
, Edit *edit=0
);
void stack_pop();
void stack_pop();
+ int save(EDL *edl, char *filename, int stat);
+ int save(int save_as);
+ void show_plugins();
void clip_to_media();
void media_to_clip();
int create_ref(Asset *asset, EDL *ref);
void clip_to_media();
void media_to_clip();
int create_ref(Asset *asset, EDL *ref);
@@
-224,6
+241,9
@@
public:
int edit_plugins,
int edit_autos,
int overwrite);
int edit_plugins,
int edit_autos,
int overwrite);
+ void collect_effects();
+ void paste_effects();
+
// Reset everything for a load
void update_project(int load_mode);
void update_preferences(Preferences *prefs);
// Reset everything for a load
void update_project(int load_mode);
void update_preferences(Preferences *prefs);
@@
-265,12
+285,14
@@
public:
void close_mixers(int result=1);
void open_mixers();
ZWindow *get_mixer(Mixer *&mixer);
void close_mixers(int result=1);
void open_mixers();
ZWindow *get_mixer(Mixer *&mixer);
- void del_mixer(ZWindow *zwindow);
+ ZWindow *get_mixer(int idx);
+ void close_mixer(ZWindow *zwindow);
int mixer_track_active(Track *track);
void update_mixer_tracks();
void start_mixer();
int select_zwindow(ZWindow *zwindow);
void tile_mixers();
int mixer_track_active(Track *track);
void update_mixer_tracks();
void start_mixer();
int select_zwindow(ZWindow *zwindow);
void tile_mixers();
+ void set_gang_tracks(int v);
int load_filenames(ArrayList<char*> *filenames,
int load_mode = LOADMODE_REPLACE,
int edl_mode = LOADMODE_EDL_CLIP,
int load_filenames(ArrayList<char*> *filenames,
int load_mode = LOADMODE_REPLACE,
int edl_mode = LOADMODE_EDL_CLIP,
@@
-284,6
+306,8
@@
public:
int interrupt_indexes(); // Stop index building
int redraw_time_dependancies(); // after reconfiguring the time format, sample rate, frame rate
int interrupt_indexes(); // Stop index building
int redraw_time_dependancies(); // after reconfiguring the time format, sample rate, frame rate
+ void draw_trackmovement(); // after reconfiguring tracks/patchbay guis
+ DrawTrackMovement *redraw_tracks;
// =========================================== movement
// =========================================== movement
@@
-296,7
+320,8
@@
public:
int zoom_sample(int64_t zoom_sample);
void zoom_autos(float min, float max);
void zoom_amp(int64_t zoom_amp);
int zoom_sample(int64_t zoom_sample);
void zoom_autos(float min, float max);
void zoom_amp(int64_t zoom_amp);
- void zoom_track(int64_t zoom_track);
+ void zoom_atrack(int64_t zoom);
+ void zoom_vtrack(int64_t zoom);
int fit_sample();
int move_left(int64_t distance = 0);
int move_right(int64_t distance = 0);
int fit_sample();
int move_left(int64_t distance = 0);
int move_right(int64_t distance = 0);
@@
-434,7
+459,7
@@
public:
// TrackCanvas calls this to insert multiple effects from the drag_pluginservers
// into pluginset_highlighted.
// TrackCanvas calls this to insert multiple effects from the drag_pluginservers
// into pluginset_highlighted.
- void insert_effects_canvas(double start, double length);
+ void insert_effects_canvas(
Track *dest_track,
double start, double length);
// CWindow calls this to insert multiple effects from
// the drag_pluginservers array.
// CWindow calls this to insert multiple effects from
// the drag_pluginservers array.
@@
-590,6
+615,7
@@
public:
void dump_edl(FILE *fp=stdout);
void dump_undo(FILE *fp=stdout);
void dump_exe(FILE *fp=stdout);
void dump_edl(FILE *fp=stdout);
void dump_undo(FILE *fp=stdout);
void dump_exe(FILE *fp=stdout);
+ void dump_caches(FILE *fp=stdout);
static void trap_hook(FILE *fp, void *vp);
void reset_android_remote();
static void trap_hook(FILE *fp, void *vp);
void reset_android_remote();
@@
-793,6
+819,8
@@
public:
void speed_before();
int speed_after(int done);
int normalize_speed(EDL *old_edl, EDL *new_edl);
void speed_before();
int speed_after(int done);
int normalize_speed(EDL *old_edl, EDL *new_edl);
+ int get_cpus(int out_w, int out_h);
+ int get_cpus();
//
void clean_indexes();
// TimeBomb timebomb;
//
void clean_indexes();
// TimeBomb timebomb;