Fixed a bug: Volume does not change automatically for next song when …

…current song is deleted.
iamKunal · Nov 25, 2016 · 373c57b · 373c57b
1 parent 4fa5439
commit 373c57b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -4,28 +4,29 @@
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
             <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/PlayList.java</file>
-            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/CreatePlaylistController.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/TimerController.java</file>
             <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/DataBase.java</file>
             <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BBGenerator.java</file>
-            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/CreateConnection.java</file>
-            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/SongEditorController.java</file>
-            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/playlistStylesheet.css</file>
-            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BeatBoxer.java</file>
             <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/Favourites.java</file>
             <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/Delete.java</file>
-            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/Search.java</file>
             <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/Run.java</file>
             <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/Directory.java</file>
-            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BBScanner.java</file>
             <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BBItem.java</file>
             <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/ItemDeleterController.java</file>
             <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/Show.java</file>
-            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BeatBoxerController.java</file>
-            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/FolderChooserController.java</file>
-            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BBSong.java</file>
             <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/stylesheet.css</file>
             <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BeatBoxer.fxml</file>
             <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/Timer.fxml</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/CreatePlaylistController.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/CreateConnection.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/SongEditorController.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/playlistStylesheet.css</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BeatBoxer.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/Search.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BBScanner.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BeatBoxerController.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/FolderChooserController.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BBSong.java</file>
             <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/PlayListInfo.java</file>
         </group>
     </open-files>

diff --git a/src/beatboxer/BeatBoxerController.java b/src/beatboxer/BeatBoxerController.java
@@ -245,7 +245,10 @@ private void deleteItem() throws Exception {
                 }
                 selectedSong = allsongsListView.getSelectionModel().getSelectedItem();
             }
-            System.out.println(selectedSong);
+            boolean rightNow=false;
+            if(BeatBoxer.nowPlaying.get(BeatBoxer.currentIndex).equals(selectedSong)){
+                rightNow=true;
+            }
             FXMLLoader loader = new FXMLLoader(getClass().getResource("ItemDeleter.fxml"));
             Parent itemDeleterRoot = (Parent) loader.load();
             Scene songEditor = new Scene(itemDeleterRoot);
@@ -255,6 +258,9 @@ private void deleteItem() throws Exception {
             stager.setScene(songEditor);
             stager.setTitle("Delete Song : " + selectedSong.getName());
             stager.showAndWait();
+            if(!BeatBoxer.nowPlaying.contains(selectedSong) && rightNow){
+                setVolumeValue(BeatBoxer.nowPlaying.get(BeatBoxer.currentIndex).getGenre());
+            }
             if (new Show().ShowAllTracks().size() == 0 || BeatBoxer.nowPlaying.size() == 0) {
                 refresh();
             }