autoplay fixes
This commit is contained in:
parent
0379de6179
commit
2c3e9fd5e7
|
@ -717,6 +717,7 @@ public class MainWindowController {
|
||||||
// check if there is a series node to add the item
|
// check if there is a series node to add the item
|
||||||
for (int i = 0; i < filmRoot.getChildren().size(); i++) {
|
for (int i = 0; i < filmRoot.getChildren().size(); i++) {
|
||||||
if (filmRoot.getChildren().get(i).getValue().getTitle().equals(element.getTitle())) {
|
if (filmRoot.getChildren().get(i).getValue().getTitle().equals(element.getTitle())) {
|
||||||
|
// if a root node exists, add element as child
|
||||||
// System.out.println("Found a root node to add child");
|
// System.out.println("Found a root node to add child");
|
||||||
// System.out.println("Adding: " + element.getStreamUrl());
|
// System.out.println("Adding: " + element.getStreamUrl());
|
||||||
TreeItem<FilmTabelDataType> episodeNode = new TreeItem<>(new FilmTabelDataType(element.getStreamUrl(),
|
TreeItem<FilmTabelDataType> episodeNode = new TreeItem<>(new FilmTabelDataType(element.getStreamUrl(),
|
||||||
|
@ -724,8 +725,10 @@ public class MainWindowController {
|
||||||
element.getCached(), element.getImage()));
|
element.getCached(), element.getImage()));
|
||||||
filmRoot.getChildren().get(i).getChildren().add(episodeNode);
|
filmRoot.getChildren().get(i).getChildren().add(episodeNode);
|
||||||
} else if (i == filmRoot.getChildren().size() - 1) {
|
} else if (i == filmRoot.getChildren().size() - 1) {
|
||||||
|
// if no root node exists, create one and add element as child
|
||||||
// System.out.println("Create a root node to add child");
|
// System.out.println("Create a root node to add child");
|
||||||
// System.out.println("Adding: " + element.getStreamUrl());
|
// System.out.println("Adding: " + element.getStreamUrl());
|
||||||
|
// TODO get the last watched episode, the first one with currentTime != 0
|
||||||
TreeItem<FilmTabelDataType> seriesRootNode = new TreeItem<>(new FilmTabelDataType(element.getStreamUrl(),
|
TreeItem<FilmTabelDataType> seriesRootNode = new TreeItem<>(new FilmTabelDataType(element.getStreamUrl(),
|
||||||
element.getTitle(), "", "", element.getFavorite(), element.getCached(), element.getImage()));
|
element.getTitle(), "", "", element.getFavorite(), element.getCached(), element.getImage()));
|
||||||
filmRoot.getChildren().add(seriesRootNode);
|
filmRoot.getChildren().add(seriesRootNode);
|
||||||
|
|
|
@ -236,7 +236,7 @@ public class DBController {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* refresh data in mainWindowController localFilms and streamingFilms
|
* refresh data in mainWindowController for one element
|
||||||
* @param streamUrl of the film
|
* @param streamUrl of the film
|
||||||
* @param index of the film in LocalFilms list
|
* @param index of the film in LocalFilms list
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -144,13 +144,15 @@ public class PlayerController {
|
||||||
dbController.setCurrentTime(film.getStreamUrl(), 0); // reset old video start time
|
dbController.setCurrentTime(film.getStreamUrl(), 0); // reset old video start time
|
||||||
|
|
||||||
//start the new film
|
//start the new film
|
||||||
System.out.println("next episode is: " + dbController.getNextEpisode(film.getTitle(), episode + 1));
|
FilmTabelDataType nextFilm = dbController.getNextEpisode(film.getTitle(), episode + 1);
|
||||||
mediaPlayer.stop();
|
if (nextFilm != null) {
|
||||||
player.playNewFilm(dbController.getNextEpisode(film.getTitle(), episode + 1));
|
// System.out.println("next episode is: " + nextFilm.getStreamUrl());
|
||||||
|
mediaPlayer.stop();
|
||||||
|
player.playNewFilm(nextFilm);
|
||||||
|
autoplay = true;
|
||||||
|
}
|
||||||
} else if ((duration - currentTime) < 100) {
|
} else if ((duration - currentTime) < 100) {
|
||||||
dbController.setCurrentTime(film.getStreamUrl(), 0);
|
|
||||||
mediaPlayer.stop();
|
mediaPlayer.stop();
|
||||||
player.getStage().close();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!mousePressed) {
|
if (!mousePressed) {
|
||||||
|
|
Loading…
Reference in New Issue