diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2006-05-07 13:02:10 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2006-05-07 13:02:10 +0000 |
| commit | 9b586f478b95a4123e31c0235d61ce794665bc38 (patch) | |
| tree | 8ceb2ccf17a085e2642972fd6560d1c8624615a2 /devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.h | |
| parent | Add xpi-no-referrer 0.8, an extension to Open URL without sending (diff) | |
- Use a better way to detect SDL header
- Add WITH_ESOUND knob and enable the plugin build
- Fix bsdvideo (bktr(4)) plugin and make it buildable on more archs
- Add a small error handler to detect unresolved symbols in plugins
- Add more plugins to pkg-plist
- Add experimental support for firewire(4) based video devices.
The segment of the Makefile is intentionally commented out.
PR: ports/95422, ports/96624
Submitted by: Joerg Pulz <Joerg.Pulz@frm2.tum.de>,
Steve Ames <steve@energistic.com> (maintainer)
Approved by: Steve Ames <steve@energistic.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=161584
Diffstat (limited to 'devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.h')
| -rw-r--r-- | devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.h | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.h b/devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.h new file mode 100644 index 000000000000..968b4d0e4142 --- /dev/null +++ b/devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.h @@ -0,0 +1,95 @@ +--- plugins/vidinput_bsd/vidinput_bsd.h.orig Tue Aug 9 11:08:09 2005 ++++ plugins/vidinput_bsd/vidinput_bsd.h Thu Apr 6 09:37:11 2006 +@@ -1,13 +1,24 @@ ++#ifndef _PVIDEOIOBSDCAPTURE + +-//#include <sys/mman.h> +-//#include <sys/time.h> ++#define _PVIDEOIOBSDCAPTURE ++ ++#ifdef __GNUC__ ++#pragma interface ++#endif ++ ++#include <sys/mman.h> + + #include <ptlib.h> + #include <ptlib/videoio.h> + #include <ptlib/vconvert.h> + + #if defined(P_FREEBSD) ++#include <sys/param.h> ++# if __FreeBSD_version >= 502100 ++#include <dev/bktr/ioctl_meteor.h> ++# else + #include <machine/ioctl_meteor.h> ++# endif + #endif + + #if defined(P_OPENBSD) || defined(P_NETBSD) +@@ -20,19 +30,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 +58,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 +127,5 @@ + int mmap_size; + + }; ++ ++#endif |