From f7ca2a1eab7bd97cedd6ae554b60737d5ef1d076 Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Fri, 18 Jan 2019 16:30:16 +0100 Subject: [PATCH] Changed LiveJasmin beta warning a bit Since the HLS downloads suddenly work the warning now only states, that you have to log in and that the previews don't work --- .../sites/jasmin/LiveJasminFollowedTab.java | 19 ------------------- .../ctbrec/ui/sites/jasmin/LiveJasminTab.java | 6 ++---- .../sites/jasmin/LiveJasminTabProvider.java | 2 +- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminFollowedTab.java b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminFollowedTab.java index 151be60e..d5c9cdc0 100644 --- a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminFollowedTab.java +++ b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminFollowedTab.java @@ -2,7 +2,6 @@ package ctbrec.ui.sites.jasmin; import ctbrec.sites.jasmin.LiveJasmin; import ctbrec.ui.FollowedTab; -import javafx.concurrent.WorkerStateEvent; import javafx.geometry.Insets; import javafx.scene.Scene; import javafx.scene.control.RadioButton; @@ -41,24 +40,6 @@ public class LiveJasminFollowedTab extends LiveJasminTab implements FollowedTab }); } - @Override - protected void onSuccess() { - grid.getChildren().remove(status); - super.onSuccess(); - } - - @Override - protected void onFail(WorkerStateEvent event) { - status.setText("Login failed"); - super.onFail(event); - } - - @Override - public void selected() { - status.setText("Logging in..."); - super.selected(); - } - @Override public void setScene(Scene scene) { scene.addEventFilter(KeyEvent.KEY_PRESSED, event -> { diff --git a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTab.java b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTab.java index 04922b0b..5957be34 100644 --- a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTab.java +++ b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTab.java @@ -24,10 +24,8 @@ public class LiveJasminTab extends ThumbOverviewTab { super(title, updateService, site); if(!betaAcknowledged) { status = new Label("LiveJasmin is not fully functional. Live previews do not work.\n" - + "Starting the stream in the external player also only works for streams with SD quality.\n" - + "Recording works only in standalone mode. The server does not support it, because you have " - + "to be logged in.\nSo make sure, that you have an account and that you have entered your credentials " - + "on the settings tab."); + + "Also make sure, that you have an account and that you have entered your credentials.\n" + + "Otherwise you might get errors."); grid.getChildren().add(status); grid.getChildren().add(acknowledge); grid.getChildren().add(createAccount); diff --git a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTabProvider.java b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTabProvider.java index 66fd05e8..a1e8e877 100644 --- a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTabProvider.java +++ b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTabProvider.java @@ -42,7 +42,7 @@ public class LiveJasminTabProvider extends TabProvider { private ThumbOverviewTab createTab(String title, String url) { LiveJasminUpdateService s = new LiveJasminUpdateService(liveJasmin, url); - LiveJasminTab tab = new LiveJasminTab(title, s, liveJasmin); + ThumbOverviewTab tab = new LiveJasminTab(title, s, liveJasmin); tab.setRecorder(liveJasmin.getRecorder()); s.setPeriod(Duration.seconds(60)); return tab;