j62
/
ctbrec
2
2
Fork 2
Code Issues 3 Pull Requests Packages Projects Releases 3 Wiki Activity

Code cleanup

This commit is contained in:
0xb00bface 2021-12-21 14:21:52 +01:00
parent 0772b8e057
commit 14f9cce1ae
6 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/main/java/ctbrec/ui/CamrecApplication.java
View File

@ -276,7 +276,7 @@ public class CamrecApplication extends Application {
.addListener((observable, oldVal, newVal) -> Config.getInstance().getSettings().windowHeight = newVal.intValue());
primaryStage.setMaximized(Config.getInstance().getSettings().windowMaximized);
primaryStage.maximizedProperty().addListener((observable, oldVal, newVal) -> Config.getInstance().getSettings().windowMaximized = newVal);
Player.scene = primaryStage.getScene();
Player.setScene(primaryStage.getScene());
primaryStage.setX(Config.getInstance().getSettings().windowX);
primaryStage.setY(Config.getInstance().getSettings().windowY);
primaryStage.xProperty().addListener((observable, oldVal, newVal) -> {

48
client/src/main/java/ctbrec/ui/Player.java
View File

@ -1,5 +1,21 @@
package ctbrec.ui;
import com.iheartradio.m3u8.ParseException;
import com.iheartradio.m3u8.PlaylistException;
import ctbrec.*;
import ctbrec.event.EventBusHolder;
import ctbrec.io.StreamRedirector;
import ctbrec.io.UrlUtil;
import ctbrec.recorder.download.StreamSource;
import ctbrec.recorder.download.hls.NoStreamFoundException;
import ctbrec.ui.controls.Dialogs;
import ctbrec.ui.event.PlayerStartedEvent;
import ctbrec.variableexpansion.ModelVariableExpander;
import javafx.scene.Scene;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.xml.bind.JAXBException;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
@ -13,32 +29,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ExecutionException;
import javax.xml.bind.JAXBException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.iheartradio.m3u8.ParseException;
import com.iheartradio.m3u8.PlaylistException;
import ctbrec.Config;
import ctbrec.Model;
import ctbrec.OS;
import ctbrec.Recording;
import ctbrec.StringUtil;
import ctbrec.event.EventBusHolder;
import ctbrec.io.StreamRedirector;
import ctbrec.io.UrlUtil;
import ctbrec.recorder.download.StreamSource;
import ctbrec.ui.controls.Dialogs;
import ctbrec.ui.event.PlayerStartedEvent;
import ctbrec.variableexpansion.ModelVariableExpander;
import javafx.scene.Scene;
public class Player {
private static final Logger LOG = LoggerFactory.getLogger(Player.class);
private static PlayerThread playerThread;
public static Scene scene;
private static Scene scene;
private Player() {
}
@ -187,7 +181,7 @@ public class Player {
}
}
if (sources.isEmpty()) {
throw new RuntimeException("No stream left in playlist, because player resolution is set to " + maxRes);
throw new NoStreamFoundException("No stream left in playlist, because player resolution is set to " + maxRes);
} else {
LOG.debug("{} selected {}", model.getName(), sources.get(sources.size() - 1));
best = sources.get(sources.size() - 1);
@ -208,7 +202,7 @@ public class Player {
Config cfg = Config.getInstance();
String params = cfg.getSettings().mediaPlayerParams.trim();
String[] cmdline = null;
String[] cmdline;
if (params.isEmpty()) {
cmdline = new String[2];
} else {
@ -241,4 +235,8 @@ public class Player {
}
}
}
public static void setScene(Scene scene) {
Player.scene = scene;
}
}

3
common/src/main/java/ctbrec/recorder/download/dash/DashDownload.java
View File

@ -27,6 +27,7 @@ import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import ctbrec.recorder.download.hls.NoStreamFoundException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -299,7 +300,7 @@ public class DashDownload extends AbstractDownload {
AdaptationSetType video = chooseBestVideo(videoStreams);
if (video == null) {
throw new ExecutionException(new RuntimeException("No stream left in playlist"));
throw new ExecutionException(new NoStreamFoundException("No stream left in playlist"));
} else {
int downloaded = downloadSegments(mpd, video, true);

2
common/src/main/java/ctbrec/recorder/download/hls/AbstractHlsDownload.java
View File

@ -248,7 +248,7 @@ public abstract class AbstractHlsDownload extends AbstractDownload {
.collect(Collectors.toList());
if (filteredStreamSources.isEmpty()) {
throw new ExecutionException(new RuntimeException("No stream left in playlist"));
throw new ExecutionException(new NoStreamFoundException("No stream left in playlist"));
} else {
StreamSource source = filteredStreamSources.get(filteredStreamSources.size() - 1);
LOG.debug("{} selected {}", model.getName(), source);

2
common/src/main/java/ctbrec/recorder/download/hls/HlsdlDownload.java
View File

@ -150,7 +150,7 @@ public class HlsdlDownload extends AbstractDownload {
.collect(Collectors.toList());
if (filteredStreamSources.isEmpty()) {
throw new ExecutionException(new RuntimeException("No stream left in playlist"));
throw new ExecutionException(new NoStreamFoundException("No stream left in playlist"));
} else {
LOG.debug("{} selected {}", model.getName(), filteredStreamSources.get(filteredStreamSources.size() - 1));
url = filteredStreamSources.get(filteredStreamSources.size() - 1).getMediaPlaylistUrl();

7
common/src/main/java/ctbrec/recorder/download/hls/NoStreamFoundException.java Normal file
View File

@ -0,0 +1,7 @@
package ctbrec.recorder.download.hls;
public class NoStreamFoundException extends RuntimeException {
public NoStreamFoundException(String msg) {
super(msg);
}
}