ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unused code

pull/3222/head
Isaac Connor 2021-04-20 16:18:50 -04:00
parent 7a674be285
commit 77055ee1cc
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/zm_monitorstream.cpp
View File

@ -562,14 +562,6 @@ void MonitorStream::runStream() {
Debug(2, "Not using playback_buffer"); Debug(2, "Not using playback_buffer");
} // end if connkey & playback_buffer } // end if connkey & playback_buffer
// if MaxFPS < 0 as in 1/60 = 0.017 then we won't get another frame for 60 sec.
double capture_fps = monitor->GetFPS();
double capture_max_fps = monitor->GetCaptureMaxFPS();
if ( capture_max_fps && ( capture_fps > capture_max_fps ) ) {
Debug(1, "Using %.3f for fps instead of current fps %.3f", capture_max_fps, capture_fps);
capture_fps = capture_max_fps;
}
while (!zm_terminate) { while (!zm_terminate) {
bool got_command = false; bool got_command = false;
if ( feof(stdout) ) { if ( feof(stdout) ) {
@ -931,7 +923,7 @@ void MonitorStream::SingleImageZip(int scale) {
snap_image->Zip(img_buffer, &img_buffer_size); snap_image->Zip(img_buffer, &img_buffer_size);
fprintf(stdout, fprintf(stdout,
"Content-Length: %ld\r\n" "Content-Length: %lu\r\n"
"Content-Type: image/x-rgbz\r\n\r\n", "Content-Type: image/x-rgbz\r\n\r\n",
img_buffer_size); img_buffer_size);
fwrite(img_buffer, img_buffer_size, 1, stdout); fwrite(img_buffer, img_buffer_size, 1, stdout);

1
src/zm_monitorstream.h
View File

@ -36,7 +36,6 @@ class MonitorStream : public StreamBase {
int temp_image_buffer_count; int temp_image_buffer_count;
int temp_read_index; int temp_read_index;
int temp_write_index; int temp_write_index;
static const uint32 MAX_SLEEP_USEC = 1000000; // 1 sec
protected: protected:
time_t ttl; time_t ttl;