diff --git a/src/zm_camera.cpp b/src/zm_camera.cpp index f35f16e9c..f8c9fd6af 100644 --- a/src/zm_camera.cpp +++ b/src/zm_camera.cpp @@ -20,7 +20,7 @@ #include "zm.h" #include "zm_camera.h" -Camera::Camera( int p_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 record_audio ) : +Camera::Camera( int p_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 ) : id( p_id ), type( p_type ), width( p_width), diff --git a/src/zm_file_camera.cpp b/src/zm_file_camera.cpp index 28ce2b155..f9ec73b26 100644 --- a/src/zm_file_camera.cpp +++ b/src/zm_file_camera.cpp @@ -34,7 +34,7 @@ #include "zm.h" #include "zm_file_camera.h" -FileCamera::FileCamera( int p_id, const char *p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) : Camera( p_id, FILE_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture ) +FileCamera::FileCamera( int p_id, const char *p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) : Camera( p_id, FILE_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ) { strncpy( path, p_path, sizeof(path) ); if ( capture ) diff --git a/src/zm_file_camera.h b/src/zm_file_camera.h index 98db69b22..a2ed23077 100644 --- a/src/zm_file_camera.h +++ b/src/zm_file_camera.h @@ -36,7 +36,7 @@ protected: char path[PATH_MAX]; public: - FileCamera( int p_id, const char *p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ); + FileCamera( int p_id, const char *p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ); ~FileCamera(); const char *Path() const { return( path ); } @@ -46,7 +46,7 @@ public: int PreCapture(); int Capture( Image &image ); int PostCapture(); - int CaptureAndRecord( Image &image, bool recording, char* event_directory ) {return(0);}; + int CaptureAndRecord( Image &image, bool recording, char* event_directory ) {return(0);}; }; #endif // ZM_FILE_CAMERA_H diff --git a/src/zm_local_camera.cpp b/src/zm_local_camera.cpp index 532ec7cfe..1a22f4c8c 100644 --- a/src/zm_local_camera.cpp +++ b/src/zm_local_camera.cpp @@ -305,13 +305,12 @@ LocalCamera::LocalCamera( bool p_capture, bool p_record_audio, unsigned int p_extras) : - Camera( p_id, LOCAL_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture ), + Camera( p_id, LOCAL_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ), device( p_device ), channel( p_channel ), standard( p_standard ), palette( p_palette ), channel_index( 0 ), - record_audio( p_record_audio ), extras ( p_extras ) { // If we are the first, or only, input on this device then diff --git a/src/zm_monitor.h b/src/zm_monitor.h index f9f74d288..b0a70fc68 100644 --- a/src/zm_monitor.h +++ b/src/zm_monitor.h @@ -334,6 +334,7 @@ public: int p_savejpegs, int p_videowriter, std::string p_encoderparams, + bool p_record_audio, const char *p_event_prefix, const char *p_label_format, const Coord &p_label_coord,