projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor changes; mostly for new Context Help feature
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
resourcethread.C
diff --git
a/cinelerra-5.1/cinelerra/resourcethread.C
b/cinelerra-5.1/cinelerra/resourcethread.C
index 27794d27c388884101fe939f80d3d8507abe3301..fca02199b4f7f54cbdb7b83edd2a0a471f78d96b 100644
(file)
--- a/
cinelerra-5.1/cinelerra/resourcethread.C
+++ b/
cinelerra-5.1/cinelerra/resourcethread.C
@@
-452,7
+452,8
@@
void ResourceVideoThread::do_video(VResourceThreadItem *item)
item->pixmap->draw_vframe(temp_picon2,
item->picon_x, item->picon_y,
item->picon_w, item->picon_h, 0, 0);
item->pixmap->draw_vframe(temp_picon2,
item->picon_x, item->picon_y,
item->picon_w, item->picon_h, 0, 0);
- gui->update(0, IGNORE_THREAD, 0, 0, 0, 0, 0);
+ TimelinePane *pane = gui->pane[item->pane_number];
+ if( pane ) pane->update(0, IGNORE_THREAD, 0, 0);
}
}
}
}
@@
-670,17
+671,18
@@
void ResourceThread::stop()
video_thread->stop();
}
video_thread->stop();
}
-void ResourceThread::reset(int pane_number)
+void ResourceThread::reset(int pane_number
, int indexes_only
)
{
audio_thread->reset(pane_number);
{
audio_thread->reset(pane_number);
- video_thread->reset(pane_number);
+ if( !indexes_only )
+ video_thread->reset(pane_number);
}
void ResourceThread::close_indexable(Indexable *idxbl)
{
if( audio_thread && audio_thread->render_engine_id == idxbl->id )
audio_thread->close_render_engine();
}
void ResourceThread::close_indexable(Indexable *idxbl)
{
if( audio_thread && audio_thread->render_engine_id == idxbl->id )
audio_thread->close_render_engine();
- if( video_thread &&
audi
o_thread->render_engine_id == idxbl->id )
+ if( video_thread &&
vide
o_thread->render_engine_id == idxbl->id )
video_thread->close_render_engine();
}
video_thread->close_render_engine();
}