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

src/add-ons/media/media-add-ons/usb_webcam/CamDefs.cpp

@@ -1,9 +0,0 @@
-#include "CamDefs.h"
-
-
-supported_usb_camera gkSupportedCameras[] =
-{
-	{ 0x046d, 0xd001 },			// Logitech quick cam pro
-	{ 0, 0 }	
-};
-

src/add-ons/media/media-add-ons/usb_webcam/CamDefs.h

@@ -1,14 +0,0 @@
-#ifndef _CAM_DEFS_H
-#define _CAM_DEFS_H
-
-#include <be_prim.h>
-
-struct supported_usb_camera
-{
-	uint16 vendor_id;
-	uint16 product_id;	
-};
-
-extern supported_usb_camera gkSupportedCameras[];
-
-#endif

src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h

@@ -11,8 +11,9 @@
 #  include <usb/USBKit.h>
 #endif
 #include <Locker.h>
-#include <media/MediaAddOn.h>
+#include <MediaAddOn.h>
-#include <support/String.h>
+#include <String.h>
+#include <Rect.h>
 
 
 typedef struct {

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 <OS.h>
 
@@ -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()));
+		CamDeviceAddon *ao = (CamDeviceAddon *)fCamerasAddons.ItemAt(i);
-		err = fCamerasAddons[i]->Sniff(_device);
+		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);
+			fCameras.AddItem(cam);
-			PRINT((CH ": found camera %s:%s!" CT, cam->BrandName(), cam->ModelName()));
+			fAddon->CameraAdded(cam);
-			err = cam->InitCheck();
+			return B_OK;
-			if (err >= 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);
 }
 
 // ---------------------------------------------------------------------------

src/add-ons/media/media-add-ons/usb_webcam/CamRoster.h

@@ -2,7 +2,7 @@
 #define _CAM_ROSTER_H
 
 #include <image.h>
-#include <support/Vector.h>
+#include <List.h>
 #include <Locker.h>
 
 #include "CamDevice.h"
@@ -32,10 +32,8 @@ private:
 
 	BLocker				fLocker;
 	WebCamMediaAddOn*	fAddon;
-	B::Support::
+	BList			fCamerasAddons;
-	BVector<CamDeviceAddon*> fCamerasAddons;
+	BList			fCameras;
-	B::Support::
-	BVector<CamDevice*> fCameras;
 };
 
 #endif

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