projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
es.po update by rafa, add ms win10 cygwin port, add pulseaudio, new config flags...
[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 70138be063718066ce11e5474bbb1849ca1e21ac..076b0436cf1dbd85c8daa9379db37a487db4c046 100644
(file)
--- a/
cinelerra-5.1/cinelerra/resourcethread.C
+++ b/
cinelerra-5.1/cinelerra/resourcethread.C
@@
-174,6
+174,7
@@
ResourceThread::ResourceThread(MWindow *mwindow, MWindowGUI *gui)
prev_l = 0;
operation_count = 0;
render_engine = 0;
prev_l = 0;
operation_count = 0;
render_engine = 0;
+ render_engine_id = -1;
audio_asset = 0;
audio_source = 0;
audio_asset = 0;
audio_source = 0;
@@
-270,8
+271,10
@@
void ResourceThread::stop_draw(int reset)
//printf("ResourceThread::stop_draw %d %d\n", __LINE__, reset);
//BC_Signals::dump_stack();
//printf("ResourceThread::stop_draw %d %d\n", __LINE__, reset);
//BC_Signals::dump_stack();
- if(reset) items.remove_all_objects();
- operation_count++;
+ if( reset ) {
+ items.remove_all_objects();
+ ++operation_count;
+ }
item_lock->unlock();
prev_x = -1;
prev_h = 0;
item_lock->unlock();
prev_x = -1;
prev_h = 0;
@@
-757,7
+760,7
@@
void ResourceThread::do_audio(AResourceThreadItem *item)
low);
if(timer->get_difference() > 250 || item->last)
{
low);
if(timer->get_difference() > 250 || item->last)
{
- mwindow->gui->update(0,
3
, 0, 0, 0, 0, 0);
+ mwindow->gui->update(0,
IGNORE_THREAD
, 0, 0, 0, 0, 0);
timer->update();
}
}
timer->update();
}
}