i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more Zeta vs Haiku USB Kit cleanup

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19927 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2007-01-23 20:11:56 +00:00
parent fc812aa9ae
commit 8e9a5067ef
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h
+7 -1
View File
@@ -3,7 +3,13 @@
#include <OS.h> #include <OS.h>
#include <image.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 <Locker.h>
#include <media/MediaAddOn.h> #include <media/MediaAddOn.h>
#include <support/String.h> #include <support/String.h>
src/add-ons/media/media-add-ons/usb_webcam/CamRoster.h
+2 -2
View File
@@ -3,11 +3,11 @@
#include <image.h> #include <image.h>
#include <support/Vector.h> #include <support/Vector.h>
#include <usb/USBKit.h>
#include <Locker.h> #include <Locker.h>
#include "CamDevice.h"
class WebCamMediaAddOn; class WebCamMediaAddOn;
class CamDevice;
class CamDeviceAddon; class CamDeviceAddon;
class CamRoster : public BUSBRoster class CamRoster : public BUSBRoster
src/add-ons/media/media-add-ons/usb_webcam/Jamfile
+1 -1
View File
@@ -37,7 +37,7 @@ csTransformsSources = Bayer.cpp ;
local sensorsSources ; local sensorsSources ;
sensorsSources = hdcs1000.cpp hv7131e1.cpp tas5110c1b.cpp ; 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 rule USBWebcamHeaderGen
{ {
src/add-ons/media/media-add-ons/usb_webcam/addons/quickcam/QuickCamDevice.cpp
-2
View File
@@ -1,7 +1,5 @@
#include "QuickCamDevice.h" #include "QuickCamDevice.h"
#include <usb/USBDevice.h>
const usb_named_support_descriptor kSupportedDevices[] = { const usb_named_support_descriptor kSupportedDevices[] = {
{{ 0, 0, 0, 0x046d, 0x0840 }, "Logitech", "QuickCam Express"}, {{ 0, 0, 0, 0x046d, 0x0840 }, "Logitech", "QuickCam Express"},
{{ 0, 0, 0, 0x046d, 0x0850 }, "Logitech", "QuickCam Express LEGO"}, {{ 0, 0, 0, 0x046d, 0x0850 }, "Logitech", "QuickCam Express LEGO"},
src/add-ons/media/media-add-ons/usb_webcam/addons/sonix/SonixCamDevice.cpp
-4
View File
@@ -4,10 +4,6 @@
#include "CamBufferingDeframer.h" #include "CamBufferingDeframer.h"
#include "CamStreamingDeframer.h" #include "CamStreamingDeframer.h"
#include <usb/USBDevice.h>
#include <usb/USBConfiguration.h>
#include <usb/USBInterface.h>
#include <interface/Bitmap.h> #include <interface/Bitmap.h>
#include <media/Buffer.h> #include <media/Buffer.h>