X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fperformanceprefs.C;h=148670a07b33ef6292b1c16afa5577548f5f2f0b;hb=5c3e5d5e76c29b49708b4e42d194402150b508ab;hp=1404ea8cb6296fef2bb5535e4b6c4f845ccaf50f;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/performanceprefs.C b/cinelerra-5.1/cinelerra/performanceprefs.C index 1404ea8c..148670a0 100644 --- a/cinelerra-5.1/cinelerra/performanceprefs.C +++ b/cinelerra-5.1/cinelerra/performanceprefs.C @@ -55,13 +55,13 @@ void PerformancePrefs::create_objects() { int x, y; int xmargin1; - int xmargin2 = 170; - int xmargin3 = 250; - int xmargin4 = 380; + int xmargin2 = 180; + int xmargin3 = 260; + int xmargin4 = 420; char string[BCTEXTLEN]; BC_Resources *resources = BC_WindowBase::get_resources(); BC_WindowBase *win; - int maxw, curw, y1; + int maxw, curw; node_list = 0; generate_node_list(); @@ -77,55 +77,36 @@ void PerformancePrefs::create_objects() // // y += get_text_height(LARGEFONT) + 5; - int ybx[2]; - ybx[0] = y; + int y0 = y; win = add_subwindow(new BC_Title(x, y + 5, _("Cache size (MB):"), MEDIUMFONT, resources->text_default)); maxw = win->get_w(); - ybx[1] = y += 30; + int y1 = y += 30; win = add_subwindow(new BC_Title(x, y + 5, _("Seconds to preroll renders:"))); if((curw = win->get_w()) > maxw) maxw = curw; maxw += x + 5; - cache_size = new CICacheSize(maxw, - ybx[0], - pwindow, - this); + cache_size = new CICacheSize(maxw, y0, pwindow, this); cache_size->create_objects(); + add_subwindow(new BC_Title(x, y + 5, _("Seconds to preroll renders:"))); - PrefsRenderPreroll *preroll = new PrefsRenderPreroll(pwindow, - this, - maxw, - ybx[1]); + PrefsRenderPreroll *preroll = new PrefsRenderPreroll(pwindow, this, maxw, y1); preroll->create_objects(); y += 30; - PrefsForceUniprocessor *force_1cpu = new PrefsForceUniprocessor(pwindow, x, y); - add_subwindow(force_1cpu); - int x1 = force_1cpu->get_x() + force_1cpu->get_w() + 50; + int x1 = x + xmargin4; + BC_Title *smp_title = new BC_Title(x1, y + 5, _("Project SMP cpus:")); + add_subwindow(smp_title); + int x2 = x1 + smp_title->get_w() + 5; + PrefsProjectSMP *proj_smp = new PrefsProjectSMP(pwindow, this, x2, y); + proj_smp->create_objects(); - PrefsTrapSigSEGV *trap_segv = new PrefsTrapSigSEGV(this, x1, y); - add_subwindow(trap_segv); - int x2 = x1 + trap_segv->get_w() + 10; - add_subwindow(new BC_Title(x2, y, _("(must be root)"), MEDIUMFONT, RED)); - y += 30; - - PrefsTrapSigINTR *trap_intr = new PrefsTrapSigINTR(this, x1, y); - add_subwindow(trap_intr); - add_subwindow(new BC_Title(x2, y, _("(must be root)"), MEDIUMFONT, RED)); - ffmpeg_marker_indexes = new PrefsFFMPEGMarkerIndecies(this, x, y); - add_subwindow(ffmpeg_marker_indexes); - y += 30; - - ffmpeg_early_probe = new PrefsFFMPEGEarlyProbe(this, x, y); - add_subwindow(ffmpeg_early_probe); + PrefsForceUniprocessor *force_1cpu = new PrefsForceUniprocessor(pwindow, x, y); + add_subwindow(force_1cpu); y += 30; - - - // Background rendering add_subwindow(new BC_Bar(5, y, get_w() - 10)); y += 5; @@ -134,9 +115,7 @@ void PerformancePrefs::create_objects() add_subwindow(new BC_Title(x, y, _("Background Rendering (Video only)"), LARGEFONT, resources->text_default)); y1 = y += 30; - win = add_subwindow(new PrefsUseBRender(pwindow, - x, - y)); + win = add_subwindow(new PrefsUseBRender(pwindow, x, y)); y += win->get_h() + 10; win = add_subwindow(new BC_Title(x, y, _("Frames per background rendering job:"))); @@ -519,77 +498,6 @@ int PrefsForceUniprocessor::handle_event() return 1; } -PrefsTrapSigSEGV::PrefsTrapSigSEGV(PerformancePrefs *perf_prefs, int x, int y) - : BC_CheckBox(x, y, - perf_prefs->pwindow->thread->preferences->trap_sigsegv, - _("trap sigSEGV")) -{ - this->perf_prefs = perf_prefs; -} -PrefsTrapSigSEGV::~PrefsTrapSigSEGV() -{ -} -int PrefsTrapSigSEGV::handle_event() -{ - perf_prefs->pwindow->thread->preferences->trap_sigsegv = get_value(); - return 1; -} - -PrefsTrapSigINTR::PrefsTrapSigINTR(PerformancePrefs *perf_prefs, int x, int y) - : BC_CheckBox(x, y, - perf_prefs->pwindow->thread->preferences->trap_sigintr, - _("trap sigINT")) -{ - this->perf_prefs = perf_prefs; -} -PrefsTrapSigINTR::~PrefsTrapSigINTR() -{ -} -int PrefsTrapSigINTR::handle_event() -{ - perf_prefs->pwindow->thread->preferences->trap_sigintr = get_value(); - return 1; -} - - -PrefsFFMPEGEarlyProbe::PrefsFFMPEGEarlyProbe(PerformancePrefs *perf_prefs, int x, int y) - : BC_CheckBox(x, y, - perf_prefs->pwindow->thread->preferences->ffmpeg_early_probe, - _("On file open, ffmpeg probes early")) -{ - this->perf_prefs = perf_prefs; -} -PrefsFFMPEGEarlyProbe::~PrefsFFMPEGEarlyProbe() -{ -} - -int PrefsFFMPEGEarlyProbe::handle_event() -{ - perf_prefs->pwindow->thread->preferences->ffmpeg_early_probe = get_value(); - return 1; -} - - -PrefsFFMPEGMarkerIndecies::PrefsFFMPEGMarkerIndecies(PerformancePrefs *perf_prefs, int x, int y) - : BC_CheckBox(x, y, - perf_prefs->pwindow->thread->preferences->ffmpeg_marker_indexes, - _("build ffmpeg marker indexes")) -{ - this->perf_prefs = perf_prefs; -} -PrefsFFMPEGMarkerIndecies::~PrefsFFMPEGMarkerIndecies() -{ -} - -int PrefsFFMPEGMarkerIndecies::handle_event() -{ - perf_prefs->pwindow->thread->preferences->ffmpeg_marker_indexes = get_value(); - return 1; -} - - - - PrefsRenderFarmConsolidate::PrefsRenderFarmConsolidate(PreferencesWindow *pwindow, int x, int y) @@ -610,9 +518,6 @@ int PrefsRenderFarmConsolidate::handle_event() } - - - PrefsRenderFarmPort::PrefsRenderFarmPort(PreferencesWindow *pwindow, PerformancePrefs *subwindow, int x, @@ -861,6 +766,25 @@ int PrefsRenderFarmReset::handle_event() +PrefsProjectSMP::PrefsProjectSMP(PreferencesWindow *pwindow, + PerformancePrefs *subwindow, int x, int y) + : BC_TumbleTextBox(subwindow, + (int64_t)pwindow->thread->preferences->project_smp, + (int64_t)1, (int64_t)100, x, y, 100) +{ + this->pwindow = pwindow; +} +PrefsProjectSMP::~PrefsProjectSMP() +{ +} +int PrefsProjectSMP::handle_event() +{ + pwindow->thread->preferences->project_smp = atol(get_text()); + return 1; +} + + + PrefsRenderFarmJobs::PrefsRenderFarmJobs(PreferencesWindow *pwindow, @@ -914,10 +838,9 @@ int PrefsRenderFarmMountpoint::handle_event() PrefsRenderFarmVFS::PrefsRenderFarmVFS(PreferencesWindow *pwindow, - PerformancePrefs *subwindow, - int x, - int y) - : BC_CheckBox(x, y, pwindow->thread->preferences->renderfarm_vfs, _("Use virtual filesystem")) + PerformancePrefs *subwindow, int x, int y) + : BC_CheckBox(x, y, pwindow->thread->preferences->renderfarm_vfs, + _("Use virtual filesystem")) { this->pwindow = pwindow; this->subwindow = subwindow;