From 3188511c6ac8857beca99cf5192c538be9327aea Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Sat, 1 Dec 2018 19:29:41 +0100 Subject: [PATCH] Make log messages less serious for player errors --- .../main/java/ctbrec/ui/PreviewPopupHandler.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/PreviewPopupHandler.java b/client/src/main/java/ctbrec/ui/PreviewPopupHandler.java index 78eb1559..adc3fbe6 100644 --- a/client/src/main/java/ctbrec/ui/PreviewPopupHandler.java +++ b/client/src/main/java/ctbrec/ui/PreviewPopupHandler.java @@ -14,6 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ctbrec.Config; +import ctbrec.io.HttpException; import ctbrec.recorder.download.StreamSource; import javafx.application.Platform; import javafx.event.EventHandler; @@ -199,11 +200,11 @@ public class PreviewPopupHandler implements EventHandler { double aspect = (double)video.getWidth() / video.getHeight(); double w = Config.getInstance().getSettings().thumbWidth; double h = w / aspect; + progressIndicator.setVisible(false); videoPreview.setVisible(true); videoPreview.setMediaPlayer(videoPlayer); resize(w, h); videoPlayer.play(); - progressIndicator.setVisible(false); }); } }); @@ -212,7 +213,12 @@ public class PreviewPopupHandler implements EventHandler { if(e.getMessage().equals("Stream url unknown")) { // fine hls url for mfc not known yet } else { - LOG.error("Couldn't start preview video", e); + LOG.warn("Couldn't start preview video: {}", e.getMessage()); + } + showTestImage(); + } catch (HttpException e) { + if(e.getResponseCode() != 404) { + LOG.warn("Couldn't start preview video: {}", e.getMessage()); } showTestImage(); } catch (InterruptedException | InterruptedIOException e) { @@ -221,11 +227,11 @@ public class PreviewPopupHandler implements EventHandler { if(e.getCause() instanceof InterruptedException || e.getCause() instanceof InterruptedIOException) { // future has been canceled, that's fine } else { - LOG.error("Couldn't start preview video", e); + LOG.warn("Couldn't start preview video: {}", e.getMessage()); showTestImage(); } } catch (Exception e) { - LOG.error("Couldn't start preview video", e); + LOG.warn("Couldn't start preview video: {}", e.getMessage()); showTestImage(); } });