projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
edit drag handle cursor per track, batchrender col width fix, batchrender path errmsg...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
mainsession.C
diff --git
a/cinelerra-5.1/cinelerra/mainsession.C
b/cinelerra-5.1/cinelerra/mainsession.C
index d8e563d6b3a9411c7d3ceb2c32a9b0ecfbf40275..bd19562d367b16fd9882322fdedfa8b6c5cade39 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mainsession.C
+++ b/
cinelerra-5.1/cinelerra/mainsession.C
@@
-56,18
+56,23
@@
MainSession::MainSession(MWindow *mwindow)
drag_clips = new ArrayList<EDL*>;
drag_edits = new ArrayList<Edit*>;
drag_edit = 0;
drag_clips = new ArrayList<EDL*>;
drag_edits = new ArrayList<Edit*>;
drag_edit = 0;
+ drag_group = 0;
+ drag_group_edit = 0;
+ drag_group_position = 0;
+ drag_group_first_track = 0;
+ group_number = 1;
clip_number = 1;
brender_end = 0;
cwindow_controls = 1;
trim_edits = 0;
current_tip = -1;
clip_number = 1;
brender_end = 0;
cwindow_controls = 1;
trim_edits = 0;
current_tip = -1;
- drag_handle = 0;
cwindow_fullscreen = 0;
rwindow_fullscreen = 0;
vwindow_fullscreen = 0;
zwindow_fullscreen = 0;
selected_zwindow = -1;
actual_frame_rate = 0;
cwindow_fullscreen = 0;
rwindow_fullscreen = 0;
vwindow_fullscreen = 0;
zwindow_fullscreen = 0;
selected_zwindow = -1;
actual_frame_rate = 0;
+ title_bar_alpha = 0;
window_config = 0;
a_x11_host[0] = 0;
b_x11_host[0] = 0;
window_config = 0;
a_x11_host[0] = 0;
b_x11_host[0] = 0;
@@
-124,6
+129,8
@@
MainSession::~MainSession()
delete drag_auto_gang;
delete drag_clips;
delete drag_edits;
delete drag_auto_gang;
delete drag_clips;
delete drag_edits;
+ if( drag_group )
+ drag_group->remove_user();
}
void MainSession::boundaries()
}
void MainSession::boundaries()
@@
-450,6
+457,7
@@
int MainSession::load_defaults(BC_Hash *defaults)
current_tip = defaults->get("CURRENT_TIP", current_tip);
actual_frame_rate = defaults->get("ACTUAL_FRAME_RATE", (float)-1);
current_tip = defaults->get("CURRENT_TIP", current_tip);
actual_frame_rate = defaults->get("ACTUAL_FRAME_RATE", (float)-1);
+ title_bar_alpha = defaults->get("TITLE_BAR_ALPHA", (float)1);
boundaries();
return 0;
boundaries();
return 0;
@@
-569,6
+577,7
@@
int MainSession::save_defaults(BC_Hash *defaults)
defaults->update("TRANSITIONDIALOG_H", transitiondialog_h);
defaults->update("ACTUAL_FRAME_RATE", actual_frame_rate);
defaults->update("TRANSITIONDIALOG_H", transitiondialog_h);
defaults->update("ACTUAL_FRAME_RATE", actual_frame_rate);
+ defaults->update("TITLE_BAR_ALPHA", title_bar_alpha);
defaults->update("CURRENT_TIP", current_tip);
defaults->update("CURRENT_TIP", current_tip);