macosx: fix compilation broken in 5961eeaa

modules/gui/macosx/library/VLCLibraryAlbumTableCellView.m

@@ -159,9 +159,9 @@ const CGFloat VLCLibraryTracksRowHeight = 50.;
     VLCMediaLibraryMediaItem *mediaItem = _tracks[row];
 
     NSImage *image;
-    if (mediaItem.artworkGenerated) {
-        if (mediaItem.artworkMRL.length > 0) {
-            image = [[NSImage alloc] initWithContentsOfURL:[NSURL URLWithString:mediaItem.artworkMRL]];
+    if (mediaItem.smallArtworkGenerated) {
+        if (mediaItem.smallArtworkMRL.length > 0) {
+            image = [[NSImage alloc] initWithContentsOfURL:[NSURL URLWithString:mediaItem.smallArtworkMRL]];
         }
     }
     if (!image) {

modules/gui/macosx/library/VLCLibraryAudioDataSource.m

@@ -156,9 +156,9 @@ static NSString *VLCAudioLibraryCellIdentifier = @"VLCAudioLibraryCellIdentifier
             VLCMediaLibraryMediaItem *mediaItem = listOfAudioMedia[row];
 
             NSImage *image;
-            if (mediaItem.artworkGenerated) {
-                if (mediaItem.artworkMRL.length > 0) {
-                    image = [[NSImage alloc] initWithContentsOfURL:[NSURL URLWithString:mediaItem.artworkMRL]];
+            if (mediaItem.smallArtworkGenerated) {
+                if (mediaItem.smallArtworkMRL.length > 0) {
+                    image = [[NSImage alloc] initWithContentsOfURL:[NSURL URLWithString:mediaItem.smallArtworkMRL]];
                 }
             }
             if (!image) {

modules/gui/macosx/library/VLCLibraryCollectionViewItem.m

@@ -186,8 +186,8 @@ const CGFloat VLCLibraryCollectionViewItemMaximumDisplayedProgress = 0.95;
 - (NSImage *)imageForMedia
 {
     NSImage *image;
-    if (_representedMediaItem.artworkGenerated) {
-        image = [[NSImage alloc] initWithContentsOfURL:[NSURL URLWithString:_representedMediaItem.artworkMRL]];
+    if (_representedMediaItem.smallArtworkGenerated) {
+        image = [[NSImage alloc] initWithContentsOfURL:[NSURL URLWithString:_representedMediaItem.smallArtworkMRL]];
     } else {
         if (_representedMediaItem.mediaType != VLC_ML_MEDIA_TYPE_AUDIO) {
             [_libraryController attemptToGenerateThumbnailForMediaItem:_representedMediaItem];

modules/gui/macosx/library/VLCLibraryController.m

@@ -30,6 +30,10 @@
 
 #import <vlc_media_library.h>
 
+uint32_t kVLCDesiredThumbnailWidth = 512;
+uint32_t kVLCDesiredThumbnailHeight = 320;
+float kVLCDefaultThumbnailPosition = .15;
+
 @interface VLCLibraryController()
 {
     vlc_medialibrary_t *_p_libraryInstance;
@@ -125,7 +129,12 @@
 
 - (int)attemptToGenerateThumbnailForMediaItem:(VLCMediaLibraryMediaItem *)mediaItem
 {
-    return vlc_ml_media_generate_thumbnail(_p_libraryInstance, mediaItem.libraryID);
+    return vlc_ml_media_generate_thumbnail(_p_libraryInstance,
+                                           mediaItem.libraryID,
+                                           VLC_ML_THUMBNAIL_SMALL,
+                                           kVLCDesiredThumbnailWidth,
+                                           kVLCDesiredThumbnailHeight,
+                                           kVLCDefaultThumbnailPosition);
 }
 
 #pragma mark - folder management

modules/gui/macosx/library/VLCLibraryDataTypes.h

@@ -161,9 +161,9 @@ extern const long long int VLCMediaLibraryMediaItemDurationDenominator;
 @property (readonly) time_t lastPlayedDate;
 @property (readonly) NSString *title;
 
-@property (readonly) NSString *artworkMRL;
+@property (readonly) NSString *smallArtworkMRL;
 
-@property (readonly) BOOL artworkGenerated;
+@property (readonly) BOOL smallArtworkGenerated;
 @property (readonly) BOOL favorited;
 
 @property (readonly, nullable) VLCMediaLibraryShowEpisode *showEpisode;

modules/gui/macosx/library/VLCLibraryDataTypes.m

@@ -137,7 +137,7 @@ const long long int VLCMediaLibraryMediaItemDurationDenominator = 1000;
         _artistID = p_artist->i_id;
         _name = toNSStr(p_artist->psz_name);
         _shortBiography = toNSStr(p_artist->psz_shortbio);
-        _artworkMRL = toNSStr(p_artist->psz_artwork_mrl);
+        _artworkMRL = toNSStr(p_artist->thumbnails[VLC_ML_THUMBNAIL_SMALL].psz_mrl);
         _musicBrainzID = toNSStr(p_artist->psz_mb_id);
         _numberOfAlbums = p_artist->i_nb_album;
         _numberOfTracks = p_artist->i_nb_tracks;
@@ -156,7 +156,7 @@ const long long int VLCMediaLibraryMediaItemDurationDenominator = 1000;
         _albumID = p_album->i_id;
         _title = toNSStr(p_album->psz_title);
         _summary = toNSStr(p_album->psz_summary);
-        _artworkMRL = toNSStr(p_album->psz_artwork_mrl);
+        _artworkMRL = toNSStr(p_album->thumbnails[VLC_ML_THUMBNAIL_SMALL].psz_mrl);
         _artistName = toNSStr(p_album->psz_artist);
         _artistID = p_album->i_artist_id;
         _numberOfTracks = p_album->i_nb_tracks;
@@ -273,8 +273,8 @@ const long long int VLCMediaLibraryMediaItemDurationDenominator = 1000;
         _playCount = p_mediaItem->i_playcount;
         _lastPlayedDate = p_mediaItem->i_last_played_date;
         _title = toNSStr(p_mediaItem->psz_title);
-        _artworkMRL = toNSStr(p_mediaItem->psz_artwork_mrl);
-        _artworkGenerated = p_mediaItem->b_artwork_generated;
+        _smallArtworkMRL = toNSStr(p_mediaItem->thumbnails[VLC_ML_THUMBNAIL_SMALL].psz_mrl);
+        _smallArtworkGenerated = p_mediaItem->thumbnails[VLC_ML_THUMBNAIL_SMALL].b_generated;
         _favorited = p_mediaItem->b_is_favorite;
 
         switch (p_mediaItem->i_subtype) {
@@ -300,7 +300,7 @@ const long long int VLCMediaLibraryMediaItemDurationDenominator = 1000;
 - (NSString *)description
 {
     return [NSString stringWithFormat:@"%@ — title: %@, ID: %lli, type: %i, artwork: %@",
-            NSStringFromClass([self class]), _title, _libraryID, _mediaType, _artworkMRL];
+            NSStringFromClass([self class]), _title, _libraryID, _mediaType, _smallArtworkMRL];
 }
 
 #pragma mark - preference setters / getters