Skip to content

Commit

Permalink
Fixed Timer bug, fixed autoVolume not wokring on autoPlay.
Browse files Browse the repository at this point in the history
  • Loading branch information
iamKunal committed Nov 17, 2016
1 parent c455fce commit 719a02b
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/beatboxer/BeatBoxer.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.scene.image.Image;
import javafx.scene.media.*;
import javafx.stage.DirectoryChooser;
import javafx.stage.Stage;
Expand All @@ -43,10 +44,10 @@ public void start(Stage stage) throws Exception {
mediaPlayer = toMediaPlayer(nowPlaying.get(0));
Parent root = FXMLLoader.load(getClass().getResource("BeatBoxer.fxml"));
Scene scene = new Scene(root);

scene.getStylesheets().add(getClass().getResource("stylesheet.css").toExternalForm());
stage.setScene(scene);
stage.setTitle("BeatBoxer");
stage.getIcons().add(new Image(BeatBoxer.class.getResourceAsStream( "images/BeatBoxer.png" )));
stage.show();
// mediaPlayer.play();
state.addListener(new ChangeListener<String>(){
Expand Down
8 changes: 8 additions & 0 deletions src/beatboxer/BeatBoxerController.java
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,14 @@ public void changed(
// bb.mediaPlayer.dispose();
// if(BeatBoxer.autoPlay){
BeatBoxer.state.setValue("autoPlayNext");
if(BeatBoxer.currentIndex==BeatBoxer.nowPlaying.size()-1){
BBSong song = (BeatBoxer.nowPlaying.get(0));
setVolumeValue(song.getGenre());
}
else{
BBSong song = (BeatBoxer.nowPlaying.get(BeatBoxer.currentIndex+1));
setVolumeValue(song.getGenre());
}
// BeatBoxer.play();
// }
// else
Expand Down
13 changes: 9 additions & 4 deletions src/beatboxer/TimerController.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ public void changed(ObservableValue<? extends Boolean> observable, Boolean oldVa
@Override
public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
if(newValue.intValue()<1 && minuteSlider.getValue()<1){
ok.setDisable(true);
ok.setDisable(true);
}
else if(newValue.intValue()>=1){
ok.setDisable(false);
ok.setDisable(false);
}
}

Expand All @@ -82,16 +82,17 @@ else if(newValue.intValue()>=1){
@Override
public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
if(newValue.intValue()<1 && secondSlider.getValue()<1){
ok.setDisable(true);
ok.setDisable(true);
}
else if(newValue.intValue()>=1){
ok.setDisable(false);
ok.setDisable(false);
}
}

});
if(BeatBoxer.timer!=null){
stop.setDisable(false);
try{
BeatBoxer.timer.currentTimeProperty().addListener(new ChangeListener<Duration>(){
@Override
public void changed(ObservableValue<? extends Duration> observable, Duration oldValue, Duration newValue) {
Expand All @@ -104,6 +105,10 @@ public void changed(ObservableValue<? extends Duration> observable, Duration old
}
}
});
}
catch (NullPointerException e){
;
}
}
else
stop.setDisable(true);
Expand Down
Binary file added src/beatboxer/images/BeatBoxer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/beatboxer/images/BeatBoxer.psd
Binary file not shown.

0 comments on commit 719a02b

Please sign in to comment.