Merge pull request #234 from tobexyz/feat/issue225

Feat/issue225

Author: tobexyz

yaacc/src/main/java/de/yaacc/Yaacc.java

@@ -71,6 +71,7 @@ public void onCreate() {
         super.onCreate();
         YaaccLogger.initialize(this);
         createNotificationChannel();
+        PreferenceManager.setDefaultValues(this, R.xml.preference, false);
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
         boolean darkMode = preferences.getBoolean(getString(R.string.settings_dark_mode_key), true);
         if (darkMode) {

yaacc/src/main/java/de/yaacc/player/LocalMediaSessionPlayer.java

@@ -55,6 +55,7 @@ public class LocalMediaSessionPlayer extends AbstractPlayer {
     private URI albumArtUri;
     private PlayableItem pendingItem; // Queue item if service not ready
     private int pendingIndex;
+    private volatile boolean pendingPlay;
 
     public LocalMediaSessionPlayer(UpnpClient upnpClient, String name, String shortName) {
         this(upnpClient);
@@ -180,9 +181,15 @@ public void onServiceConnected(ComponentName className, IBinder binder) {
             if (pendingItem != null) {
                 YaaccLogger.d(getClass().getName(), "Playing pending item: " + pendingItem.getTitle());
                 PlayableItem item = pendingItem;
-                startItem(item, null, pendingIndex);
+                int idx = pendingIndex;
                 pendingItem = null;
                 pendingIndex = -1;
+                pendingPlay = false;
+                startItem(item, null, idx);
+            } else if (pendingPlay) {
+                YaaccLogger.d(getClass().getName(), "Pending play flag set, calling play()");
+                pendingPlay = false;
+                play();
             }
         }
     }
@@ -240,6 +247,7 @@ protected void startItem(PlayableItem playableItem, Object loadedItem, int index
             YaaccLogger.w(getClass().getName(), "ExoPlayer not ready, queuing item");
             pendingItem = playableItem;
             pendingIndex = index;
+            pendingPlay = true;
             return;
         }
 

yaacc/src/main/java/de/yaacc/upnp/server/YaaccUpnpServerService.java

@@ -682,6 +682,15 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
             SAFCacheManager.getInstance(getApplicationContext()).preloadSafDurations();
         }
 
+        // Notify content directory change when media-type serving preferences change
+        if (getApplicationContext().getString(R.string.settings_local_server_serve_images_chkbx).equals(key) ||
+                getApplicationContext().getString(R.string.settings_local_server_serve_video_chkbx).equals(key) ||
+                getApplicationContext().getString(R.string.settings_local_server_serve_music_chkbx).equals(key) ||
+                getApplicationContext().getString(R.string.settings_local_server_serve_saf_chkbx).equals(key)) {
+            YaaccLogger.d(this.getClass().getName(), "Media serving preference changed, recreating device");
+            createUpnpDevice();
+        }
+
         // Handle live streaming toggles (Android 10+)
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
             if (getApplicationContext().getString(R.string.settings_local_server_serve_system_audio_chkbx).equals(key)) {

yaacc/src/main/java/de/yaacc/upnp/server/avtransport/AvTransportMediaRendererPlaying.java

@@ -73,7 +73,20 @@ public void onEntry() {
                 || getTransport().getPositionInfo().getTrackURI().equals("")) {
             return;
         }
-        players = upnpClient.initializePlayers(getTransport());
+        // Try to get existing players if resuming from pause
+        players = upnpClient.getCurrentPlayers(getTransport());
+        boolean hasPausedPlayer = false;
+        if (players != null && !players.isEmpty()) {
+            for (Player player : players) {
+                if (player != null && player.isPaused()) {
+                    hasPausedPlayer = true;
+                    break;
+                }
+            }
+        }
+        if (!hasPausedPlayer) {
+            players = upnpClient.initializePlayers(getTransport());
+        }
         for (Player player : players) {
             player.play();
         }