projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add grouping, default proxy vcodec h264.mp4, default titlebar alpha=1, green bar bug
[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 ef81185acdc62f814d9929c37e6c6a4c6460c8a9..acc5e4d12e9784f77ecde0103af2283fbc01d873 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mainsession.C
+++ b/
cinelerra-5.1/cinelerra/mainsession.C
@@
-56,6
+56,11
@@
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;
clip_number = 1;
brender_end = 0;
cwindow_controls = 1;
@@
-125,6
+130,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()
@@
-451,7
+458,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)
0
);
+ title_bar_alpha = defaults->get("TITLE_BAR_ALPHA", (float)
1
);
boundaries();
return 0;
boundaries();
return 0;