rework android-rmt display, add a few buttons

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

diff --git a/cinelerra-5.0/cinelerra/performanceprefs.C b/cinelerra-5.0/cinelerra/performanceprefs.C
index 3f77dce521347c450c343b43760cdde66300f7f3..a481f81495c46eaca08a6de68b04224e43f95775 100644 (file)
--- a/cinelerra-5.0/cinelerra/performanceprefs.C
+++ b/cinelerra-5.0/cinelerra/performanceprefs.C
@@ -93,28 +93,22 @@ void PerformancePrefs::create_objects()
        add_subwindow(force_1cpu);
 
        int x1 = force_1cpu->get_x() + force_1cpu->get_w() + 50;
-       int y1 = force_1cpu->get_y();
 
-       PrefsTrapSigSEGV *trap_segv = new PrefsTrapSigSEGV(this, x1, y1);
+       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, y1, _("(must be root)"), MEDIUMFONT, RED));
-       y1 += 30;
-       PrefsTrapSigINTR *trap_intr = new PrefsTrapSigINTR(this, x1, y1);
-       add_subwindow(trap_intr);
-       add_subwindow(new BC_Title(x2, y1, _("(must be root)"), MEDIUMFONT, RED));
+       add_subwindow(new BC_Title(x2, y, _("(must be root)"), MEDIUMFONT, RED));
        y += 30;
 
-       file_forking = new PrefsFileForking(this, x, y);
-       add_subwindow(file_forking);
-       file_forking->check_enable();
+       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_indecies = new PrefsFFMPEGMarkerIndecies(this, x, y);
+       add_subwindow(ffmpeg_marker_indecies);
        y += 30;
 
        ffmpeg_early_probe = new PrefsFFMPEGEarlyProbe(this, x, y);
        add_subwindow(ffmpeg_early_probe);
-       x1 = x + ffmpeg_early_probe->get_w() + 24;
-       ffmpeg_marker_indecies = new PrefsFFMPEGMarkerIndecies(this, x1, y);
-       add_subwindow(ffmpeg_marker_indecies);
        y += 30;
 
 
@@ -522,7 +516,6 @@ PrefsTrapSigSEGV::~PrefsTrapSigSEGV()
 int PrefsTrapSigSEGV::handle_event()
 {
        perf_prefs->pwindow->thread->preferences->trap_sigsegv = get_value();
-       perf_prefs->file_forking->check_enable();
        return 1;
 }
 
@@ -539,40 +532,9 @@ PrefsTrapSigINTR::~PrefsTrapSigINTR()
 int PrefsTrapSigINTR::handle_event()
 {
        perf_prefs->pwindow->thread->preferences->trap_sigintr = get_value();
-       perf_prefs->file_forking->check_enable();
-       return 1;
-}
-
-
-PrefsFileForking::PrefsFileForking(PerformancePrefs *perf_prefs, int x, int y)
- : BC_CheckBox(x, y, 
-       perf_prefs->pwindow->thread->preferences->file_forking,
-       _("enable/disable file fork"))
-{
-       this->perf_prefs = perf_prefs;
-}
-PrefsFileForking::~PrefsFileForking()
-{
-}
-int PrefsFileForking::handle_event()
-{
-       perf_prefs->pwindow->thread->preferences->file_forking = get_value();
        return 1;
 }
 
-void PrefsFileForking::check_enable()
-{
-       Preferences *preferences = perf_prefs->pwindow->thread->preferences;
-       if( preferences->trap_sigsegv || preferences->trap_sigintr ) {
-               preferences->file_forking = 0;
-               update(0, 0);
-               disable();
-       }
-       else if( !preferences->trap_sigsegv && !preferences->trap_sigintr ) {
-               enable();
-       }
-}
-
 
 PrefsFFMPEGEarlyProbe::PrefsFFMPEGEarlyProbe(PerformancePrefs *perf_prefs, int x, int y)
  : BC_CheckBox(x, y,