diff Renderer/Test/send_linda.cc @ 577:5ecdc6b12fe8 draft

merge
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Fri, 23 Oct 2009 17:18:41 +0900
parents 5edaab9b9a59
children 7e33deb9d3f4
line wrap: on
line diff
--- a/Renderer/Test/send_linda.cc	Fri Oct 23 17:02:47 2009 +0900
+++ b/Renderer/Test/send_linda.cc	Fri Oct 23 17:18:41 2009 +0900
@@ -84,11 +84,6 @@
 }
 
 
-void
-linda_init(char *addr, int *size)
-{
-    
-}
 
 int get_serial_id(int fd) {
     char *data;
@@ -138,6 +133,7 @@
 */
 
 static char *xml;
+static char *linda = HOSTNAME;
 
 MainLoopPtr 
 send_linda::init(Viewer *sgroot, int screen_w, int screen_h)
@@ -161,9 +157,8 @@
     
     root->addChild(sgp);
     
-    init_linda();
     addr = file_map(xml, &size);
-    tspace = open_linda_java(HOSTNAME, PORT_NUM);    
+    tspace = open_linda_java(linda, PORT_NUM);    
     serial = get_serial_id(tspace);
     xml_id = serial * 10;
     send_xml(tspace, xml_id, addr, size);   	    
@@ -196,9 +191,16 @@
     for(int i=0;i<argc;i++) {
 	if (strcmp(argv[i],"-xml") == 0 && i+1<=argc) {
 	    xml = argv[i+1];
+	} else if (strcmp(argv[i],"-linda") == 0 && i+1<=argc) {
+	    linda = argv[i+1];
 	}
     }
 
+    if (xml==0) {
+	printf("-xml xml-file is required\n");
+        exit(0);
+    }
+
     return init(manager, argc, argv);
 
 }