projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update openjpeg + x265, unproxy clip fix, config mods for lv2/opus/x265-10bit
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
proxy.C
diff --git
a/cinelerra-5.1/cinelerra/proxy.C
b/cinelerra-5.1/cinelerra/proxy.C
index 5aff535abd7b37b121fc68fe2c428f3e824827bf..5432f478546fb1927cd64e7c20667e843545bb06 100644
(file)
--- a/
cinelerra-5.1/cinelerra/proxy.C
+++ b/
cinelerra-5.1/cinelerra/proxy.C
@@
-33,6
+33,7
@@
#include "formattools.h"
#include "language.h"
#include "mainerror.h"
#include "formattools.h"
#include "language.h"
#include "mainerror.h"
+#include "mainindexes.h"
#include "mainprogress.h"
#include "mainundo.h"
#include "mutex.h"
#include "mainprogress.h"
#include "mainundo.h"
#include "mutex.h"
@@
-258,7
+259,7
@@
void ProxyDialog::to_proxy()
mwindow->restart_brender();
mwindow->gui->lock_window("ProxyDialog::to_proxy");
mwindow->restart_brender();
mwindow->gui->lock_window("ProxyDialog::to_proxy");
- mwindow->update_project(LOAD
_ALL
);
+ mwindow->update_project(LOAD
MODE_REPLACE
);
mwindow->gui->unlock_window();
}
mwindow->gui->unlock_window();
}
@@
-759,6
+760,11
@@
void ProxyClient::process_package(LoadPackage *ptr)
}
proxy_render->update_progress();
}
}
proxy_render->update_progress();
}
+ if( !proxy_render->failed && !proxy_render->is_canceled() ) {
+ Asset *asset = mwindow->edl->assets->update(proxy);
+ mwindow->mainindexes->add_next_asset(0, asset);
+ mwindow->mainindexes->start_build();
+ }
}
}