projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix histogram bez keyframe interp, update plugins/fonts/fonts.scale, edl copy clip...
[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 de08e5aae9a56f2ea2327ae96067bfd3723f574a..06bd12c09b770b6f73ab08650625a9cc7e7eda73 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mainsession.h
+++ b/
cinelerra-5.1/cinelerra/mainsession.h
@@
-38,6
+38,7
@@
#include "pluginset.inc"
#include "pluginserver.inc"
#include "track.inc"
#include "pluginset.inc"
#include "pluginserver.inc"
#include "track.inc"
+#include "vwindowgui.inc"
// Options not in EDL but not changed in preferences
class MainSession
// Options not in EDL but not changed in preferences
class MainSession
@@
-52,10
+53,8
@@
public:
int set_default_x11_host(int win_config=-1);
void default_window_positions(int window_config=0);
void boundaries();
int set_default_x11_host(int win_config=-1);
void default_window_positions(int window_config=0);
void boundaries();
-
-
-
-
+ Track *drag_handle_track();
+ void update_clip_number();
// For drag and drop events
// The entire track where the dropped asset is going to go
// For drag and drop events
// The entire track where the dropped asset is going to go
@@
-66,10
+65,6
@@
public:
PluginSet *pluginset_highlighted;
// The plugin after the point where the plugin is going to be dropped.
Plugin *plugin_highlighted;
PluginSet *pluginset_highlighted;
// The plugin after the point where the plugin is going to be dropped.
Plugin *plugin_highlighted;
-// Viewer canvas highlighted
- int vcanvas_highlighted;
-// Compositor canvas highlighted
- int ccanvas_highlighted;
// Current drag operation
int current_operation;
// Current drag operation
int current_operation;
@@
-142,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
@@
-161,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;
@@
-176,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;