projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4 bt fixes, xft unrefd font fix, add: find in resources, add: user title, filebox...
[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 e68938d997711a9d310b55a300cda688bf485da8..cc16c7375d271e623137438dd43432bbb25f6fa8 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
@@
-48,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;
@@
-66,10
+64,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;
@@
-80,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;
@@
-100,7
+95,7
@@
public:
// Value of keyframe when button was pressed
float drag_start_percentage;
long drag_start_position;
// Value of keyframe when button was pressed
float drag_start_percentage;
long drag_start_position;
-//
Records for redrawing brender position
in timebar
+//
Amount of data rendered, for drawing status
in timebar
double brender_end;
// Position of cursor in CWindow output. Used by ruler.
int cwindow_output_x, cwindow_output_y;
double brender_end;
// Position of cursor in CWindow output. Used by ruler.
int cwindow_output_x, cwindow_output_y;
@@
-176,7
+171,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;