X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fperformanceprefs.h;h=61d43a5d49cfe1891dab260e603ac853c68b12b5;hp=a792300261cd2b3e8c6cfeae880c214f7aceb59b;hb=502b6f3b6fd04f6b01c6d70dcb81aa304dd0db1c;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb

diff --git a/cinelerra-5.1/cinelerra/performanceprefs.h b/cinelerra-5.1/cinelerra/performanceprefs.h
index a7923002..61d43a5d 100644
--- a/cinelerra-5.1/cinelerra/performanceprefs.h
+++ b/cinelerra-5.1/cinelerra/performanceprefs.h
@@ -27,6 +27,7 @@
 #include "mwindow.inc"
 #include "performanceprefs.inc"
 #include "preferencesthread.h"
+#include "probeprefs.inc"
 
 
 class PerformancePrefs : public PreferencesDialog
@@ -40,6 +41,7 @@ public:
 	void generate_node_list();
 	void update_node_list();
 	void update_rates();
+	void start_probe_dialog();
 
 	int hot_node;
 
@@ -54,25 +56,21 @@ public:
 		TOTAL_COLUMNS
 	};
 
-	ArrayList<BC_ListBoxItem*> nodes[4];
+	ArrayList<BC_ListBoxItem*> nodes[TOTAL_COLUMNS];
 	PrefsRenderFarmEditNode *edit_node;
 	PrefsRenderFarmPort *edit_port;
 	PrefsRenderFarmNodes *node_list;
+	PrefsRenderFarmWatchdog *renderfarm_watchdog;
 	FormatTools *brender_tools;
 	BC_Title *master_rate;
-	PrefsFFMPEGEarlyProbe *ffmpeg_early_probe;
-	PrefsYUV420P_DVDlace *yuv420p_dvdlace;
-	PrefsFFMPEGMarkerIndecies *ffmpeg_marker_indexes;
 };
 
 
-
 class PrefsUseBRender : public BC_CheckBox
 {
 public:
 	PrefsUseBRender(PreferencesWindow *pwindow,
-		int x,
-		int y);
+		int x, int y);
 	int handle_event();
 	PreferencesWindow *pwindow;
 };
@@ -82,14 +80,11 @@ class PrefsBRenderFragment : public BC_TumbleTextBox
 public:
 	PrefsBRenderFragment(PreferencesWindow *pwindow,
 		PerformancePrefs *subwindow,
-		int x,
-		int y);
+		int x, int y);
 	int handle_event();
 	PreferencesWindow *pwindow;
 };
 
-
-
 class PrefsRenderPreroll : public BC_TumbleTextBox
 {
 public:
@@ -125,37 +120,6 @@ public:
 	PreferencesWindow *pwindow;
 };
 
-class PrefsTrapSigSEGV : public BC_CheckBox
-{
-public:
-	PrefsTrapSigSEGV(PerformancePrefs *perf_prefs, int x, int y);
-	~PrefsTrapSigSEGV();
-	int handle_event();
-
-	PerformancePrefs *perf_prefs;
-};
-
-class PrefsTrapSigINTR : public BC_CheckBox
-{
-public:
-	PrefsTrapSigINTR(PerformancePrefs *perf_prefs, int x, int y);
-	~PrefsTrapSigINTR();
-	int handle_event();
-
-	PerformancePrefs *perf_prefs;
-};
-
-class PrefsFFMPEGEarlyProbe : public BC_CheckBox
-{
-public:
-	PrefsFFMPEGEarlyProbe(PerformancePrefs *perf_prefs, int x, int y);
-	~PrefsFFMPEGEarlyProbe();
-
-	int handle_event();
-
-	PerformancePrefs *perf_prefs;
-};
-
 class PrefsFFMPEGMarkerIndecies : public BC_CheckBox
 {
 public:
@@ -167,9 +131,6 @@ public:
 	PerformancePrefs *perf_prefs;
 };
 
-
-
-
 class PrefsRenderFarm : public BC_CheckBox
 {
 public:
@@ -178,7 +139,6 @@ public:
 
 	int handle_event();
 
-
 	PreferencesWindow *pwindow;
 };
 
@@ -190,7 +150,6 @@ public:
 
 	int handle_event();
 
-
 	PreferencesWindow *pwindow;
 };
 
@@ -200,8 +159,7 @@ class PrefsRenderFarmPort : public BC_TumbleTextBox
 public:
 	PrefsRenderFarmPort(PreferencesWindow *pwindow,
 		PerformancePrefs *subwindow,
-		int x,
-		int y);
+		int x, int y);
 	~PrefsRenderFarmPort();
 
 	int handle_event();
@@ -225,8 +183,7 @@ class PrefsRenderFarmJobs : public BC_TumbleTextBox
 public:
 	PrefsRenderFarmJobs(PreferencesWindow *pwindow,
 		PerformancePrefs *subwindow,
-		int x,
-		int y);
+		int x, int y);
 	~PrefsRenderFarmJobs();
 
 	int handle_event();
@@ -239,8 +196,7 @@ class PrefsRenderFarmMountpoint : public BC_TextBox
 public:
 	PrefsRenderFarmMountpoint(PreferencesWindow *pwindow,
 		PerformancePrefs *subwindow,
-		int x,
-		int y);
+		int x, int y);
 	~PrefsRenderFarmMountpoint();
 
 	int handle_event();
@@ -270,6 +226,10 @@ public:
 	int handle_event();
 	int selection_changed();
 	int column_resize_event();
+	void update_list();
+
+	const char *titles[PerformancePrefs::TOTAL_COLUMNS];
+	int widths[PerformancePrefs::TOTAL_COLUMNS];
 
 	PreferencesWindow *pwindow;
 	PerformancePrefs *subwindow;
@@ -325,7 +285,6 @@ public:
 	int handle_event();
 
 	PerformancePrefs *subwindow;
-
 	PreferencesWindow *pwindow;
 };
 
@@ -341,13 +300,11 @@ public:
 	PreferencesWindow *pwindow;
 };
 
-
 class PrefsRenderFarmReset : public BC_GenericButton
 {
 public:
 	PrefsRenderFarmReset(PreferencesWindow *pwindow,
-		PerformancePrefs *subwindow,
-		int x, int y);
+		PerformancePrefs *subwindow, int x, int y);
 
 	int handle_event();
 
@@ -355,13 +312,11 @@ public:
 	PreferencesWindow *pwindow;
 };
 
-
-class PrefsYUV420P_DVDlace : public BC_CheckBox
+class PrefsRenderFarmWatchdog : public BC_TumbleTextBox
 {
 public:
-	PrefsYUV420P_DVDlace(PreferencesWindow *pwindow,
-		PerformancePrefs *subwindow,
-		int x, int y);
+	PrefsRenderFarmWatchdog(PreferencesWindow *pwindow,
+		PerformancePrefs *subwindow, int x, int y);
 
 	int handle_event();
 
@@ -370,16 +325,17 @@ public:
 };
 
 
-
 class CICacheSize : public BC_TumbleTextBox
 {
 public:
-	CICacheSize(int x,
-		int y,
+	CICacheSize(int x, int y,
 		PreferencesWindow *pwindow,
 		PerformancePrefs *subwindow);
+
 	int handle_event();
+
 	PreferencesWindow *pwindow;
 };
 
+
 #endif