projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add olaf's neophyte update, add binfolder apply btn
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
mainsession.h
diff --git
a/cinelerra-5.1/cinelerra/mainsession.h
b/cinelerra-5.1/cinelerra/mainsession.h
index 81b2439ff3e30f9fabaa645ea5c16d9a8aa259f8..fd58d210dad1291a4adf3a4f2378eb138dfafdef 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mainsession.h
+++ b/
cinelerra-5.1/cinelerra/mainsession.h
@@
-49,15
+49,12
@@
public:
int load_defaults(BC_Hash *defaults);
int save_defaults(BC_Hash *defaults);
int load_defaults(BC_Hash *defaults);
int save_defaults(BC_Hash *defaults);
+ void clear_drag_proxy();
void save_x11_host(int play_config, const char *x11_host);
int set_default_x11_host(int win_config=-1);
void default_window_positions(int window_config=0);
void boundaries();
void save_x11_host(int play_config, const char *x11_host);
int set_default_x11_host(int win_config=-1);
void default_window_positions(int window_config=0);
void boundaries();
-
-
-
-
// For drag and drop events
// The entire track where the dropped asset is going to go
Track *track_highlighted;
// For drag and drop events
// The entire track where the dropped asset is going to go
Track *track_highlighted;
@@
-77,6
+74,7
@@
public:
Edits *trim_edits;
ArrayList<Indexable*> *drag_assets;
ArrayList<EDL*> *drag_clips;
Edits *trim_edits;
ArrayList<Indexable*> *drag_assets;
ArrayList<EDL*> *drag_clips;
+ ArrayList<EDL*> *drag_proxy;
Auto *drag_auto;
ArrayList<Auto*> *drag_auto_gang;
Auto *drag_auto;
ArrayList<Auto*> *drag_auto_gang;
@@
-139,6
+137,8
@@
public:
int cswindow_x, cswindow_y, cswindow_w, cswindow_h;
// subtitle
int swindow_x, swindow_y, swindow_w, swindow_h;
int cswindow_x, cswindow_y, cswindow_w, cswindow_h;
// subtitle
int swindow_x, swindow_y, swindow_w, swindow_h;
+// binfolder filter window
+ int bwindow_w, bwindow_h;
// error window
int ewindow_w, ewindow_h;
// Channel edit window
// error window
int ewindow_w, ewindow_h;
// Channel edit window
@@
-158,7
+158,6
@@
public:
int use_hist_parade;
int use_wave_parade;
int use_hist_parade;
int use_wave_parade;
-
int afolders_w;
int show_vwindow, show_awindow, show_cwindow, show_gwindow, show_lwindow;
int plugindialog_w, plugindialog_h;
int afolders_w;
int show_vwindow, show_awindow, show_cwindow, show_gwindow, show_lwindow;
int plugindialog_w, plugindialog_h;
@@
-173,7
+172,8
@@
public:
int cwindow_fullscreen;
int rwindow_fullscreen;
int vwindow_fullscreen;
int cwindow_fullscreen;
int rwindow_fullscreen;
int vwindow_fullscreen;
-
+ int zwindow_fullscreen;
+ int selected_zwindow;
double actual_frame_rate;
double actual_frame_rate;