From fe1e17d0972deaf65be0c9e56cc01b2b136fec2d Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 5 Sep 2018 11:16:17 -0400 Subject: [PATCH] Capture can reasonably return -1 for EOF. --- src/zm_monitor.cpp | 2 +- src/zmc.cpp | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index 6a5cf208e..fe04fbbc4 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -2383,7 +2383,7 @@ int Monitor::Capture() { } if ( captureResult < 0 ) { - Warning("Return from Capture (%d), signal loss", captureResult); + Info("Return from Capture (%d), signal loss", captureResult); // Unable to capture image for temporary reason // Fake a signal loss image Rgb signalcolor; diff --git a/src/zmc.cpp b/src/zmc.cpp index 77b88ddc6..9270c75cd 100644 --- a/src/zmc.cpp +++ b/src/zmc.cpp @@ -300,19 +300,22 @@ int main(int argc, char *argv[]) { if ( next_delays[i] <= min_delay || next_delays[i] <= 0 ) { if ( monitors[i]->PreCapture() < 0 ) { - Error("Failed to pre-capture monitor %d %d (%d/%d)", monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors); + Error("Failed to pre-capture monitor %d %d (%d/%d)", + monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors); monitors[i]->Close(); result = -1; break; } if ( monitors[i]->Capture() < 0 ) { - Error("Failed to capture image from monitor %d %s (%d/%d)", monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors); + Info("Failed to capture image from monitor %d %s (%d/%d)", + monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors); monitors[i]->Close(); result = -1; break; } if ( monitors[i]->PostCapture() < 0 ) { - Error("Failed to post-capture monitor %d %s (%d/%d)", monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors); + Error("Failed to post-capture monitor %d %s (%d/%d)", + monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors); monitors[i]->Close(); result = -1; break;