projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix popup menu titlebar click, timebar updates scopewindow on btn-release, scopewindo...
[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 93e0a457aba68912903ef05b7d5fe21e10700cc1..8b93262c4e6930cd53027d40c9b3b5f2309d1c67 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.C
+++ b/
cinelerra-5.1/cinelerra/mwindow.C
@@
-3081,7
+3081,6
@@
void MWindow::set_auto_keyframes(int value)
gui->mbuttons->edit_panel->keyframe->update(value);
gui->flush();
cwindow->gui->lock_window("MWindow::set_auto_keyframes");
gui->mbuttons->edit_panel->keyframe->update(value);
gui->flush();
cwindow->gui->lock_window("MWindow::set_auto_keyframes");
- cwindow->gui->edit_panel->keyframe->update(value);
cwindow->gui->flush();
cwindow->gui->unlock_window();
}
cwindow->gui->flush();
cwindow->gui->unlock_window();
}
@@
-3092,7
+3091,6
@@
void MWindow::set_span_keyframes(int value)
gui->mbuttons->edit_panel->span_keyframe->update(value);
gui->flush();
cwindow->gui->lock_window("MWindow::set_span_keyframes");
gui->mbuttons->edit_panel->span_keyframe->update(value);
gui->flush();
cwindow->gui->lock_window("MWindow::set_span_keyframes");
- cwindow->gui->edit_panel->span_keyframe->update(value);
cwindow->gui->flush();
cwindow->gui->unlock_window();
}
cwindow->gui->flush();
cwindow->gui->unlock_window();
}
@@
-4458,11
+4456,7
@@
void MWindow::remove_from_caches(Indexable *idxbl)
delete gui->render_engine;
gui->render_engine = 0;
}
delete gui->render_engine;
gui->render_engine = 0;
}
- if( gui->resource_thread->render_engine_id == idxbl->id ) {
- gui->resource_thread->render_engine_id = -1;
- delete gui->resource_thread->render_engine;
- gui->resource_thread->render_engine = 0;
- }
+ gui->resource_thread->close_indexable(idxbl);
if( !idxbl->is_asset ) return;
Asset *asset = (Asset *)idxbl;
audio_cache->delete_entry(asset);
if( !idxbl->is_asset ) return;
Asset *asset = (Asset *)idxbl;
audio_cache->delete_entry(asset);
@@
-5085,13
+5079,17
@@
PatchGUI *MWindow::get_patchgui(Track *track)
return patchgui;
}
return patchgui;
}
-int MWindow::get_cpus()
+int MWindow::get_cpus(
int out_w, int out_h
)
{
{
- i
nt
out_w = edl->session->output_w;
- i
nt
out_h = edl->session->output_h;
+ i
f( !out_w )
out_w = edl->session->output_w;
+ i
f( !out_h )
out_h = edl->session->output_h;
int cpus = out_w*out_h/0x80000 + 1;
if( cpus > preferences->processors )
cpus = preferences->processors;
return cpus;
}
int cpus = out_w*out_h/0x80000 + 1;
if( cpus > preferences->processors )
cpus = preferences->processors;
return cpus;
}
+int MWindow::get_cpus()
+{
+ return get_cpus(edl->session->output_w, edl->session->output_h);
+}