small changes to allow compile on windows / visual studio

Author: ofTheo

src/loader.c

@@ -124,7 +124,7 @@ static int check_version_string(fnusb_dev* dev) {
 
 
 FN_INTERNAL int upload_firmware(fnusb_dev* dev, char * filename) {
-freenect_context* ctx = dev->parent->parent;
+ freenect_context* ctx = dev->parent->parent;
 /* Search for firmware file (audios.bin) in the following places:
  * $LIBFREENECT_FIRMWARE_PATH
  * .
@@ -138,7 +138,7 @@ FN_INTERNAL int upload_firmware(fnusb_dev* dev, char * filename) {
  char fw_filename[1024];
  sprintf(fw_filename, "/%s", filename);
 
-int filenamelen = strlen(fw_filename);
+ int filenamelen = strlen(fw_filename);
 int i;
 int searchpathcount;
 FILE* fw = NULL;
@@ -152,15 +152,15 @@ FN_INTERNAL int upload_firmware(fnusb_dev* dev, char * filename) {
 if (!envpath)
 continue;
 int pathlen = strlen(envpath);
-fwfile = malloc(pathlen + filenamelen + 1);
+fwfile = (char *)malloc(pathlen + filenamelen + 1);
 strcpy(fwfile, envpath);
 strcat(fwfile, fw_filename);
 needs_free = 1;
 }
 break;
 case 1:
 //fwfile = "./audios.bin";
-fwfile = malloc(2048);
+fwfile = (char *)malloc(2048);
  needs_free = 1;
  sprintf(fwfile, ".%s", fw_filename);
 break;
@@ -186,13 +186,13 @@ FN_INTERNAL int upload_firmware(fnusb_dev* dev, char * filename) {
 break;
 case 4:
 //fwfile = "/usr/share/libfreenect/audios.bin";
-fwfile = malloc(2048);
+fwfile = (char *)malloc(2048);
  needs_free = 1;
  sprintf(fwfile, "/usr/share/libfreenect%s", fw_filename);
 break;
 case 5:
  //fwfile = "./../Resources/audios.bin"; //default for OS X equivilant to: "./audios.bin";
-fwfile = malloc(2048);
+fwfile = (char *)malloc(2048);
  needs_free = 1;
  sprintf(fwfile, "./../Resources%s", fw_filename);
 break;
@@ -219,7 +219,7 @@ FN_INTERNAL int upload_firmware(fnusb_dev* dev, char * filename) {
 return -errno;
  }
 
- unsigned char * fw_bytes = malloc(fw_num_bytes);
+ unsigned char * fw_bytes = (unsigned char *)malloc(fw_num_bytes);
  int numRead = fread(fw_bytes, 1, fw_num_bytes, fw);
  fw_num_bytes = numRead; // just in case
 
@@ -229,7 +229,7 @@ FN_INTERNAL int upload_firmware(fnusb_dev* dev, char * filename) {
  fw = NULL;
 
  return retVal;
-}
+}
 
 FN_INTERNAL int upload_firmware_from_memory(fnusb_dev* dev, unsigned char * fw_from_mem, unsigned int fw_size_in_btyes) {
  freenect_context* ctx = dev->parent->parent;
@@ -269,7 +269,7 @@ FN_INTERNAL int upload_firmware_from_memory(fnusb_dev* dev, unsigned char * fw_f
 FN_INFO("\tentry point 0x%08x\n", fwheader.entry_addr);
 
 
-uint32_t addr = fwheader.base_addr;
+ uint32_t addr = fwheader.base_addr;
 unsigned char page[0x4000];
  int readIndex = 0;
 int total_bytes_sent = 0;
@@ -282,8 +282,8 @@ FN_INTERNAL int upload_firmware_from_memory(fnusb_dev* dev, unsigned char * fw_f
  read = bytesLeft;
  }
  if (read <= 0) {
-break;
-}
+ break;
+ }
 
  memcpy(page, &readPtr[readIndex], read);
  readIndex += read;

src/tilt.c

@@ -260,15 +260,15 @@ int freenect_set_led_alt(freenect_device *dev, freenect_led_options state)
 
  //The LED states are different between K4W/1473 and older 1414 
  if( state == LED_GREEN ){
- state = LED_ALT_SOLID_GREEN;
+ state = (freenect_led_options)LED_ALT_SOLID_GREEN;
  }else if( state == LED_RED ){
- state = LED_ALT_SOLID_RED;
+ state = (freenect_led_options)LED_ALT_SOLID_RED;
  }else if( state == LED_YELLOW ){
- state = LED_ALT_SOLID_GREEN;
+ state = (freenect_led_options)LED_ALT_SOLID_GREEN;
  }else if( state == LED_OFF ){
- state = LED_ALT_OFF;
+ state = (freenect_led_options)LED_ALT_OFF;
  }else if( state == LED_BLINK_GREEN ){
- state = LED_ALT_BLINK_GREEN;
+ state = (freenect_led_options)LED_ALT_BLINK_GREEN;
  }else{
  state = LED_GREEN;
  }

src/usb_libusb10.c

@@ -34,6 +34,11 @@
 
 #include "keep_alive.h"
 
+
+#ifdef _MSC_VER
+# define sleep(x) Sleep((x)*1000) 
+#endif 
+
 FN_INTERNAL int fnusb_num_devices(fnusb_ctx *ctx)
 {
 libusb_device **devs; 
@@ -213,6 +218,9 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
 break;
 }
 if(desc.idProduct == PID_K4W_CAMERA || desc.bcdDevice != fn_le32(267)){
+
+freenect_device_flags requested_devices = ctx->enabled_subdevices; 
+
 /* Not the old kinect so we only set up the camera*/ 
 ctx->enabled_subdevices = FREENECT_DEVICE_CAMERA;
 ctx->zero_plane_res = 334;
@@ -228,8 +236,9 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
 
 #ifdef BUILD_AUDIO
  //for newer devices we need to enable the audio device for motor control
- if( (ctx->enabled_subdevices & FREENECT_DEVICE_AUDIO) == 0 ){
- ctx->enabled_subdevices |= FREENECT_DEVICE_AUDIO;
+//we only do this though if motor has been requested.
+ if( (requested_devices & FREENECT_DEVICE_MOTOR) && (requested_devices & FREENECT_DEVICE_AUDIO) == 0 ){
+ ctx->enabled_subdevices = (freenect_device_flags)(ctx->enabled_subdevices | FREENECT_DEVICE_AUDIO);
  }
 #endif