Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improvement: use the update_method provide by the server

Browse Source
This commit is contained in:
Laurent Clouet
2015-01-13 21:07:58 +01:00
parent 207533867b
commit ffb49740af
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/sheepit/client/Job.java
View File

@@ -46,7 +46,7 @@ public class Job {
private Configuration config; private Configuration config;
public Job(Configuration config_, String id_, String frame_, String revision_, String path_, boolean use_gpu, String command_, String script_, String sceneMd5_, String rendererMd5_, String extras_, boolean synchronous_upload_) { public Job(Configuration config_, String id_, String frame_, String revision_, String path_, boolean use_gpu, String command_, String script_, String sceneMd5_, String rendererMd5_, String extras_, boolean synchronous_upload_, String update_method_) {
config = config_; config = config_;
id = id_; id = id_;
numFrame = frame_; numFrame = frame_;
@@ -64,7 +64,7 @@ public class Job {
memoryUsed = 0; memoryUsed = 0;
script = script_; script = script_;
maxOutputNbLines = 0; maxOutputNbLines = 0;
updateRenderingStatusMethod = null; updateRenderingStatusMethod = update_method_;
process = null; process = null;
askForRendererKill = false; askForRendererKill = false;

8
src/com/sheepit/client/Server.java
View File

@@ -385,6 +385,11 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
frame_extras = job_node.getAttribute("extras"); frame_extras = job_node.getAttribute("extras");
} }
String update_method = null;
if (renderer_node.hasAttribute("update_method")) {
update_method = renderer_node.getAttribute("update_method");;
}
Job a_job = new Job( Job a_job = new Job(
this.user_config, this.user_config,
job_node.getAttribute("id"), job_node.getAttribute("id"),
@@ -397,7 +402,8 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
job_node.getAttribute("archive_md5"), job_node.getAttribute("archive_md5"),
renderer_node.getAttribute("md5"), renderer_node.getAttribute("md5"),
frame_extras, frame_extras,
synchronous_upload synchronous_upload,
update_method
); );
this.client.getGui().framesRemaining(remaining_frames); this.client.getGui().framesRemaining(remaining_frames);