projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prev/next label fix in viewer, inout highlight, modify folder layout, ffmpeg scan...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
mainsession.C
diff --git
a/cinelerra-5.1/cinelerra/mainsession.C
b/cinelerra-5.1/cinelerra/mainsession.C
index 251d82b706ffb81947f659f0cd82c666eb57df98..bab1e227ed8390d491c15bac1f5b0f347977615a 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mainsession.C
+++ b/
cinelerra-5.1/cinelerra/mainsession.C
@@
-49,7
+49,6
@@
MainSession::MainSession(MWindow *mwindow)
drag_assets = new ArrayList<Indexable*>;
drag_auto_gang = new ArrayList<Auto*>;
drag_clips = new ArrayList<EDL*>;
drag_assets = new ArrayList<Indexable*>;
drag_auto_gang = new ArrayList<Auto*>;
drag_clips = new ArrayList<EDL*>;
- drag_proxy = new ArrayList<EDL*>;
drag_edits = new ArrayList<Edit*>;
drag_edit = 0;
clip_number = 1;
drag_edits = new ArrayList<Edit*>;
drag_edit = 0;
clip_number = 1;
@@
-115,12
+114,10
@@
MainSession::MainSession(MWindow *mwindow)
MainSession::~MainSession()
{
MainSession::~MainSession()
{
- clear_drag_proxy();
delete drag_pluginservers;
delete drag_assets;
delete drag_auto_gang;
delete drag_clips;
delete drag_pluginservers;
delete drag_assets;
delete drag_auto_gang;
delete drag_clips;
- delete drag_proxy;
delete drag_edits;
}
delete drag_edits;
}
@@
-145,13
+142,6
@@
void MainSession::boundaries()
CLAMP(cwindow_controls, 0, 1);
}
CLAMP(cwindow_controls, 0, 1);
}
-void MainSession::clear_drag_proxy()
-{
- for( int i=drag_proxy->size(); --i>=0; )
- drag_proxy->get(i)->remove_user();
- drag_proxy->remove_all();
-}
-
void MainSession::save_x11_host(int play_config, const char *x11_host)
{
strcpy(!play_config ? a_x11_host : b_x11_host, x11_host);
void MainSession::save_x11_host(int play_config, const char *x11_host)
{
strcpy(!play_config ? a_x11_host : b_x11_host, x11_host);
@@
-263,8
+253,8
@@
void MainSession::default_window_positions(int window_config)
awindow_w = root_x + root_w - awindow_x - border_left - border_right;
awindow_h = mwindow_h;
awindow_w = root_x + root_w - awindow_x - border_left - border_right;
awindow_h = mwindow_h;
- bwindow_w =
52
0;
- bwindow_h = 3
4
0;
+ bwindow_w =
60
0;
+ bwindow_h = 3
6
0;
ewindow_w = 640;
ewindow_h = 240;
ewindow_w = 640;
ewindow_h = 240;