Browse Source

macosx: Remove VLCPlaylistImageCache, which duplicates VLCLibraryImageCache and is no longer used

Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
pull/143/head
Claudio Cambra 4 years ago
committed by Steve Lhomme
parent
commit
16668b0823
  1. 6
      extras/package/macosx/VLC.xcodeproj/project.pbxproj
  2. 2
      modules/gui/macosx/Makefile.am
  3. 34
      modules/gui/macosx/playlist/VLCPlaylistImageCache.h
  4. 82
      modules/gui/macosx/playlist/VLCPlaylistImageCache.m
  5. 2
      po/POTFILES.in

6
extras/package/macosx/VLC.xcodeproj/project.pbxproj

@ -186,7 +186,6 @@
7DB7F20920CC07FD00C2CAED /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DB7F20820CC07FD00C2CAED /* WebKit.framework */; };
7DB7F20B20CC082800C2CAED /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DB7F20A20CC082800C2CAED /* QuartzCore.framework */; };
7DBB7639227F3FBC002649E1 /* VLCLibraryCollectionViewSupplementaryElementView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DBB7638227F3FBC002649E1 /* VLCLibraryCollectionViewSupplementaryElementView.m */; };
7DBFDD4723DE1FBB00722E3D /* VLCPlaylistImageCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DBFDD4623DE1FBB00722E3D /* VLCPlaylistImageCache.m */; };
7DC21A7422049A6600F98A02 /* VLCOpenInputMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DC21A7322049A6600F98A02 /* VLCOpenInputMetadata.m */; };
7DD2F5C52081B73B007EE187 /* VLCRemoteControlService.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DD2F5C42081B73B007EE187 /* VLCRemoteControlService.m */; };
7DE2F0442282C84A0040DD0A /* VLCLibraryAudioDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DE2F0432282C84A0040DD0A /* VLCLibraryAudioDataSource.m */; };
@ -656,8 +655,6 @@
7DBB06631CC2314D004C74D2 /* caopengllayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = caopengllayer.m; path = ../../../modules/video_output/caopengllayer.m; sourceTree = "<group>"; };
7DBB7637227F3FBC002649E1 /* VLCLibraryCollectionViewSupplementaryElementView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryCollectionViewSupplementaryElementView.h; sourceTree = "<group>"; };
7DBB7638227F3FBC002649E1 /* VLCLibraryCollectionViewSupplementaryElementView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryCollectionViewSupplementaryElementView.m; sourceTree = "<group>"; };
7DBFDD4523DE1FBB00722E3D /* VLCPlaylistImageCache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlaylistImageCache.h; sourceTree = "<group>"; };
7DBFDD4623DE1FBB00722E3D /* VLCPlaylistImageCache.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlaylistImageCache.m; sourceTree = "<group>"; };
7DC21A7222049A6600F98A02 /* VLCOpenInputMetadata.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCOpenInputMetadata.h; sourceTree = "<group>"; };
7DC21A7322049A6600F98A02 /* VLCOpenInputMetadata.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCOpenInputMetadata.m; sourceTree = "<group>"; };
7DD2F5C32081B73B007EE187 /* VLCRemoteControlService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCRemoteControlService.h; sourceTree = "<group>"; };
@ -1199,8 +1196,6 @@
7D0F640B2202163E00FDB91F /* VLCPlaylistDataSource.m */,
7D445D822202524D00263D34 /* VLCPlaylistItem.h */,
7D445D832202524D00263D34 /* VLCPlaylistItem.m */,
7DBFDD4523DE1FBB00722E3D /* VLCPlaylistImageCache.h */,
7DBFDD4623DE1FBB00722E3D /* VLCPlaylistImageCache.m */,
7D445D8C2203375100263D34 /* VLCPlaylistMenuController.h */,
7D445D8D2203375100263D34 /* VLCPlaylistMenuController.m */,
7D1BF28B22A192000027C50F /* VLCPlaylistSortingMenuController.h */,
@ -1924,7 +1919,6 @@
7D404ABF2281892C00B28EF4 /* NSView+VLCAdditions.m in Sources */,
7DE9C7DD220728420089108F /* VLCPlayerController.m in Sources */,
536283F4291146BC00640C15 /* VLCLibraryCollectionViewMediaItemSupplementaryDetailView.m in Sources */,
7DBFDD4723DE1FBB00722E3D /* VLCPlaylistImageCache.m in Sources */,
7D93D8FC2316C2DC001C0063 /* VLCCustomCropArWindowController.m in Sources */,
1C3113941E508C6900D4DD76 /* VLCAddonsWindowController.m in Sources */,
7D92AF2123DDCA8D00D81EA3 /* VLCLibraryImageCache.m in Sources */,

