Add overrides

pull/3222/head
Isaac Connor 2021-04-20 12:58:17 -04:00
parent 2d6d39acee
commit fa3ce0d247
3 changed files with 21 additions and 21 deletions

View File

@ -81,10 +81,10 @@ public:
virtual void Terminate() = 0; virtual void Terminate() = 0;
virtual int Connect() = 0; virtual int Connect() = 0;
virtual int Disconnect() = 0; virtual int Disconnect() = 0;
virtual int PreCapture() { return 0; }; virtual int PreCapture() override { return 0; };
virtual int PrimeCapture() { return 0; }; virtual int PrimeCapture() override { return 0; };
virtual int Capture(ZMPacket &p) = 0; virtual int Capture(ZMPacket &p) override = 0;
virtual int PostCapture() = 0; virtual int PostCapture() override = 0;
int Read(int fd, char*buf, int size); int Read(int fd, char*buf, int size);
}; };

View File

@ -59,19 +59,19 @@ public:
); );
~RemoteCameraHttp(); ~RemoteCameraHttp();
void Initialise(); void Initialise() override;
void Terminate() { Disconnect(); } void Terminate() override { Disconnect(); }
int Connect(); int Connect() override;
int Disconnect(); int Disconnect() override;
int SendRequest(); int SendRequest();
int ReadData( Buffer &buffer, unsigned int bytes_expected=0 ); int ReadData( Buffer &buffer, unsigned int bytes_expected=0 );
int GetData(); int GetData();
int GetResponse(); int GetResponse();
int PrimeCapture(); int PrimeCapture() override;
int PreCapture(); int PreCapture() override;
int Capture( ZMPacket &p ); int Capture( ZMPacket &p ) override;
int PostCapture(); int PostCapture() override;
int Close() { Disconnect(); return 0; }; int Close() override { Disconnect(); return 0; };
}; };
#endif // ZM_REMOTE_CAMERA_HTTP_H #endif // ZM_REMOTE_CAMERA_HTTP_H

View File

@ -47,16 +47,16 @@ public:
bool p_record_audio ); bool p_record_audio );
~RemoteCameraNVSocket(); ~RemoteCameraNVSocket();
void Initialise(); void Initialise() override;
void Terminate() { Disconnect(); } void Terminate() override { Disconnect(); }
int Connect(); int Connect() override;
int Disconnect(); int Disconnect() override;
int SendRequest(std::string); int SendRequest(std::string);
int GetResponse(); int GetResponse();
int PrimeCapture(); int PrimeCapture() override;
int Capture(ZMPacket &p); int Capture(ZMPacket &p) override;
int PostCapture(); int PostCapture() override;
int Close() { return 0; }; int Close() override { return 0; };
}; };
#endif // ZM_REMOTE_CAMERA_NVSOCKET_H #endif // ZM_REMOTE_CAMERA_NVSOCKET_H