Merge pull request #1092 from jellyfin/mac-artwork

Set player artwork on macos

Author: andrewrabert

resources/settings/settings_description.json

@@ -656,13 +656,12 @@
     ]
   },
   {
-    "section": "mpris",
+    "section": "albumart",
     "hidden": true,
-    "platforms": [ "linux" ],
     "values": [
       {
-        "value": "albumArtCacheSize",
-        "default": 52428800
+        "value": "cacheSize",
+        "default": 10485760
       }
     ]
   },

src/input/apple/InputAppleMediaKeys.h

@@ -21,6 +21,8 @@ private slots:
   void handlePositionUpdate(quint64 position);
   void handleUpdateDuration(qint64 duration);
   void handleUpdateMetaData(const QVariantMap& meta);
+  void handleAlbumArtReady(const QByteArray& imageData, const QString& mimeType);
+  void handleAlbumArtUnavailable();
 
 private:
   void* m_delegate;

src/input/apple/InputAppleMediaKeys.mm

@@ -3,10 +3,12 @@
 //
 
 #include "InputAppleMediaKeys.h"
+#include "player/AlbumArtProvider.h"
 #include <QDebug>
 
 #import <dlfcn.h>
 
+#import <AppKit/AppKit.h>
 #import <MediaPlayer/MediaPlayer.h>
 
 @interface MediaKeysDelegate : NSObject
@@ -98,6 +100,15 @@ -(MPRemoteCommandHandlerStatus)gotPlaybackPosition:(MPChangePlaybackPositionComm
   connect(&PlayerComponent::Get(), &PlayerComponent::onMetaData, this,
           &InputAppleMediaKeys::handleUpdateMetaData);
 
+  // Connect to AlbumArtProvider signals
+  if (PlayerComponent::Get().albumArtProvider())
+  {
+    connect(PlayerComponent::Get().albumArtProvider(), &AlbumArtProvider::artworkReady,
+            this, &InputAppleMediaKeys::handleAlbumArtReady);
+    connect(PlayerComponent::Get().albumArtProvider(), &AlbumArtProvider::artworkUnavailable,
+            this, &InputAppleMediaKeys::handleAlbumArtUnavailable);
+  }
+
   if (auto lib =
       dlopen("/System/Library/PrivateFrameworks/MediaRemote.framework/MediaRemote", RTLD_NOW))
   {
@@ -207,3 +218,36 @@ static MPNowPlayingPlaybackState convertState(PlayerComponent::State newState)
 
   MPNowPlayingInfoCenter.defaultCenter.nowPlayingInfo = info;
 }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void InputAppleMediaKeys::handleAlbumArtReady(const QByteArray& imageData, const QString& mimeType)
+{
+  // Convert QByteArray to NSData
+  NSData *nsImageData = [NSData dataWithBytes:imageData.constData() length:imageData.size()];
+
+  // Create NSImage from the data
+  NSImage *nsImage = [[NSImage alloc] initWithData:nsImageData];
+  if (!nsImage)
+  {
+    qDebug() << "AppleMediaKeys: Failed to create NSImage from album art data";
+    return;
+  }
+
+  // Create MPMediaItemArtwork from NSImage
+  MPMediaItemArtwork *artwork = [[MPMediaItemArtwork alloc] initWithBoundsSize:nsImage.size
+                                                                 requestHandler:^NSImage * _Nonnull(CGSize size) {
+    return nsImage;
+  }];
+
+  // Update now playing info with artwork
+  auto info = [NSMutableDictionary
+  dictionaryWithDictionary:MPNowPlayingInfoCenter.defaultCenter.nowPlayingInfo];
+  info[MPMediaItemPropertyArtwork] = artwork;
+  MPNowPlayingInfoCenter.defaultCenter.nowPlayingInfo = info;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void InputAppleMediaKeys::handleAlbumArtUnavailable()
+{
+  // No action needed - metadata remains without artwork
+}

src/main.cpp

@@ -20,7 +20,6 @@
 #include <QDebug>
 #include "Paths.h"
 #include "core/ProfileManager.h"
-#include "player/CodecsComponent.h"
 #include "player/PlayerComponent.h"
 #include "player/OpenGLDetect.h"
 #include "display/DisplayComponent.h"
@@ -493,8 +492,6 @@ int main(int argc, char *argv[])
 
     qInfo() << "Config directory:" << qPrintable(ProfileManager::activeProfile().dataDir());
 
-    Codecs::preinitCodecs();
-
     Log::ApplyConfigLogLevel();
 
     SettingsComponent::Get().setCommandLineValues(parser.optionNames());
@@ -592,7 +589,6 @@ int main(int argc, char *argv[])
     delete uniqueApp;
     Globals::EngineDestroy();
 
-    Codecs::Uninit();
     return ret;
   }
   catch (FatalException& e)
@@ -605,7 +601,6 @@ int main(int argc, char *argv[])
 
     errApp.exec();
 
-    Codecs::Uninit();
     return 1;
   }
 }