projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add audio to proxy, and minor bug fixes
[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 f7224b4c0cd84af9ca1174a908f4e79eb81203cf..d919c55604d216e87573ce34d1e4cbcb822e57b1 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mainsession.C
+++ b/
cinelerra-5.1/cinelerra/mainsession.C
@@
-49,6
+49,7
@@
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;
@@
-113,10
+114,12
@@
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;
}
@@
-141,6
+144,13
@@
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);