From 7b72625fe711a9134b5e886122bcd7a91bfc6ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 23 Jan 2007 20:45:25 +0000 Subject: [PATCH] cleaned up includes; removed useless files; switched from Zeta's BVector to BList. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19928 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../media-add-ons/usb_webcam/CamDefs.cpp | 9 ----- .../media/media-add-ons/usb_webcam/CamDefs.h | 14 -------- .../media-add-ons/usb_webcam/CamDevice.h | 5 +-- .../media-add-ons/usb_webcam/CamRoster.cpp | 35 +++++++++---------- .../media-add-ons/usb_webcam/CamRoster.h | 8 ++--- .../media/media-add-ons/usb_webcam/Jamfile | 1 - 6 files changed, 23 insertions(+), 49 deletions(-) delete mode 100644 src/add-ons/media/media-add-ons/usb_webcam/CamDefs.cpp delete mode 100644 src/add-ons/media/media-add-ons/usb_webcam/CamDefs.h diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamDefs.cpp b/src/add-ons/media/media-add-ons/usb_webcam/CamDefs.cpp deleted file mode 100644 index b5c1be5fa1..0000000000 --- a/src/add-ons/media/media-add-ons/usb_webcam/CamDefs.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "CamDefs.h" - - -supported_usb_camera gkSupportedCameras[] = -{ - { 0x046d, 0xd001 }, // Logitech quick cam pro - { 0, 0 } -}; - diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamDefs.h b/src/add-ons/media/media-add-ons/usb_webcam/CamDefs.h deleted file mode 100644 index a0ea04c826..0000000000 --- a/src/add-ons/media/media-add-ons/usb_webcam/CamDefs.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _CAM_DEFS_H -#define _CAM_DEFS_H - -#include - -struct supported_usb_camera -{ - uint16 vendor_id; - uint16 product_id; -}; - -extern supported_usb_camera gkSupportedCameras[]; - -#endif 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 6e1d33f167..efeb7844e0 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 @@ -11,8 +11,9 @@ # include #endif #include -#include -#include +#include +#include +#include typedef struct { diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp b/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp index 98d174a414..36b9534fca 100644 --- a/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp +++ b/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp @@ -3,7 +3,6 @@ #include "AddOn.h" #include "CamDevice.h" #include "CamDebug.h" -#include "CamDefs.h" #include @@ -38,21 +37,21 @@ CamRoster::DeviceAdded(BUSBDevice* _device) status_t err; for( int16 i = fCamerasAddons.CountItems()-1; i >= 0; --i ) { - PRINT((CH ": checking %s for support..." CT, fCamerasAddons[i]->BrandName())); - err = fCamerasAddons[i]->Sniff(_device); + CamDeviceAddon *ao = (CamDeviceAddon *)fCamerasAddons.ItemAt(i); + PRINT((CH ": checking %s for support..." CT, ao->BrandName())); + err = ao->Sniff(_device); + if (err < B_OK) + continue; + CamDevice *cam = ao->Instantiate(*this, _device); + PRINT((CH ": found camera %s:%s!" CT, cam->BrandName(), cam->ModelName())); + err = cam->InitCheck(); if (err >= B_OK) { - CamDevice *cam = fCamerasAddons[i]->Instantiate(*this, _device); - PRINT((CH ": found camera %s:%s!" CT, cam->BrandName(), cam->ModelName())); - err = cam->InitCheck(); - if (err >= B_OK) - { - fCameras.AddItem(cam); - fAddon->CameraAdded(cam); - return B_OK; - } - PRINT((CH " error 0x%08lx" CT, err)); - } + fCameras.AddItem(cam); + fAddon->CameraAdded(cam); + return B_OK; + } + PRINT((CH " error 0x%08lx" CT, err)); } return B_ERROR; } @@ -64,11 +63,11 @@ CamRoster::DeviceRemoved(BUSBDevice* _device) PRINT((CH "()" CT)); for(uint32 i = 0; i < fCameras.CountItems(); ++i) { - CamDevice* cam = fCameras[i]; + CamDevice* cam = (CamDevice *)fCameras.ItemAt(i); if( cam->Matches(_device) ) { PRINT((CH ": camera %s:%s removed" CT, cam->BrandName(), cam->ModelName())); - fCameras.RemoveItemsAt(i, 1); + fCameras.RemoveItem(i); fAddon->CameraRemoved(cam); // XXX: B_DONT_DO_THAT! //delete cam; @@ -83,8 +82,8 @@ uint32 CamRoster::CountCameras() { int32 count; - PRINT((CH "(): %d cameras" CT, fCameras.CountItems())); fLocker.Lock(); + PRINT((CH "(): %d cameras" CT, fCameras.CountItems())); count = fCameras.CountItems(); fLocker.Unlock(); return count; @@ -112,7 +111,7 @@ CamDevice* CamRoster::CameraAt(int32 index) { PRINT((CH "()" CT)); - return fCameras.ItemAt(index); + return (CamDevice *)fCameras.ItemAt(index); } // --------------------------------------------------------------------------- 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 2f897998a1..043c210d58 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 @@ -2,7 +2,7 @@ #define _CAM_ROSTER_H #include -#include +#include #include #include "CamDevice.h" @@ -32,10 +32,8 @@ private: BLocker fLocker; WebCamMediaAddOn* fAddon; - B::Support:: - BVector fCamerasAddons; - B::Support:: - BVector fCameras; + BList fCamerasAddons; + BList fCameras; }; #endif 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 65fce8d12e..a2fbc4d4d5 100644 --- a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile +++ b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile @@ -68,7 +68,6 @@ Addon usb_webcam.media_addon : media : CamBufferingDeframer.cpp CamColorSpaceTransform.cpp CamDeframer.cpp - CamDefs.cpp CamDevice.cpp CamFilterInterface.cpp CamRoster.cpp