projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug fixes, typos, and omits in yuv mod
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
vwindow.C
diff --git
a/cinelerra-5.1/cinelerra/vwindow.C
b/cinelerra-5.1/cinelerra/vwindow.C
index e22dcde06972f8b47a193c60ba12bbf8946fc051..8de4eb73170154add8af0a090bb621e81107e84c 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vwindow.C
+++ b/
cinelerra-5.1/cinelerra/vwindow.C
@@
-328,10
+328,7
@@
void VWindow::update_position(int change_type,
{
//printf("VWindow::update_position %d\n", __LINE__);
//edl->dump();
{
//printf("VWindow::update_position %d\n", __LINE__);
//edl->dump();
- playback_engine->que->send_command(CURRENT_FRAME,
- change_type,
- edl,
- 1);
+ playback_engine->refresh_frame(change_type, edl);
double position = edl->local_session->get_selectionstart(1);
if(lock_window) gui->lock_window("VWindow::update_position");
double position = edl->local_session->get_selectionstart(1);
if(lock_window) gui->lock_window("VWindow::update_position");
@@
-340,12
+337,9
@@
void VWindow::update_position(int change_type,
}
}
}
}
-void VWindow::stop_playback()
+void VWindow::stop_playback(
int wait
)
{
{
- int locked = gui->get_window_lock();
- if( locked ) gui->unlock_window();
- playback_engine->interrupt_playback(1);
- if( locked ) gui->lock_window("VWindow::stop_playback");
+ playback_engine->stop_playback(wait);
}
int VWindow::update_position(double position)
}
int VWindow::update_position(double position)
@@
-390,22
+384,12
@@
void VWindow::set_outpoint()
}
}
}
}
-void VWindow::clear_inpoint()
-{
- EDL *edl = get_edl();
- if(edl)
- {
- edl->local_session->unset_inpoint();
- gui->timebar->update(1);
- }
-}
-
-void VWindow::clear_outpoint()
+void VWindow::unset_inoutpoint()
{
EDL *edl = get_edl();
if(edl)
{
{
EDL *edl = get_edl();
if(edl)
{
- edl->
local_session->unset_
outpoint();
+ edl->
unset_in
outpoint();
gui->timebar->update(1);
}
}
gui->timebar->update(1);
}
}