full feature jukebox

MyRobotLab · Apr 26, 2024 · f11717e · f11717e
1 parent 63da898
commit f11717e
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 11 deletions.
diff --git a/src/main/java/org/myrobotlab/audio/PlaylistPlayer.java b/src/main/java/org/myrobotlab/audio/PlaylistPlayer.java
@@ -25,8 +25,7 @@ public PlaylistPlayer(AudioFile audioFile) {
   }
 
   @Override
-  public void run() {
-
+  public void run() {    
     while (!done) {
 
       List<String> list = playlist;
@@ -54,9 +53,24 @@ private List<String> shuffle(List<String> list) {
 
   public synchronized void stop() {
     done = true;
+    audioFile.stop();
+    if (player != null) {
+      player.interrupt();
+    }
+  }
+
+  public synchronized void skip() {
+    if (player != null) {
+      audioFile.stop();
+    }
   }
 
+
   public synchronized void start(List<String> playlist, boolean shuffle, boolean repeat, String track) {
+
+    audioFile.getConfig().repeat = repeat;
+    audioFile.getConfig().shuffle = shuffle;
+
     if (player != null) {
       audioFile.warn("playlist player already playing a list - stop before starting a new playlist");
       return;

diff --git a/src/main/java/org/myrobotlab/service/AudioFile.java b/src/main/java/org/myrobotlab/service/AudioFile.java
@@ -167,6 +167,7 @@ public void stopService() {
       p.stopPlaying();
       p.interrupt();
     }
+    playlistPlayer.stop();
   }
 
   public AudioData play(String filename) {
@@ -531,6 +532,9 @@ public void stopPlaylist() {
     playlistPlayer.stop();
   }
 
+  public void skip() {
+    playlistPlayer.skip();
+  }
 
   public double publishPeak(double peak) {
     log.debug("publishPeak {}", peak);

diff --git a/src/main/java/org/myrobotlab/service/config/AudioFileConfig.java b/src/main/java/org/myrobotlab/service/config/AudioFileConfig.java
@@ -12,6 +12,16 @@ public class AudioFileConfig extends ServiceConfig {
 
   public String currentPlaylist = "default";
 
+  /**
+   * randomly shuffles a play list
+   */
+  public boolean shuffle = false;
+
+  /**
+   * repeats a playlist
+   */
+  public boolean repeat = false;
+
   @Deprecated /* temporal variable */
   public String currentTrack = null;  
 

diff --git a/src/main/resources/resource/WebGui/app/service/js/AudioFileGui.js b/src/main/resources/resource/WebGui/app/service/js/AudioFileGui.js
@@ -4,6 +4,7 @@ angular.module('mrlapp.service.AudioFileGui', []).controller('AudioFileGuiCtrl',
     var msg = this.msg
     $scope.peak = 0
     $scope.peakMax = 0
+    var firstUpdate = true
 
     // playing paused stopped
     $scope.activity = null
@@ -19,26 +20,35 @@ angular.module('mrlapp.service.AudioFileGui', []).controller('AudioFileGuiCtrl',
 
     $scope.startPlaylist = function() {
         if ($scope.selectedPlaylist) {
-            msg.send('startPlaylist', $scope.selectedPlaylist)
+            msg.send('startPlaylist', $scope.selectedPlaylist, $scope.service.config.shuffle, $scope.service.config.repeat)
         } else {
             msg.send('startPlaylist')
         }
+    } 
+    $scope.skip = function() {
+            msg.send('skip')
     }
 
     $scope.stopPlaylist = function() {
-        if ($scope.selectedPlaylist) {
-            msg.send('stopPlaylist', $scope.selectedPlaylist)
-            msg.send('stop')
-        } else {
             msg.send('stopPlaylist')
             msg.send('stop')
-        }
+    }
+
+    $scope.setPlaylist = function(name){
+        console.info('setPlaylist ' + name)
+        msg.send('setPlaylist', name)
     }
 
     // GOOD TEMPLATE TO FOLLOW
     this.updateState = function(service) {
         $scope.service = service
         $scope.service.loudness = 20
+
+        if (firstUpdate){
+            $scope.selectedPlaylist = $scope.service.config.currentPlaylist
+            firstUpdate = false
+        }
+
         if (!$scope.selectedFile) {
 
             if (service.lastPlayed) {

diff --git a/src/main/resources/resource/WebGui/app/service/views/AudioFileGui.html b/src/main/resources/resource/WebGui/app/service/views/AudioFileGui.html
@@ -1,3 +1,10 @@
+    <style>
+        .active-toggle {
+            background-color: #286090; /* Blue color for active state */
+            color: white;
+        }
+    </style>
+
 <div class="col-md-6">
     <table border="1" class="table table-hover table-condensed table-striped table-bordered">
         <tr>
@@ -81,15 +88,27 @@
                     <label>select playlist:</label>
                     {{selectedPlaylist}}
 
-                    <select size="8" class="form-control vertical-menu" ng-change="msg.send('setPlaylist', name)" ng-model="selectedPlaylist" id="service.config.playlists" title="select your playlist">
+                    <select size="8" class="form-control vertical-menu" ng-change="setPlaylist(selectedPlaylist)" ng-model="selectedPlaylist" id="service.config.playlists" title="select your playlist">
                         <option ng-repeat="(name, fileset) in service.config.playlists" ng-value="{{name}}">{{name}}</option>
                     </select>
                 </div>
                 <button class="btn btn-default" ng-click="startPlaylist()">
-                    <span class="glyphicon glyphicon-play" title="play list"/>
+                    <span class="glyphicon glyphicon-play" title="Start Play List"/>
                 </button>
                 <button class="btn btn-default" ng-click="stopPlaylist()">
-                    <span class="glyphicon glyphicon-stop" title="stop play list"/>
+                    <span class="glyphicon glyphicon-stop" title="Stop Play List"/>
+                </button>
+
+                <button class="btn btn-default" title="Skip" ng-click="skip()">
+                    <span class="glyphicon glyphicon-forward"></span>
+                </button>                
+                <button class="btn btn-default" ng-click="service.config.shuffle = !service.config.shuffle" 
+                        ng-class="{'active-toggle': service.config.shuffle}">
+                    <span class="glyphicon glyphicon-random" title="Shuffle Playlist"></span> 
+                </button>
+                <button class="btn btn-default" ng-click="service.config.repeat = !service.config.repeat"
+                        ng-class="{'active-toggle': service.config.repeat}">
+                    <span class="glyphicon glyphicon-refresh" title="Repeat Playlist"></span>
                 </button>
                 <div ng-show="service.config.playlists" class="form-group">
                     <label>select file:</label>