Index: trunk/Ohana/src/opihi/dimm/Camera.c
===================================================================
--- trunk/Ohana/src/opihi/dimm/Camera.c	(revision 2598)
+++ trunk/Ohana/src/opihi/dimm/Camera.c	(revision 7917)
@@ -14,9 +14,9 @@
       return (TRUE);
     }
-    fprintf (stderr, "retry...\n");
+    gprint (GP_ERR, "retry...\n");
   }
   
-  fprintf (stderr, "failed to init sbig camera on %d\n", port);
-  fprintf (stderr, "%s\n", sbig_show_error (state));
+  gprint (GP_ERR, "failed to init sbig camera on %d\n", port);
+  gprint (GP_ERR, "%s\n", sbig_show_error (state));
   return (FALSE);
 }
@@ -24,21 +24,21 @@
 void DumpCameraInfo () {
 
-      fprintf (stderr, "opened sbig camera:\n");
-      fprintf (stderr, "linux_version: %f\n",      info.linux_version);
-      fprintf (stderr, "nmbr_bad_columns: %d\n",   info.nmbr_bad_columns);
-      fprintf (stderr, "imaging_abg_type: %d\n",   info.imaging_abg_type);
-      fprintf (stderr, "serial_number: %s\n",      info.serial_number);
-      fprintf (stderr, "firmware_version: %d\n",   info.firmware_version);
-      fprintf (stderr, "camera_name: %s\n",        info.camera_name);
-      fprintf (stderr, "nmbr_readout_modes: %d\n", info.camera_info[0].nmbr_readout_modes);
-      fprintf (stderr, "mode: %d\n",               info.camera_info[0].readout_mode[0].mode);
-      fprintf (stderr, "width: %d\n",              info.camera_info[0].readout_mode[0].width);
-      fprintf (stderr, "height: %d\n",             info.camera_info[0].readout_mode[0].height);
-      fprintf (stderr, "gain: %d\n",               info.camera_info[0].readout_mode[0].gain);
-      fprintf (stderr, "pixel_width: %d\n",        info.camera_info[0].readout_mode[0].pixel_width);
-      fprintf (stderr, "pixel_height: %d\n",       info.camera_info[0].readout_mode[0].pixel_height);
-
-      fprintf (stderr, "ST5_AD_size: %d\n", info.ST5_AD_size);
-      fprintf (stderr, "ST5_filter_type: %d\n", info.ST5_filter_type);
+      gprint (GP_ERR, "opened sbig camera:\n");
+      gprint (GP_ERR, "linux_version: %f\n",      info.linux_version);
+      gprint (GP_ERR, "nmbr_bad_columns: %d\n",   info.nmbr_bad_columns);
+      gprint (GP_ERR, "imaging_abg_type: %d\n",   info.imaging_abg_type);
+      gprint (GP_ERR, "serial_number: %s\n",      info.serial_number);
+      gprint (GP_ERR, "firmware_version: %d\n",   info.firmware_version);
+      gprint (GP_ERR, "camera_name: %s\n",        info.camera_name);
+      gprint (GP_ERR, "nmbr_readout_modes: %d\n", info.camera_info[0].nmbr_readout_modes);
+      gprint (GP_ERR, "mode: %d\n",               info.camera_info[0].readout_mode[0].mode);
+      gprint (GP_ERR, "width: %d\n",              info.camera_info[0].readout_mode[0].width);
+      gprint (GP_ERR, "height: %d\n",             info.camera_info[0].readout_mode[0].height);
+      gprint (GP_ERR, "gain: %d\n",               info.camera_info[0].readout_mode[0].gain);
+      gprint (GP_ERR, "pixel_width: %d\n",        info.camera_info[0].readout_mode[0].pixel_width);
+      gprint (GP_ERR, "pixel_height: %d\n",       info.camera_info[0].readout_mode[0].pixel_height);
+
+      gprint (GP_ERR, "ST5_AD_size: %d\n", info.ST5_AD_size);
+      gprint (GP_ERR, "ST5_filter_type: %d\n", info.ST5_filter_type);
 }      
 
@@ -62,5 +62,5 @@
   state = sbig_set_cooling (&cool);
   if (state < 0) {
-    fprintf (stderr, "sbig error: %s\n", sbig_show_error (state));
+    gprint (GP_ERR, "sbig error: %s\n", sbig_show_error (state));
     return (FALSE);
   }
@@ -76,5 +76,5 @@
   state = sbig_get_status (&status);
   if (state < 0) {
-    fprintf (stderr, "sbig error: %s\n", sbig_show_error (state));
+    gprint (GP_ERR, "sbig error: %s\n", sbig_show_error (state));
     return (-200.0);
   }
