projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
segv in reosurce constructor, add histeq plugin, 2pass formats, cleanup, colormatrix...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
cwindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/cwindowgui.C
b/cinelerra-5.1/cinelerra/cwindowgui.C
index 95bae3979ce8071ca20358da276f75e33ea4b67c..1c56a6d641e3b70f3f737906fe8c6d794d4a7884 100644
(file)
--- a/
cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/cwindowgui.C
@@
-604,7
+604,7
@@
int CWindowGUI::drag_stop()
if(mwindow->session->drag_assets->total)
{
mwindow->gui->lock_window("CWindowGUI::drag_stop 1");
if(mwindow->session->drag_assets->total)
{
mwindow->gui->lock_window("CWindowGUI::drag_stop 1");
- mwindow->clear(0
, 1
);
+ mwindow->clear(0);
mwindow->load_assets(mwindow->session->drag_assets,
mwindow->edl->local_session->get_selectionstart(),
LOADMODE_PASTE,
mwindow->load_assets(mwindow->session->drag_assets,
mwindow->edl->local_session->get_selectionstart(),
LOADMODE_PASTE,
@@
-619,7
+619,7
@@
int CWindowGUI::drag_stop()
if(mwindow->session->drag_clips->total)
{
mwindow->gui->lock_window("CWindowGUI::drag_stop 2");
if(mwindow->session->drag_clips->total)
{
mwindow->gui->lock_window("CWindowGUI::drag_stop 2");
- mwindow->clear(0
, 1
);
+ mwindow->clear(0);
mwindow->paste_edls(mwindow->session->drag_clips,
LOADMODE_PASTE,
mwindow->session->track_highlighted,
mwindow->paste_edls(mwindow->session->drag_clips,
LOADMODE_PASTE,
mwindow->session->track_highlighted,
@@
-716,8
+716,7
@@
CWrapper(splice_selection)
CWrapper(overwrite_selection)
CWrapper(set_inpoint)
CWrapper(set_outpoint)
CWrapper(overwrite_selection)
CWrapper(set_inpoint)
CWrapper(set_outpoint)
-CWrapper(clear_inpoint)
-CWrapper(clear_outpoint)
+CWrapper(unset_inoutpoint)
CWrapper(toggle_label)
CWrapper(prev_label)
CWrapper(next_label)
CWrapper(toggle_label)
CWrapper(prev_label)
CWrapper(next_label)
@@
-3178,10
+3177,7
@@
int CWindowCanvas::cursor_motion_event()
gui->unlock_window();
mwindow->restart_brender();
mwindow->sync_parameters(CHANGE_PARAMS);
gui->unlock_window();
mwindow->restart_brender();
mwindow->sync_parameters(CHANGE_PARAMS);
- gui->cwindow->playback_engine->que->send_command(CURRENT_FRAME,
- CHANGE_NONE,
- mwindow->edl,
- 1);
+ mwindow->cwindow->refresh_frame(CHANGE_NONE);
if(!redraw) gui->update_tool();
gui->lock_window("CWindowCanvas::cursor_motion_event 2");
}
if(!redraw) gui->update_tool();
gui->lock_window("CWindowCanvas::cursor_motion_event 2");
}
@@
-3270,10
+3266,7
@@
int CWindowCanvas::button_press_event()
mwindow->restart_brender();
mwindow->sync_parameters(CHANGE_PARAMS);
mwindow->restart_brender();
mwindow->sync_parameters(CHANGE_PARAMS);
- gui->cwindow->playback_engine->que->send_command(CURRENT_FRAME,
- CHANGE_NONE,
- mwindow->edl,
- 1);
+ mwindow->cwindow->refresh_frame(CHANGE_NONE);
if(!redraw) gui->update_tool();
gui->lock_window("CWindowCanvas::button_press_event 2");
}
if(!redraw) gui->update_tool();
gui->lock_window("CWindowCanvas::button_press_event 2");
}