projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow multiple edits for edit user title update
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
mwindow.C
diff --git
a/cinelerra-5.1/cinelerra/mwindow.C
b/cinelerra-5.1/cinelerra/mwindow.C
index 070353020f8195996b02b77b0a371d316ca94b38..77c1eba14aa08c97aa73e8467273b4dc017c4333 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.C
+++ b/
cinelerra-5.1/cinelerra/mwindow.C
@@
-120,6
+120,7
@@
#include "vframe.h"
#include "vtrack.h"
#include "versioninfo.h"
#include "vframe.h"
#include "vtrack.h"
#include "versioninfo.h"
+#include "vicon.h"
#include "videodevice.inc"
#include "videowindow.h"
#include "vplayback.h"
#include "videodevice.inc"
#include "videowindow.h"
#include "vplayback.h"
@@
-3291,6
+3292,14
@@
void MWindow::hide_keyframe_gui(Plugin *plugin)
keyframe_gui_lock->unlock();
}
keyframe_gui_lock->unlock();
}
+int MWindow::get_title_color(Edit *edit)
+{
+ int color = edit->color;
+ if( color < 0 && preferences->autocolor_assets )
+ color = edit->get_hash_color();
+ return color;
+}
+
void MWindow::update_keyframe_guis()
{
// Send new configuration to keyframe GUI's
void MWindow::update_keyframe_guis()
{
// Send new configuration to keyframe GUI's
@@
-4010,6
+4019,8
@@
void MWindow::remove_asset_from_caches(Asset *asset)
void MWindow::remove_assets_from_project(int push_undo, int redraw,
ArrayList<Indexable*> *drag_assets, ArrayList<EDL*> *drag_clips)
{
void MWindow::remove_assets_from_project(int push_undo, int redraw,
ArrayList<Indexable*> *drag_assets, ArrayList<EDL*> *drag_clips)
{
+ awindow->gui->close_view_popup();
+
for(int i = 0; i < drag_assets->total; i++) {
Indexable *indexable = drag_assets->get(i);
if(indexable->is_asset) remove_asset_from_caches((Asset*)indexable);
for(int i = 0; i < drag_assets->total; i++) {
Indexable *indexable = drag_assets->get(i);
if(indexable->is_asset) remove_asset_from_caches((Asset*)indexable);
@@
-4067,16
+4078,16
@@
void MWindow::remove_assets_from_project(int push_undo, int redraw,
void MWindow::remove_assets_from_disk()
{
void MWindow::remove_assets_from_disk()
{
+ remove_assets_from_project(1,
+ 1,
+ session->drag_assets,
+ session->drag_clips);
+
// Remove from disk
for(int i = 0; i < session->drag_assets->total; i++)
{
remove(session->drag_assets->get(i)->path);
}
// Remove from disk
for(int i = 0; i < session->drag_assets->total; i++)
{
remove(session->drag_assets->get(i)->path);
}
-
- remove_assets_from_project(1,
- 1,
- session->drag_assets,
- session->drag_clips);
}
void MWindow::dump_plugins(FILE *fp)
}
void MWindow::dump_plugins(FILE *fp)