diff --git a/src/zm_camera.cpp b/src/zm_camera.cpp index 30918e502..7abafee52 100644 --- a/src/zm_camera.cpp +++ b/src/zm_camera.cpp @@ -20,7 +20,7 @@ #include "zm.h" #include "zm_camera.h" -Camera::Camera( unsigned int p_monitor_id, SourceType p_type, int p_width, int p_height, int p_colours, int p_subpixelorder, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) : +Camera::Camera( unsigned int p_monitor_id, SourceType p_type, unsigned int p_width, unsigned int p_height, int p_colours, int p_subpixelorder, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) : monitor_id( p_monitor_id ), type( p_type ), width( p_width), diff --git a/src/zm_camera.h b/src/zm_camera.h index ed9647c54..4d991d495 100644 --- a/src/zm_camera.h +++ b/src/zm_camera.h @@ -55,7 +55,7 @@ protected: bool record_audio; public: - Camera( unsigned int p_monitor_id, SourceType p_type, int p_width, int p_height, int p_colours, int p_subpixelorder, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ); + Camera( unsigned int p_monitor_id, SourceType p_type, unsigned int p_width, unsigned int p_height, int p_colours, int p_subpixelorder, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ); virtual ~Camera(); unsigned int getId() const { return( monitor_id ); } @@ -88,7 +88,7 @@ public: virtual int PreCapture()=0; virtual int Capture( Image &image )=0; virtual int PostCapture()=0; - virtual int CaptureAndRecord( Image &image, bool recording, char* event_directory)=0; + virtual int CaptureAndRecord( Image &image, timeval recording, char* event_directory ) = 0; }; #endif // ZM_CAMERA_H