projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch to solid color for edit title bar
[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 3f67230e63885819780485acc3f7acde9f09b8ab..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"
@@
-1388,7
+1389,7
@@
void MWindow::create_mixers()
save_backup();
undo->update_undo_after(_("create mixers"), LOAD_ALL);
restart_brender();
save_backup();
undo->update_undo_after(_("create mixers"), LOAD_ALL);
restart_brender();
- gui->update(1,
2
, 1, 1, 1, 1, 0);
+ gui->update(1,
FORCE_REDRAW
, 1, 1, 1, 1, 0);
sync_parameters(CHANGE_ALL);
}
sync_parameters(CHANGE_ALL);
}
@@
-2978,7
+2979,7
@@
void MWindow::set_auto_visibility(Autos *autos, int value)
else
return;
else
return;
- gui->update(0,
1
, 0, 0, 0, 0, 0);
+ gui->update(0,
NORMAL_DRAW
, 0, 0, 0, 0, 0);
gui->mainmenu->update_toggles(1);
gui->unlock_window();
gwindow->gui->update_toggles(1);
gui->mainmenu->update_toggles(1);
gui->unlock_window();
gwindow->gui->update_toggles(1);
@@
-3219,7
+3220,7
@@
void MWindow::hide_plugin(Plugin *plugin, int lock)
plugin->show = 0;
// Update the toggle
gui->lock_window("MWindow::hide_plugin");
plugin->show = 0;
// Update the toggle
gui->lock_window("MWindow::hide_plugin");
- gui->update(0,
1
, 0, 0, 0, 0, 0);
+ gui->update(0,
NORMAL_DRAW
, 0, 0, 0, 0, 0);
gui->unlock_window();
if(lock) plugin_gui_lock->lock("MWindow::hide_plugin");
gui->unlock_window();
if(lock) plugin_gui_lock->lock("MWindow::hide_plugin");
@@
-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
@@
-3550,7
+3559,7
@@
void MWindow::update_project(int load_mode)
gui->load_panes();
}
gui->load_panes();
}
- gui->update(1,
1
, 1, 1, 1, 1, 1);
+ gui->update(1,
NORMAL_DRAW
, 1, 1, 1, 1, 1);
if(debug) PRINT_TRACE
gui->unlock_window();
init_brender();
if(debug) PRINT_TRACE
gui->unlock_window();
init_brender();
@@
-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);
@@
-4055,7
+4066,7
@@
void MWindow::remove_assets_from_project(int push_undo, int redraw,
restart_brender();
gui->lock_window("MWindow::remove_assets_from_project 3");
restart_brender();
gui->lock_window("MWindow::remove_assets_from_project 3");
- gui->update(1,
1
, 1, 1, 0, 1, 0);
+ gui->update(1,
NORMAL_DRAW
, 1, 1, 0, 1, 0);
gui->unlock_window();
// Removes from playback here
gui->unlock_window();
// Removes from playback here
@@
-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)
@@
-4381,7
+4392,7
@@
void MWindow::resync_guis()
// Update GUIs
restart_brender();
gui->lock_window("MWindow::resync_guis");
// Update GUIs
restart_brender();
gui->lock_window("MWindow::resync_guis");
- gui->update(1,
1
, 1, 1, 1, 1, 0);
+ gui->update(1,
NORMAL_DRAW
, 1, 1, 1, 1, 0);
gui->unlock_window();
cwindow->gui->lock_window("MWindow::resync_guis");
gui->unlock_window();
cwindow->gui->lock_window("MWindow::resync_guis");