X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frenderfarmclient.h;h=5ee6d5ef87339e98226701d6361fe4e4c60d0ef0;hp=1ee7ce53c2b0518956e14b70392a219dbebafaf5;hb=7e5a0760f40ff787cc3d93cb7768a901ebe52809;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb

diff --git a/cinelerra-5.1/cinelerra/renderfarmclient.h b/cinelerra-5.1/cinelerra/renderfarmclient.h
index 1ee7ce53..5ee6d5ef 100644
--- a/cinelerra-5.1/cinelerra/renderfarmclient.h
+++ b/cinelerra-5.1/cinelerra/renderfarmclient.h
@@ -46,14 +46,9 @@ public:
 
 	void main_loop();
 
-
-
-
 // After a socket times out, kill the render node.
 	void kill_client();
 
-//	RenderFarmClientThread *thread;
-
 	int port;
 	char *deamon_path;
 // PID to be returned to background render object
@@ -61,7 +56,6 @@ public:
 // The plugin paths must be known before any threads are started
 	BC_Hash *boot_defaults;
 	Preferences *boot_preferences;
-	ArrayList<PluginServer*> *plugindb;
 };
 
 class RenderFarmClientThread : public Thread
@@ -86,28 +80,25 @@ public:
 // Lock access to the socket during complete transactions
 	void lock(const char *location);
 	void unlock();
-
-
+	static void trap_hook(FILE *fp, void *vp);
 
 	void do_tuner(int socket_fd);
 	void do_packages(int socket_fd);
 
-
 	void get_command(int socket_fd, int *command);
 	void read_preferences(int socket_fd,
 		Preferences *preferences);
 	void read_asset(int socket_fd, Asset *asset);
-	void read_edl(int socket_fd,
-		EDL *edl,
-		Preferences *preferences);
+	void read_edl(int socket_fd, EDL *edl, Preferences *preferences);
 	int read_package(int socket_fd, RenderPackage *package);
 	int send_completion(int socket_fd);
 	void ping_server();
-	void init_client_keepalive();
+	void init_client_keepalive(int timeout_secs);
 
 	void main_loop(int socket_fd);
 	void run();
 
+	EDL *edl;
 // Everything must be contained in run()
 	int socket_fd;
 // Read only