From 8e9a5067ef7d9207dfca7b68debebc9d44db0b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 23 Jan 2007 20:11:56 +0000
Subject: [PATCH] more Zeta vs Haiku USB Kit cleanup

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19927 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h    | 8 +++++++-
 src/add-ons/media/media-add-ons/usb_webcam/CamRoster.h    | 4 ++--
 src/add-ons/media/media-add-ons/usb_webcam/Jamfile        | 2 +-
 .../usb_webcam/addons/quickcam/QuickCamDevice.cpp         | 2 --
 .../usb_webcam/addons/sonix/SonixCamDevice.cpp            | 4 ----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h b/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h
index d456d41e07..6e1d33f167 100644
--- a/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h
+++ b/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h
@@ -3,7 +3,13 @@
 
 #include <OS.h>
 #include <image.h>
-#include <usb/USBKit.h>
+#ifdef __HAIKU__
+#  include <USB3.h>
+#  include <USBKit.h>
+#else
+#  include <USB.h>
+#  include <usb/USBKit.h>
+#endif
 #include <Locker.h>
 #include <media/MediaAddOn.h>
 #include <support/String.h>
diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.h b/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.h
index 25dfe78a59..2f897998a1 100644
--- a/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.h
+++ b/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.h
@@ -3,11 +3,11 @@
 
 #include <image.h>
 #include <support/Vector.h>
-#include <usb/USBKit.h>
 #include <Locker.h>
 
+#include "CamDevice.h"
+
 class WebCamMediaAddOn;
-class CamDevice;
 class CamDeviceAddon;
 
 class CamRoster : public BUSBRoster
diff --git a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile
index dc8c6afeb3..65fce8d12e 100644
--- a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile
+++ b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile
@@ -37,7 +37,7 @@ csTransformsSources = Bayer.cpp ;
 local sensorsSources ;
 sensorsSources = hdcs1000.cpp hv7131e1.cpp tas5110c1b.cpp ;
 
-## how to build header files from sources to include teh list of built-in addons.
+## how to build header files from sources to include the list of built-in addons.
 
 rule USBWebcamHeaderGen
 {
diff --git a/src/add-ons/media/media-add-ons/usb_webcam/addons/quickcam/QuickCamDevice.cpp b/src/add-ons/media/media-add-ons/usb_webcam/addons/quickcam/QuickCamDevice.cpp
index 8ab9854e89..0327b2fd22 100644
--- a/src/add-ons/media/media-add-ons/usb_webcam/addons/quickcam/QuickCamDevice.cpp
+++ b/src/add-ons/media/media-add-ons/usb_webcam/addons/quickcam/QuickCamDevice.cpp
@@ -1,7 +1,5 @@
 #include "QuickCamDevice.h"
 
-#include <usb/USBDevice.h>
-
 const usb_named_support_descriptor kSupportedDevices[] = {
 {{ 0, 0, 0, 0x046d, 0x0840 }, "Logitech", "QuickCam Express"},
 {{ 0, 0, 0, 0x046d, 0x0850 }, "Logitech", "QuickCam Express LEGO"},
diff --git a/src/add-ons/media/media-add-ons/usb_webcam/addons/sonix/SonixCamDevice.cpp b/src/add-ons/media/media-add-ons/usb_webcam/addons/sonix/SonixCamDevice.cpp
index cd0a9adc73..3d4242cf8f 100644
--- a/src/add-ons/media/media-add-ons/usb_webcam/addons/sonix/SonixCamDevice.cpp
+++ b/src/add-ons/media/media-add-ons/usb_webcam/addons/sonix/SonixCamDevice.cpp
@@ -4,10 +4,6 @@
 #include "CamBufferingDeframer.h"
 #include "CamStreamingDeframer.h"
 
-#include <usb/USBDevice.h>
-#include <usb/USBConfiguration.h>
-#include <usb/USBInterface.h>
-
 #include <interface/Bitmap.h>
 #include <media/Buffer.h>