X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Frenderfarmclient.C;h=aab7fb4ed66ca806db90680d9c890d08176e28e6;hb=875ae826327bf25abdaffe1db339aabd622addc8;hp=f4eac0dad4c108866577943f5d71a4d8d4b1b9bb;hpb=a10be9aeb2993b4ba5569a7dc6a4a4804c54bf02;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/renderfarmclient.C b/cinelerra-5.1/cinelerra/renderfarmclient.C
index f4eac0da..aab7fb4e 100644
--- a/cinelerra-5.1/cinelerra/renderfarmclient.C
+++ b/cinelerra-5.1/cinelerra/renderfarmclient.C
@@ -70,7 +70,7 @@ RenderFarmClient::RenderFarmClient(int port,
 	this_pid = getpid();
 	(void)nice(nice_value);
 
-
+	boot_defaults = 0;
 	MWindow::init_defaults(boot_defaults, config_path);
 	boot_preferences = new Preferences;
 	boot_preferences->load_defaults(boot_defaults);
@@ -555,8 +555,9 @@ void RenderFarmClientThread::run()
 	TheList::reset();
 
 	int socket_fd = this->socket_fd;
-
-	init_client_keepalive();
+	int watchdog_timeout = client->boot_preferences->renderfarm_watchdog_timeout;
+	if( watchdog_timeout > 0 )
+		init_client_keepalive(watchdog_timeout);
 
 // Get command to run
 	int command;
@@ -580,11 +581,11 @@ void RenderFarmClientThread::run()
 }
 
 
-void RenderFarmClientThread::init_client_keepalive()
+void RenderFarmClientThread::init_client_keepalive(int timeout_secs)
 {
 	keep_alive = new RenderFarmKeepalive(this);
 	keep_alive->start();
-	watchdog = new RenderFarmWatchdog(0, this);
+	watchdog = new RenderFarmWatchdog(timeout_secs, 0, this);
 	watchdog->start();
 }
 
@@ -593,9 +594,9 @@ void RenderFarmClientThread::init_client_keepalive()
 void RenderFarmClientThread::do_tuner(int socket_fd)
 {
 // Currently only 1 tuner driver.  Maybe more someday.
-	DVBTune server(this);
-	server.main_loop();
-	::close(socket_fd);
+//	DVBTune server(this);
+//	server.main_loop();
+//	::close(socket_fd);
 }
 
 
@@ -712,8 +713,7 @@ void RenderFarmKeepalive::run()
 		enable_cancel();
 		sleep(5);
 		disable_cancel();
-		if(!done)
-		{
+		if( !done ) {
 //printf("RenderFarmKeepalive::run 1\n");
 // watchdog thread kills this if it gets stuck
 			client_thread->ping_server();