merge hv v6, rework trace methods

[goodguy/history.git] / cinelerra-5.1 / cinelerra / performanceprefs.C

diff --git a/cinelerra-5.1/cinelerra/performanceprefs.C b/cinelerra-5.1/cinelerra/performanceprefs.C
index 1404ea8cb6296fef2bb5535e4b6c4f845ccaf50f..84672769fc7251ea6bba1c4323772e17999eccbe 100644 (file)
--- a/cinelerra-5.1/cinelerra/performanceprefs.C
+++ b/cinelerra-5.1/cinelerra/performanceprefs.C
@@ -100,15 +100,22 @@ void PerformancePrefs::create_objects()
                maxw,
                ybx[1]);
        preroll->create_objects();
+       int x1 = preroll->get_x() + preroll->get_w() + 20;
+       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();
+       
        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;
+       x1 = force_1cpu->get_x() + force_1cpu->get_w() + 120;
 
        PrefsTrapSigSEGV *trap_segv = new PrefsTrapSigSEGV(this, x1, y);
        add_subwindow(trap_segv);
-       int x2 = x1 + trap_segv->get_w() + 10;
+       x2 = x1 + trap_segv->get_w() + 10;
        add_subwindow(new BC_Title(x2, y, _("(must be root)"), MEDIUMFONT, RED));
        y += 30;
 
@@ -121,10 +128,10 @@ void PerformancePrefs::create_objects()
 
        ffmpeg_early_probe = new PrefsFFMPEGEarlyProbe(this, x, y);
        add_subwindow(ffmpeg_early_probe);
-       y += 30;
-
-
 
+       yuv420p_dvdlace = new PrefsYUV420P_DVDlace(pwindow, this, x1, y);
+       add_subwindow(yuv420p_dvdlace);
+       y += 30;
 
 // Background rendering
        add_subwindow(new BC_Bar(5, y,  get_w() - 10));
@@ -861,6 +868,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 +940,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;
@@ -929,3 +954,19 @@ int PrefsRenderFarmVFS::handle_event()
        return 1;
 }
 
+
+PrefsYUV420P_DVDlace::PrefsYUV420P_DVDlace(PreferencesWindow *pwindow,
+       PerformancePrefs *subwindow, int x, int y)
+ : BC_CheckBox(x, y, pwindow->thread->preferences->dvd_yuv420p_interlace,
+       _("Use yuv420p dvd interlace format"))
+{
+       this->pwindow = pwindow;
+       this->subwindow = subwindow;
+}
+
+int PrefsYUV420P_DVDlace::handle_event()
+{
+       pwindow->thread->preferences->dvd_yuv420p_interlace = get_value();
+       return 1;
+}
+