2
modules/gui/macosx/Makefile.am

@ -211,8 +211,6 @@ libmacosx_plugin_la_SOURCES = \
gui/macosx/playlist/VLCPlaylistController.m \
gui/macosx/playlist/VLCPlaylistDataSource.h \
gui/macosx/playlist/VLCPlaylistDataSource.m \
gui/macosx/playlist/VLCPlaylistImageCache.h \
gui/macosx/playlist/VLCPlaylistImageCache.m \
gui/macosx/playlist/VLCPlaylistItem.h \
gui/macosx/playlist/VLCPlaylistItem.m \
gui/macosx/playlist/VLCPlaylistMenuController.h \

34
modules/gui/macosx/playlist/VLCPlaylistImageCache.h

@ -1,34 +0,0 @@
/*****************************************************************************
* VLCPlaylistImageCache.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2020 VLC authors and VideoLAN
*
* Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import <vlc_playlist.h>
NS_ASSUME_NONNULL_BEGIN
@interface VLCPlaylistImageCache : NSObject
+ (nullable NSImage *)artworkForPlaylistItemWithURL:(NSURL *)artworkURL;
@end
NS_ASSUME_NONNULL_END

82
modules/gui/macosx/playlist/VLCPlaylistImageCache.m

@ -1,82 +0,0 @@
/*****************************************************************************
* VLCPlaylistImageCache.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2020 VLC authors and VideoLAN
*
* Authors: Felix Paul Kühne <fkuehne # videolan -dot- org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import "VLCPlaylistImageCache.h"
#import "extensions/NSString+Helpers.h"
#import <vlc_input.h>
#import <vlc_url.h>
NSUInteger kVLCMaximumPlaylistImageCacheSize = 100;
@interface VLCPlaylistImageCache()
{
NSCache *_imageCache;
}
@end
@implementation VLCPlaylistImageCache
- (instancetype)init
{
self = [super init];
if (self) {
_imageCache = [[NSCache alloc] init];
_imageCache.countLimit = kVLCMaximumPlaylistImageCacheSize;
}
return self;
}
+ (instancetype)sharedImageCache
{
static dispatch_once_t onceToken;
static VLCPlaylistImageCache *sharedImageCache;
dispatch_once(&onceToken, ^{
sharedImageCache = [[VLCPlaylistImageCache alloc] init];
});
return sharedImageCache;
}
+ (NSImage *)artworkForPlaylistItemWithURL:(NSURL *)artworkURL
{
return [[VLCPlaylistImageCache sharedImageCache] imageForPlaylistItemWithArtworkURL:artworkURL];
}
- (NSImage *)imageForPlaylistItemWithArtworkURL:(NSURL *)artworkURL
{
if (artworkURL == nil) {
return nil;
}
NSImage *artwork = [_imageCache objectForKey:artworkURL];
if (artwork) {
return artwork;
}
artwork = [[NSImage alloc] initWithContentsOfURL:artworkURL];
if (artwork) {
[_imageCache setObject:artwork forKey:artworkURL];
}
return artwork;
}
@end

2
po/POTFILES.in

@ -559,8 +559,6 @@ modules/gui/macosx/playlist/VLCPlaylistController.h
modules/gui/macosx/playlist/VLCPlaylistController.m
modules/gui/macosx/playlist/VLCPlaylistDataSource.h
modules/gui/macosx/playlist/VLCPlaylistDataSource.m
modules/gui/macosx/playlist/VLCPlaylistImageCache.h
modules/gui/macosx/playlist/VLCPlaylistImageCache.m
modules/gui/macosx/playlist/VLCPlaylistItem.h
modules/gui/macosx/playlist/VLCPlaylistItem.m
modules/gui/macosx/playlist/VLCPlaylistMenuController.h

Loading…
Cancel
Save