@@ -91,24 +91,24 @@
   state = sbig_get_status (&status);
   if (state < 0) {
-    fprintf (stderr, "sbig error: %s\n", sbig_show_error (state));
-    return (FALSE);
-  }
-
-  fprintf (stderr, "imaging_ccd_status: %d\n", status.imaging_ccd_status);
-  fprintf (stderr, "tracking_ccd_status: %d\n", status.tracking_ccd_status);
-  fprintf (stderr, "fan_on: %d\n", status.fan_on);
-  fprintf (stderr, "shutter_state: %d\n", status.shutter_state);
-  fprintf (stderr, "led_state: %d\n", status.led_state);
-  fprintf (stderr, "shutter_edge: %d\n", status.shutter_edge);
-  fprintf (stderr, "plus_x_relay: %d\n", status.plus_x_relay);
-  fprintf (stderr, "minus_x_relay: %d\n", status.minus_x_relay);
-  fprintf (stderr, "plus_y_relay: %d\n", status.plus_y_relay);
-  fprintf (stderr, "minus_y_relay: %d\n", status.minus_y_relay);
-  fprintf (stderr, "pulse_active: %d\n", status.pulse_active);
-  fprintf (stderr, "temperature_regulation: %d\n", status.temperature_regulation);
-  fprintf (stderr, "temperature_setpoint: %d\n", status.temperature_setpoint);
-  fprintf (stderr, "cooling_power: %d\n", status.cooling_power);
-  fprintf (stderr, "air_temperature: %d\n", status.air_temperature);
-  fprintf (stderr, "ccd_temperature: %d\n", status.ccd_temperature);
+    gprint (GP_ERR, "sbig error: %s\n", sbig_show_error (state));
+    return (FALSE);
+  }
+
+  gprint (GP_ERR, "imaging_ccd_status: %d\n", status.imaging_ccd_status);
+  gprint (GP_ERR, "tracking_ccd_status: %d\n", status.tracking_ccd_status);
+  gprint (GP_ERR, "fan_on: %d\n", status.fan_on);
+  gprint (GP_ERR, "shutter_state: %d\n", status.shutter_state);
+  gprint (GP_ERR, "led_state: %d\n", status.led_state);
+  gprint (GP_ERR, "shutter_edge: %d\n", status.shutter_edge);
+  gprint (GP_ERR, "plus_x_relay: %d\n", status.plus_x_relay);
+  gprint (GP_ERR, "minus_x_relay: %d\n", status.minus_x_relay);
+  gprint (GP_ERR, "plus_y_relay: %d\n", status.plus_y_relay);
+  gprint (GP_ERR, "minus_y_relay: %d\n", status.minus_y_relay);
+  gprint (GP_ERR, "pulse_active: %d\n", status.pulse_active);
+  gprint (GP_ERR, "temperature_regulation: %d\n", status.temperature_regulation);
+  gprint (GP_ERR, "temperature_setpoint: %d\n", status.temperature_setpoint);
+  gprint (GP_ERR, "cooling_power: %d\n", status.cooling_power);
+  gprint (GP_ERR, "air_temperature: %d\n", status.air_temperature);
+  gprint (GP_ERR, "ccd_temperature: %d\n", status.ccd_temperature);
 
   return (TRUE);
@@ -131,6 +131,6 @@
   state = sbig_expose (&expose);
   if (state < 0) {
-    fprintf (stderr, "exposure error\n");
-    fprintf (stderr, "%s\n", sbig_show_error (state));
+    gprint (GP_ERR, "exposure error\n");
+    gprint (GP_ERR, "%s\n", sbig_show_error (state));
     return (FALSE);
   }
@@ -138,6 +138,6 @@
   for (i = 0; i < expose.exposure_time + 10; ++i) {
     state = sbig_get_status (&status);
-    /* fprintf (stderr, "%d\n", state); */
-    /* fprintf (stderr, "%d  %d\n", status.imaging_ccd_status, status.shutter_state); */
+    /* gprint (GP_ERR, "%d\n", state); */
+    /* gprint (GP_ERR, "%d  %d\n", status.imaging_ccd_status, status.shutter_state); */
     /*    if (state == 0) return (TRUE); */
     if (status.imaging_ccd_status == -SBIG_NO_EXPOSURE_IN_PROGRESS) return (TRUE);
@@ -146,9 +146,9 @@
       continue;
     }
-    fprintf (stderr, "exposure error\n");
-    fprintf (stderr, "%s\n", sbig_show_error (state));
-    return (FALSE);
-  }
-  fprintf (stderr, "exposure timeout\n");
+    gprint (GP_ERR, "exposure error\n");
+    gprint (GP_ERR, "%s\n", sbig_show_error (state));
+    return (FALSE);
+  }
+  gprint (GP_ERR, "exposure timeout\n");
   return (FALSE);
 }
@@ -158,5 +158,5 @@
 static int readout_callback (float percent) {
   /* return 1 to continue, 0 to abort */
-  if (((int)(percent) % 10) == 0) { fprintf (stderr, "."); }
+  if (((int)(percent) % 10) == 0) { gprint (GP_ERR, "."); }
   readout_percent = percent;
   if (readout_abort) return 0;
@@ -183,11 +183,11 @@
   readout.callback = readout_callback;
     
-  fprintf (stderr, "%d, %d : %d x %d\n", readout.x, readout.y, readout.width, readout.height);
+  gprint (GP_ERR, "%d, %d : %d x %d\n", readout.x, readout.y, readout.width, readout.height);
   sync (); 
   readout_abort = FALSE;
   state = sbig_readout (&readout);
-  fprintf (stderr, "\n");
-  if (state < 0) {
-    fprintf (stderr, "sbig error: %s\n", sbig_show_error (state));
+  gprint (GP_ERR, "\n");
+  if (state < 0) {
+    gprint (GP_ERR, "sbig error: %s\n", sbig_show_error (state));
     return (FALSE);
   }
@@ -203,5 +203,5 @@
   state = sbig_control (&control);
   if (state < 0) {
-    fprintf(stderr, "sbig error: %s\n", sbig_show_error (state));
+    gprint (GP_ERR, "sbig error: %s\n", sbig_show_error (state));
     return (FALSE);
   }
@@ -217,7 +217,7 @@
   state = sbig_control (&control);
   if (state < 0) {
-    fprintf(stderr, "sbig error: %s\n", sbig_show_error (state));
-    return (FALSE);
-  }
-  return (TRUE);
-}
+    gprint (GP_ERR, "sbig error: %s\n", sbig_show_error (state));
+    return (FALSE);
+  }
+  return (TRUE);
+}