863b6c8940
PR: ports/97258 Submitted by: Tod McQuillin <devin@spamcop.net> Approved by: maintainer, lawrance (mentor)
100 lines
2.1 KiB
C++
100 lines
2.1 KiB
C++
--- plugins/vidinput_bsd/vidinput_bsd.h.orig Tue Aug 9 05:08:09 2005
|
|
+++ plugins/vidinput_bsd/vidinput_bsd.h Sun May 14 13:42:28 2006
|
|
@@ -1,15 +1,29 @@
|
|
+#ifndef _PVIDEOIOBSDCAPTURE
|
|
|
|
-//#include <sys/mman.h>
|
|
-//#include <sys/time.h>
|
|
+#define _PVIDEOIOBSDCAPTURE
|
|
+
|
|
+#ifdef __GNUC__
|
|
+#pragma interface
|
|
+#endif
|
|
|
|
#include <ptlib.h>
|
|
#include <ptlib/videoio.h>
|
|
#include <ptlib/vconvert.h>
|
|
|
|
#if defined(P_FREEBSD)
|
|
+#include <sys/param.h>
|
|
+#if __FreeBSD_version <= 500000
|
|
+#include <sys/types.h>
|
|
+#endif
|
|
+# if __FreeBSD_version >= 502100
|
|
+#include <dev/bktr/ioctl_meteor.h>
|
|
+# else
|
|
#include <machine/ioctl_meteor.h>
|
|
+# endif
|
|
#endif
|
|
|
|
+#include <sys/mman.h>
|
|
+
|
|
#if defined(P_OPENBSD) || defined(P_NETBSD)
|
|
#if P_OPENBSD >= 200105
|
|
#include <dev/ic/bt8xx.h>
|
|
@@ -20,19 +34,24 @@
|
|
#endif
|
|
#endif
|
|
|
|
-class PVideoInputDevice_BSDCAPTURE: public PVideoInputDevice
|
|
+#if !P_USE_INLINES
|
|
+#include <ptlib/contain.inl>
|
|
+#endif
|
|
+
|
|
+
|
|
+class PVideoInputDevice_BSDCAPTURE : public PVideoInputDevice
|
|
{
|
|
|
|
+ PCLASSINFO(PVideoInputDevice_BSDCAPTURE, PVideoInputDevice);
|
|
+
|
|
public:
|
|
PVideoInputDevice_BSDCAPTURE();
|
|
~PVideoInputDevice_BSDCAPTURE();
|
|
|
|
- static PStringList GetInputDeviceNames();
|
|
-
|
|
- PStringList GetDeviceNames() const
|
|
- { return GetInputDeviceNames(); }
|
|
-
|
|
- BOOL Open(const PString &deviceName, BOOL startImmediate);
|
|
+ BOOL Open(
|
|
+ const PString &deviceName,
|
|
+ BOOL startImmediate = TRUE
|
|
+ );
|
|
|
|
BOOL IsOpen();
|
|
|
|
@@ -43,11 +62,24 @@
|
|
|
|
BOOL IsCapturing();
|
|
|
|
+ static PStringList GetInputDeviceNames();
|
|
+
|
|
+ PStringList GetDeviceNames() const
|
|
+ { return GetInputDeviceNames(); }
|
|
+
|
|
PINDEX GetMaxFrameBytes();
|
|
|
|
- BOOL GetFrame(PBYTEArray & frame);
|
|
- BOOL GetFrameData(BYTE*, PINDEX*);
|
|
- BOOL GetFrameDataNoDelay(BYTE*, PINDEX*);
|
|
+// BOOL GetFrame(
|
|
+// PBYTEArray & frame
|
|
+// );
|
|
+ BOOL GetFrameData(
|
|
+ BYTE * buffer,
|
|
+ PINDEX * bytesReturned = NULL
|
|
+ );
|
|
+ BOOL GetFrameDataNoDelay(
|
|
+ BYTE * buffer,
|
|
+ PINDEX * bytesReturned = NULL
|
|
+ );
|
|
|
|
BOOL GetFrameSizeLimits(unsigned int&, unsigned int&,
|
|
unsigned int&, unsigned int&);
|
|
@@ -99,3 +131,5 @@
|
|
int mmap_size;
|
|
|
|
};
|
|
+
|
|
+#endif
|