Packman Build Service PMBS

_service:obs_scm:vlc-beta-20260329.b7a5b6051.obscpio/modules/access/dshow/filter.cpp -> _service:obs_scm:vlc-beta-20260331.610176541.obscpio/modules/access/dshow/filter.cpp Changed

_service:obs_scm:vlc-beta-20260329.b7a5b6051.obscpio/modules/demux/avi/avi.c -> _service:obs_scm:vlc-beta-20260331.610176541.obscpio/modules/demux/avi/avi.c Changed

_service:obs_scm:vlc-beta-20260329.b7a5b6051.obscpio/modules/demux/mpeg/ts.c -> _service:obs_scm:vlc-beta-20260331.610176541.obscpio/modules/demux/mpeg/ts.c Changed

_service:obs_scm:vlc-beta-20260329.b7a5b6051.obscpio/modules/gui/macosx/extensions/NSString+Helpers.h -> _service:obs_scm:vlc-beta-20260331.610176541.obscpio/modules/gui/macosx/extensions/NSString+Helpers.h Changed

_service:obs_scm:vlc-beta-20260329.b7a5b6051.obscpio/modules/gui/macosx/library/VLCLibraryDataTypes.m -> _service:obs_scm:vlc-beta-20260331.610176541.obscpio/modules/gui/macosx/library/VLCLibraryDataTypes.m Changed

@@ -524,19 +524,9 @@
 
 - (NSString *)durationString
 {
-    NSString *countMetadataString;
-    if (_numberOfAlbums > 1) {
-        countMetadataString = NSString stringWithFormat:_NS("%u albums"), _numberOfAlbums;
-    } else {
-        countMetadataString = _NS("1 album");
-    }
-    if (_numberOfTracks > 1) {
-        countMetadataString = countMetadataString stringByAppendingFormat:@", %@", NSString stringWithFormat:_NS("%u songs"), _numberOfTracks;
-    } else {
-        countMetadataString = countMetadataString stringByAppendingFormat:@", %@", _NS("1 song");
-    }
-
-    return countMetadataString;
+    NSString * const albumString = _NPS("%u album", "%u albums", _numberOfAlbums);
+    NSString * const songString = _NPS("%u song", "%u songs", _numberOfTracks);
+    return NSString stringWithFormat:@"%@, %@", albumString, songString;
 }
 
 - (NSString *)genreString
@@ -766,11 +756,7 @@
 
 - (NSString *)durationString
 {
-    if (_numberOfTracks > 1) {
-        return NSString stringWithFormat:_NS("%u songs"), _numberOfTracks;
-    } else {
-        return _NS("1 song");
-    }
+    return _NPS("%u song", "%u songs", _numberOfTracks);
 }
 
 - (NSArray<VLCMediaLibraryAlbum *> *)albums
@@ -1766,8 +1752,9 @@
         self.smallArtworkMRL = p_show->psz_artwork_mrl ? toNSStr(p_show->psz_artwork_mrl) : @"";
         self.smallArtworkGenerated = self.smallArtworkMRL.length > 0;
         self.displayString = self.name;
-        self.primaryDetailString = 
-            NSString stringWithFormat:_NS("%u seasons, %u episodes"), _seasonCount, _episodeCount;
+        NSString * const seasonString = _NPS("%u season", "%u seasons", _seasonCount);
+        NSString * const episodeString = _NPS("%u episode", "%u episodes", _episodeCount);
+        self.primaryDetailString = NSString stringWithFormat:@"%@, %@", seasonString, episodeString;
         self.secondaryDetailString = NSString stringWithFormat:_NS("Released in %u"), _releaseYear;
         self.durationString = self.secondaryDetailString;
     }
@@ -1896,12 +1883,7 @@
                       withMediaItems:(NSArray<VLCMediaLibraryMediaItem *> *)mediaItems
 {
 
-    NSString *detailString;
-    if (mediaItems.count == 1) {
-        detailString = _NS("1 item");
-    } else {
-        detailString = NSString stringWithFormat:_NS("%lu items"), (unsigned long)mediaItems.count;
-    }
+    NSString * const detailString = _NPS("%lu item", "%lu items", (unsigned long)mediaItems.count);
 
     self = self initWithDisplayString:displayString
                withPrimaryDetailString:detailString

_service:obs_scm:vlc-beta-20260329.b7a5b6051.obscpio/modules/gui/macosx/library/audio-library/VLCLibraryAllAudioGroupsMediaLibraryItem.m -> _service:obs_scm:vlc-beta-20260331.610176541.obscpio/modules/gui/macosx/library/audio-library/VLCLibraryAllAudioGroupsMediaLibraryItem.m Changed

_service:obs_scm:vlc-beta.obsinfo Changed

Changes of Revision 307