Seil0/Project-HomeFlix
Seil0
/
Project-HomeFlix
1
0
Fork 0
Code Issues 7 Pull Requests Releases 4 Wiki Activity

fixed time slider and autoplay 

* fixed a bug that made it impossible to go further back than the start time
* fixed autoplay
* fixed wrong icon on playBtn at the start of the player
* fixed slider position at start of the player
This commit is contained in:
Jannik 2018-04-03 18:03:43 +02:00
parent 5e4373d70d
commit 0379de6179
5 changed files with 95 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/kellerkinder/HomeFlix/application/Main.java
View File

@ -40,6 +40,7 @@ import javafx.scene.layout.AnchorPane;
import javafx.stage.DirectoryChooser;
import javafx.stage.FileChooser;
import javafx.stage.Stage;
import javafx.stage.WindowEvent;
public class Main extends Application {
@ -90,6 +91,12 @@ public class Main extends Application {
primaryStage.setResizable(false);
primaryStage.setTitle("Project HomeFlix");
primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/icons/Homeflix_Icon_64x64.png"))); //adds application icon
primaryStage.setOnCloseRequest(new EventHandler<WindowEvent>() {
public void handle(WindowEvent we) {
System.exit(1);
}
});
mainWindowController = loader.getController(); //Link of FXMLController and controller class
mainWindowController.setMain(this); //call setMain

37
src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java
View File

@ -231,14 +231,13 @@ public class MainWindowController {
private static final Logger LOGGER = LogManager.getLogger(MainWindowController.class.getName());
private int hashA = -647380320;
private String version = "0.6.1";
private String buildNumber = "145";
private String version = "0.6.99";
private String buildNumber = "147";
private String versionName = "glowing vampire";
private String dialogBtnStyle;
private String color;
private String title;
private String streamUrl;
private String currentEp;
private String ratingSortType;
private String local;
private String omdbAPIKey;
@ -256,6 +255,7 @@ public class MainWindowController {
private int indexList;
private int next;
private ResourceBundle bundle;
private FilmTabelDataType currentFilm;
private ObservableList<String> languages = FXCollections.observableArrayList("English (en_US)", "Deutsch (de_DE)");
private ObservableList<String> branches = FXCollections.observableArrayList("stable", "beta");
@ -499,7 +499,6 @@ public class MainWindowController {
next = indexTable + 1;
title = columnTitle.getCellData(indexTable); // get name of selected item
streamUrl = columnStreamUrl.getCellData(indexTable); // get file path of selected item
currentEp = columnEpisode.getCellData(indexTable); // get the current episode of a series
for (FilmTabelDataType helpData : filmsList) {
if (helpData.getStreamUrl().equals(streamUrl)) {
@ -507,6 +506,8 @@ public class MainWindowController {
}
}
currentFilm = filmsList.get(indexList);
if (filmsList.get(indexList).getCached()) {
LOGGER.info("loading from cache: " + title);
dbController.readCache(streamUrl);
@ -546,13 +547,10 @@ public class MainWindowController {
@FXML
private void playbtnclicked() {
// TODO rework when #19 is coming
try {
System.out.println();
new Player(streamUrl, currentEp, dbController);
} catch (Exception e) {
LOGGER.error("using fallback player!", e); // FIXME doesn't work!
if (isSupportedFormat(currentFilm)) {
new Player(currentFilm, dbController);
} else {
LOGGER.error("using fallback player!");
if (System.getProperty("os.name").contains("Linux")) {
String line;
@ -574,7 +572,7 @@ public class MainWindowController {
vlcInfoAlert.showAndWait();
} else {
try {
Runtime.getRuntime().exec(new String[] { "vlc", streamUrl }); // TODO switch to ProcessBuilder
new ProcessBuilder("vlc", streamUrl).start();
} catch (IOException e1) {
showErrorMsg(errorPlay, e1);
}
@ -592,6 +590,19 @@ public class MainWindowController {
}
}
/** TODO improve function
* check if a film is supported by the HomeFlixPlayer or not
* @param entry the film you want to check
* @return true if so, false if not
*/
private boolean isSupportedFormat(FilmTabelDataType film) {
if (film.getStreamUrl().endsWith(".mp4")) {
return true;
} else {
return false;
}
}
@FXML
private void openfolderbtnclicked() {
String dest = new File(streamUrl).getParentFile().getAbsolutePath();
@ -868,7 +879,7 @@ public class MainWindowController {
vlcNotInstalled = getBundle().getString("vlcNotInstalled");
}
// TODO remove after #19 has landed
// TODO rework after #19 has landed
public void showErrorMsg(String msg, Exception exception) {
Alert alert = new Alert(AlertType.ERROR);
alert.setTitle("Error");

25
src/main/java/kellerkinder/HomeFlix/controller/DBController.java
View File

@ -651,21 +651,30 @@ public class DBController {
* get the next episode of a
* @param title URL of the film
* @param nextEp number of the next episode
* @return {@link String} the streamUrl of the next episode
* @return {@link FilmTabelDataType} the next episode as object
*/
public String getNextEpisode(String title, int nextEp) {
String nextStreamUrl = "";
public FilmTabelDataType getNextEpisode(String title, int nextEp) {
FilmTabelDataType nextFilm = null;
try {
Statement stmt = connection.createStatement();
ResultSet rs = stmt.executeQuery(
"SELECT * FROM films WHERE title = \"" + title + "\" AND episode = " + nextEp + ";");
nextStreamUrl = rs.getString("streamUrl");
ResultSet rs = stmt.executeQuery("SELECT * FROM films WHERE title = \"" + title + "\" AND episode = \"" + nextEp + "\";");
while (rs.next()) {
if (rs.getBoolean("favorite") == true) {
nextFilm = new FilmTabelDataType(rs.getString("streamUrl"),
rs.getString("title"), rs.getString("season"), rs.getString("episode") ,rs.getBoolean("favorite"),
rs.getBoolean("cached"), new ImageView(favorite_black));
} else {
nextFilm = new FilmTabelDataType(rs.getString("streamUrl"),
rs.getString("title"), rs.getString("season"), rs.getString("episode"), rs.getBoolean("favorite"),
rs.getBoolean("cached"), new ImageView(favorite_border_black));
}
}
rs.close();
stmt.close();
} catch (Exception e) {
LOGGER.error("Ups! error while refreshing mwc!", e);
LOGGER.error("Ups! error while getting next episode!", e);
}
return nextStreamUrl;
return nextFilm;
}
// removes the ending

16
src/main/java/kellerkinder/HomeFlix/player/Player.java
View File

@ -31,21 +31,23 @@ import javafx.stage.Stage;
import javafx.stage.WindowEvent;
import kellerkinder.HomeFlix.application.Main;
import kellerkinder.HomeFlix.controller.DBController;
import kellerkinder.HomeFlix.datatypes.FilmTabelDataType;
public class Player {
private PlayerController playerController;
private DBController dbController;
private Stage stage;
private AnchorPane pane;
private Scene scene;
/**
* generate a new PlayerWindow
* @param file the file you want to play
* @param currentEp the current episode (needed for autoplay)
* @param entry the film object
* @param dbController the dbController object
*/
public Player(String file, String currentEp, DBController dbController) {
public Player(FilmTabelDataType film, DBController dbController) {
this.dbController = dbController;
try {
FXMLLoader fxmlLoader = new FXMLLoader(ClassLoader.getSystemResource("fxml/PlayerWindow.fxml"));
pane = (AnchorPane) fxmlLoader.load();
@ -56,14 +58,14 @@ public class Player {
stage.getIcons().add(new Image(Main.class.getResourceAsStream("/icons/Homeflix_Icon_64x64.png")));
stage.setOnCloseRequest(new EventHandler<WindowEvent>() {
public void handle(WindowEvent we) {
dbController.setCurrentTime(file, playerController.getCurrentTime());
dbController.setCurrentTime(film.getStreamUrl(), playerController.getCurrentTime());
playerController.getMediaPlayer().stop();
stage.close();
}
});
playerController = fxmlLoader.getController();
playerController.init(file, currentEp, this, dbController);
playerController.init(film, this, dbController);
stage.setFullScreen(true);
stage.show();
@ -72,6 +74,10 @@ public class Player {
}
}
public void playNewFilm(FilmTabelDataType film) {
playerController.init(film, this, dbController);
}
public Stage getStage() {
return stage;
}

60
src/main/java/kellerkinder/HomeFlix/player/PlayerController.java
View File

@ -47,6 +47,7 @@ import javafx.scene.media.MediaPlayer.Status;
import javafx.scene.media.MediaView;
import javafx.util.Duration;
import kellerkinder.HomeFlix.controller.DBController;
import kellerkinder.HomeFlix.datatypes.FilmTabelDataType;
public class PlayerController {
@ -76,13 +77,14 @@ public class PlayerController {
private Media media;
private MediaPlayer mediaPlayer;
private FilmTabelDataType film;
private double currentTime = 0;
private double futureTime= 0;
private double seekTime = 0;
private double startTime = 0;
private double duration = 0;
private boolean mousePressed = false;
private boolean showControls = true;
private String file;
private int nextEp;
private boolean autoplay = true;
private ImageView stop_black = new ImageView(new Image("icons/ic_stop_black_24dp_1x.png"));
private ImageView play_arrow_black = new ImageView(new Image("icons/ic_play_arrow_black_24dp_1x.png"));
@ -92,24 +94,23 @@ public class PlayerController {
/**
* initialize the new PlayerWindow
* @param file the file you want to play
* @param currentEp the current episode (needed for autoplay)
* @param entry the film object
* @param player the player object (needed for closing action)
* @param dbController the dbController object
*/
public void init(String file, String currentEp, Player player, DBController dbController) {
this.file = file;
public void init(FilmTabelDataType film, Player player, DBController dbController) {
this.film = film;
this.player = player;
this.dbController = dbController;
initActions();
if (currentEp.length() > 0) {
nextEp = Integer.parseInt(currentEp) + 1;
if (film.getStreamUrl().startsWith("http")) {
media = new Media(film.getStreamUrl());
} else {
nextEp = 0;
media = new Media(new File(film.getStreamUrl()).toURI().toString());
}
startTime = dbController.getCurrentTime(film.getStreamUrl());
media = new Media(new File(file).toURI().toString());
mediaPlayer = new MediaPlayer(media);
mediaView.setPreserveRatio(true);
mediaView.setMediaPlayer(mediaPlayer);
@ -127,29 +128,29 @@ public class PlayerController {
timeSlider.setMax((duration/1000)/60);
mediaPlayer.setStartTime(Duration.millis(dbController.getCurrentTime(file)));
mediaPlayer.play();
mediaPlayer.seek(Duration.millis(startTime));
}
});
mediaPlayer.currentTimeProperty().addListener(new ChangeListener<Duration>() {
@Override
public void changed(ObservableValue<? extends Duration> observable, Duration oldValue, Duration newValue) {
currentTime = newValue.toMillis();
int episode = Integer.parseInt(film.getEpisode());
if (duration - currentTime < 10000) {
if (nextEp != 0) {
dbController.getNextEpisode(new File(file).getName(), nextEp);
System.out.println("next episode is: " + dbController.getNextEpisode(file, nextEp));
} else {
if (duration - currentTime < 100) {
dbController.setCurrentTime(file, 0);
mediaPlayer.stop();
player.getStage().close();
}
}
if ((duration - currentTime) < 10000 && episode != 0 && autoplay) {
autoplay = false;
dbController.setCurrentTime(film.getStreamUrl(), 0); // reset old video start time
//start the new film
System.out.println("next episode is: " + dbController.getNextEpisode(film.getTitle(), episode + 1));
mediaPlayer.stop();
player.playNewFilm(dbController.getNextEpisode(film.getTitle(), episode + 1));
} else if ((duration - currentTime) < 100) {
dbController.setCurrentTime(film.getStreamUrl(), 0);
mediaPlayer.stop();
player.getStage().close();
}
if (!mousePressed) {
@ -159,8 +160,9 @@ public class PlayerController {
});
stopBtn.setGraphic(stop_black);
playBtn.setGraphic(play_arrow_black);
playBtn.setGraphic(pause_black);
fullscreenBtn.setGraphic(fullscreen_exit_black);
timeSlider.setValue(0);
}
/**
@ -202,7 +204,7 @@ public class PlayerController {
timeSlider.setOnMouseReleased(new EventHandler<MouseEvent>() {
@Override
public void handle(MouseEvent event) {
mediaPlayer.seek(new Duration(futureTime));
mediaPlayer.seek(new Duration(seekTime));
mousePressed = false;
}
});
@ -217,7 +219,7 @@ public class PlayerController {
timeSlider.valueProperty().addListener(new ChangeListener<Number>() {
@Override
public void changed(ObservableValue<? extends Number> ov, Number old_val, Number new_val) {
futureTime = (double) new_val*1000*60;
seekTime = (double) new_val*1000*60;
}
});
}
@ -225,7 +227,7 @@ public class PlayerController {
@FXML
void stopBtnAction(ActionEvent event) {
dbController.setCurrentTime(file, currentTime);
dbController.setCurrentTime(film.getStreamUrl(), currentTime);
mediaPlayer.stop();
player.getStage().close();