diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index 2cacc3b0030cf1ce1cc73ae6974a5f97291919d7..bde06554ef1c9eb0d52d2c75b0d72ec94273ae7c 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -107,6 +107,7 @@
7D20081A2289835C002679DF /* VLCTrackingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D2008192289835C002679DF /* VLCTrackingView.m */; };
7D22A8F422BC14F80063ECD2 /* VLCLibrarySortingMenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D22A8F322BC14F80063ECD2 /* VLCLibrarySortingMenuController.m */; };
7D2554C222C8A39300F2D9C2 /* VLCMediaSourceDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D2554C122C8A39300F2D9C2 /* VLCMediaSourceDataSource.m */; };
+ 7D2554C522C8E8B500F2D9C2 /* VLCMediaSourceDeviceCollectionViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D2554C322C8E8B400F2D9C2 /* VLCMediaSourceDeviceCollectionViewItem.m */; };
7D28E6362275B4820098D30E /* NSColor+VLCAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D28E6352275B4820098D30E /* NSColor+VLCAdditions.m */; };
7D28E6392275B7340098D30E /* NSFont+VLCAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D28E6382275B7340098D30E /* NSFont+VLCAdditions.m */; };
7D2E0EDB20CD204D0033A221 /* VLCWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D2E0ED920CD204D0033A221 /* VLCWindow.m */; };
@@ -163,7 +164,6 @@
7DE7E72F228C795B00D6EA38 /* VLCLibraryAlternativeAudioViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DE7E72E228C795B00D6EA38 /* VLCLibraryAlternativeAudioViewController.m */; };
7DE82E7922843781002D341A /* VLCLibraryAlbumTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DE82E7822843781002D341A /* VLCLibraryAlbumTableCellView.m */; };
7DE9C7DD220728420089108F /* VLCPlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DE9C7DC220728420089108F /* VLCPlayerController.m */; };
- 7DF14FBD2270CB1C0008ABE4 /* VLCMediaSourceCollectionViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DF14FBB2270CB1C0008ABE4 /* VLCMediaSourceCollectionViewItem.m */; };
7DFBDCA82269E77500B700A5 /* VLCLibraryController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DFBDCA72269E77500B700A5 /* VLCLibraryController.m */; };
7DFBDCAB2269E77F00B700A5 /* VLCLibraryModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DFBDCAA2269E77F00B700A5 /* VLCLibraryModel.m */; };
7DFBDCAE2269ED0C00B700A5 /* VLCLibraryVideoDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DFBDCAD2269ED0C00B700A5 /* VLCLibraryVideoDataSource.m */; };
@@ -463,6 +463,8 @@
7D22A8F322BC14F80063ECD2 /* VLCLibrarySortingMenuController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibrarySortingMenuController.m; sourceTree = "<group>"; };
7D2554C022C8A39300F2D9C2 /* VLCMediaSourceDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCMediaSourceDataSource.h; sourceTree = "<group>"; };
7D2554C122C8A39300F2D9C2 /* VLCMediaSourceDataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCMediaSourceDataSource.m; sourceTree = "<group>"; };
+ 7D2554C322C8E8B400F2D9C2 /* VLCMediaSourceDeviceCollectionViewItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCMediaSourceDeviceCollectionViewItem.m; sourceTree = "<group>"; };
+ 7D2554C422C8E8B500F2D9C2 /* VLCMediaSourceDeviceCollectionViewItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCMediaSourceDeviceCollectionViewItem.h; sourceTree = "<group>"; };
7D28E6342275B4820098D30E /* NSColor+VLCAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSColor+VLCAdditions.h"; sourceTree = "<group>"; };
7D28E6352275B4820098D30E /* NSColor+VLCAdditions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSColor+VLCAdditions.m"; sourceTree = "<group>"; };
7D28E6372275B7340098D30E /* NSFont+VLCAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSFont+VLCAdditions.h"; sourceTree = "<group>"; };
@@ -568,9 +570,7 @@
7DE9C7DC220728420089108F /* VLCPlayerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCPlayerController.m; sourceTree = "<group>"; };
7DF0435E1972E26A0022B534 /* VLCAddonListItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCAddonListItem.h; sourceTree = "<group>"; };
7DF0435F1972E26A0022B534 /* VLCAddonListItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCAddonListItem.m; sourceTree = "<group>"; };
- 7DF14FBA2270CB1C0008ABE4 /* VLCMediaSourceCollectionViewItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCMediaSourceCollectionViewItem.h; sourceTree = "<group>"; };
- 7DF14FBB2270CB1C0008ABE4 /* VLCMediaSourceCollectionViewItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCMediaSourceCollectionViewItem.m; sourceTree = "<group>"; };
- 7DF14FBC2270CB1C0008ABE4 /* VLCMediaSourceCollectionViewItem.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VLCMediaSourceCollectionViewItem.xib; sourceTree = "<group>"; };
+ 7DF14FBC2270CB1C0008ABE4 /* VLCMediaSourceDeviceCollectionViewItem.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VLCMediaSourceDeviceCollectionViewItem.xib; sourceTree = "<group>"; };
7DF812ED1B555A340052293C /* VLCPlaybackContinuityController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlaybackContinuityController.h; sourceTree = "<group>"; };
7DF812EE1B555A340052293C /* VLCPlaybackContinuityController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCPlaybackContinuityController.m; sourceTree = "<group>"; };
7DF812EF1B555C8E0052293C /* VLCKeyboardBacklightControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCKeyboardBacklightControl.h; sourceTree = "<group>"; };
@@ -1423,8 +1423,8 @@
7DFBDCC3226E445500B700A5 /* VLCMediaSourceBaseDataSource.m */,
7D2554C022C8A39300F2D9C2 /* VLCMediaSourceDataSource.h */,
7D2554C122C8A39300F2D9C2 /* VLCMediaSourceDataSource.m */,
- 7DF14FBA2270CB1C0008ABE4 /* VLCMediaSourceCollectionViewItem.h */,
- 7DF14FBB2270CB1C0008ABE4 /* VLCMediaSourceCollectionViewItem.m */,
+ 7D2554C422C8E8B500F2D9C2 /* VLCMediaSourceDeviceCollectionViewItem.h */,
+ 7D2554C322C8E8B400F2D9C2 /* VLCMediaSourceDeviceCollectionViewItem.m */,
);
path = "media-source";
sourceTree = "<group>";
@@ -1535,7 +1535,7 @@
7D0F64052202047900FDB91F /* VLCLibraryCollectionViewItem.xib */,
7DE2F0482282D7980040DD0A /* VLCLibraryTableCellView.xib */,
7DE82E7A228437AA002D341A /* VLCLibraryAlbumTableCellView.xib */,
- 7DF14FBC2270CB1C0008ABE4 /* VLCMediaSourceCollectionViewItem.xib */,
+ 7DF14FBC2270CB1C0008ABE4 /* VLCMediaSourceDeviceCollectionViewItem.xib */,
6B82241A1E4D2A9000833BE1 /* VLCStatusBarIconMainMenu.xib */,
6B8224181E4D2A9000833BE1 /* VLCFullScreenPanel.xib */,
6B8223FE1E4D2A8F00833BE1 /* About.xib */,
@@ -1655,6 +1655,7 @@
1CCC88F22078A3D500E5626F /* AudioEffects.xib in Sources */,
1CCC88F32078A3D500E5626F /* VideoEffects.xib in Sources */,
1CCC88F42078A3D500E5626F /* Bookmarks.xib in Sources */,
+ 7D2554C522C8E8B500F2D9C2 /* VLCMediaSourceDeviceCollectionViewItem.m in Sources */,
1CCC88F52078A3D500E5626F /* SyncTracks.xib in Sources */,
1CCC88F62078A3D500E5626F /* MediaInfo.xib in Sources */,
7D66D4392200C5B80040D04A /* VLCVideoFilterHelper.m in Sources */,
@@ -1747,7 +1748,6 @@
1C3113C71E508C6900D4DD76 /* VLCOpenWindowController.m in Sources */,
7D0F64062202047900FDB91F /* VLCLibraryCollectionViewItem.m in Sources */,
7D713D322201AE350042BEB7 /* VLCLibraryWindow.m in Sources */,
- 7DF14FBD2270CB1C0008ABE4 /* VLCMediaSourceCollectionViewItem.m in Sources */,
7D22A8F422BC14F80063ECD2 /* VLCLibrarySortingMenuController.m in Sources */,
1C3113C91E508C6900D4DD76 /* VLCOutput.m in Sources */,
1C1C62011F8260A90052DD4F /* VLCWrappableTextField.m in Sources */,
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 8d901aeec0b7d7af44f41ee780fe67ae038afd86..953812c175e0a54a7b347ac9c7a8e57d0df83a21 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -91,10 +91,10 @@ libmacosx_plugin_la_SOURCES = \
gui/macosx/media-source/VLCMediaSource.m \
gui/macosx/media-source/VLCMediaSourceBaseDataSource.h \
gui/macosx/media-source/VLCMediaSourceBaseDataSource.m \
- gui/macosx/media-source/VLCMediaSourceCollectionViewItem.h \
- gui/macosx/media-source/VLCMediaSourceCollectionViewItem.m \
gui/macosx/media-source/VLCMediaSourceDataSource.h \
gui/macosx/media-source/VLCMediaSourceDataSource.m \
+ gui/macosx/media-source/VLCMediaSourceDeviceCollectionViewItem.h \
+ gui/macosx/media-source/VLCMediaSourceDeviceCollectionViewItem.m \
gui/macosx/media-source/VLCMediaSourceProvider.h \
gui/macosx/media-source/VLCMediaSourceProvider.m \
gui/macosx/menus/VLCMainMenu.h \
@@ -274,7 +274,7 @@ libmacosx_plugin_la_XIB_SOURCES = \
gui/macosx/UI/VLCLibraryTableCellView.xib \
gui/macosx/UI/VLCPlaylistTableCellView.xib \
gui/macosx/UI/VLCLibraryCollectionViewItem.xib \
- gui/macosx/UI/VLCMediaSourceCollectionViewItem.xib \
+ gui/macosx/UI/VLCMediaSourceDeviceCollectionViewItem.xib \
gui/macosx/UI/MediaInfo.xib \
gui/macosx/UI/Open.xib \
gui/macosx/UI/PlaylistAccessoryView.xib \
diff --git a/modules/gui/macosx/UI/VLCMediaSourceCollectionViewItem.xib b/modules/gui/macosx/UI/VLCMediaSourceDeviceCollectionViewItem.xib
similarity index 96%
rename from modules/gui/macosx/UI/VLCMediaSourceCollectionViewItem.xib
rename to modules/gui/macosx/UI/VLCMediaSourceDeviceCollectionViewItem.xib
index d7dfe13eb452e7cf3911cb9cbc93e967f7524e3b..1317c7ffad361ba9613f3ccbcadeac6166bb349e 100644
--- a/modules/gui/macosx/UI/VLCMediaSourceCollectionViewItem.xib
+++ b/modules/gui/macosx/UI/VLCMediaSourceDeviceCollectionViewItem.xib
@@ -5,7 +5,7 @@
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
- <customObject id="-2" userLabel="File's Owner" customClass="VLCMediaSourceCollectionViewItem">
+ <customObject id="-2" userLabel="File's Owner" customClass="VLCMediaSourceDeviceCollectionView">
<connections>
<outlet property="mediaImageView" destination="rko-Nc-j4c" id="4SM-TL-qbd"/>
<outlet property="titleTextField" destination="jJ3-BQ-y8F" id="YO5-1X-TIk"/>
@@ -28,7 +28,7 @@
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jJ3-BQ-y8F">
<rect key="frame" x="223" y="150" width="35" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="Utm-F6-CKx">
- <font key="font" metaFont="controlContent"/>
+ <font key="font" metaFont="cellTitle"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
diff --git a/modules/gui/macosx/media-source/VLCMediaSourceBaseDataSource.m b/modules/gui/macosx/media-source/VLCMediaSourceBaseDataSource.m
index 885d26626872e425d0cc84aaba8ad28d7b8240f0..47a73009fab1da2a7c83c50f9634d5040b0981c0 100644
--- a/modules/gui/macosx/media-source/VLCMediaSourceBaseDataSource.m
+++ b/modules/gui/macosx/media-source/VLCMediaSourceBaseDataSource.m
@@ -24,7 +24,7 @@
#import "media-source/VLCMediaSourceProvider.h"
#import "media-source/VLCMediaSource.h"
-#import "media-source/VLCMediaSourceCollectionViewItem.h"
+#import "media-source/VLCMediaSourceDeviceCollectionViewItem.h"
#import "media-source/VLCMediaSourceDataSource.h"
#import "main/VLCMain.h"
@@ -72,7 +72,7 @@
{
self.collectionView.dataSource = self;
self.collectionView.delegate = self;
- [self.collectionView registerClass:[VLCMediaSourceCollectionViewItem class] forItemWithIdentifier:VLCMediaSourceCellIdentifier];
+ [self.collectionView registerClass:[VLCMediaSourceDeviceCollectionViewItem class] forItemWithIdentifier:VLCMediaSourceDeviceCellIdentifier];
self.homeButton.action = @selector(homeButtonAction:);
self.homeButton.target = self;
@@ -110,7 +110,7 @@
- (NSCollectionViewItem *)collectionView:(NSCollectionView *)collectionView
itemForRepresentedObjectAtIndexPath:(NSIndexPath *)indexPath
{
- VLCMediaSourceCollectionViewItem *viewItem = [collectionView makeItemWithIdentifier:VLCMediaSourceCellIdentifier forIndexPath:indexPath];
+ VLCMediaSourceDeviceCollectionViewItem *viewItem = [collectionView makeItemWithIdentifier:VLCMediaSourceDeviceCellIdentifier forIndexPath:indexPath];
VLCMediaSource *mediaSource = _mediaSources[indexPath.section];
VLCInputNode *rootNode = mediaSource.rootNode;
diff --git a/modules/gui/macosx/media-source/VLCMediaSourceDataSource.m b/modules/gui/macosx/media-source/VLCMediaSourceDataSource.m
index 475efd47df18b0d6046e27c8b4493d3426738443..664af0434050ccb2b4964d6c763c487874ec643c 100644
--- a/modules/gui/macosx/media-source/VLCMediaSourceDataSource.m
+++ b/modules/gui/macosx/media-source/VLCMediaSourceDataSource.m
@@ -23,7 +23,7 @@
#import "VLCMediaSourceDataSource.h"
#import "library/VLCInputItem.h"
-#import "media-source/VLCMediaSourceCollectionViewItem.h"
+#import "media-source/VLCMediaSourceDeviceCollectionViewItem.h"
#import "media-source/VLCMediaSource.h"
#import "main/VLCMain.h"
#import "playlist/VLCPlaylistController.h"
@@ -65,7 +65,7 @@
- (NSCollectionViewItem *)collectionView:(NSCollectionView *)collectionView
itemForRepresentedObjectAtIndexPath:(NSIndexPath *)indexPath
{
- VLCMediaSourceCollectionViewItem *viewItem = [collectionView makeItemWithIdentifier:VLCMediaSourceCellIdentifier forIndexPath:indexPath];
+ VLCMediaSourceDeviceCollectionViewItem *viewItem = [collectionView makeItemWithIdentifier:VLCMediaSourceDeviceCellIdentifier forIndexPath:indexPath];
VLCInputNode *rootNode = _nodeToDisplay;
NSArray *nodeChildren = rootNode.children;
diff --git a/modules/gui/macosx/media-source/VLCMediaSourceCollectionViewItem.h b/modules/gui/macosx/media-source/VLCMediaSourceDeviceCollectionViewItem.h
similarity index 87%
rename from modules/gui/macosx/media-source/VLCMediaSourceCollectionViewItem.h
rename to modules/gui/macosx/media-source/VLCMediaSourceDeviceCollectionViewItem.h
index 0ff425171238ec9401010c85e458bad719324308..49e8896e2e66d7ff45c07c8ab6b44f370b431b3d 100644
--- a/modules/gui/macosx/media-source/VLCMediaSourceCollectionViewItem.h
+++ b/modules/gui/macosx/media-source/VLCMediaSourceDeviceCollectionViewItem.h
@@ -1,5 +1,5 @@
/*****************************************************************************
- * VLCMediaSourceCollectionViewItem.h: MacOS X interface module
+ * VLCMediaSourceDeviceCollectionView.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2019 VLC authors and VideoLAN
*
@@ -26,9 +26,9 @@ NS_ASSUME_NONNULL_BEGIN
@class VLCImageView;
-extern NSString *VLCMediaSourceCellIdentifier;
+extern NSString *VLCMediaSourceDeviceCellIdentifier;
-@interface VLCMediaSourceCollectionViewItem : NSCollectionViewItem
+@interface VLCMediaSourceDeviceCollectionViewItem : NSCollectionViewItem
@property (readwrite, assign) IBOutlet NSTextField *titleTextField;
@property (readwrite, assign) IBOutlet VLCImageView *mediaImageView;
diff --git a/modules/gui/macosx/media-source/VLCMediaSourceCollectionViewItem.m b/modules/gui/macosx/media-source/VLCMediaSourceDeviceCollectionViewItem.m
similarity index 79%
rename from modules/gui/macosx/media-source/VLCMediaSourceCollectionViewItem.m
rename to modules/gui/macosx/media-source/VLCMediaSourceDeviceCollectionViewItem.m
index 708fffb55ee3029c5651118c0defde584a68ca72..1c8f047c455898f9d2821b92101c5ec42795a498 100644
--- a/modules/gui/macosx/media-source/VLCMediaSourceCollectionViewItem.m
+++ b/modules/gui/macosx/media-source/VLCMediaSourceDeviceCollectionViewItem.m
@@ -1,5 +1,5 @@
/*****************************************************************************
- * VLCMediaSourceCollectionViewItem.m: MacOS X interface module
+ * VLCMediaSourceDeviceCollectionView.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2019 VLC authors and VideoLAN
*
@@ -20,16 +20,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#import "VLCMediaSourceCollectionViewItem.h"
+#import "VLCMediaSourceDeviceCollectionViewItem.h"
#import "views/VLCImageView.h"
-NSString *VLCMediaSourceCellIdentifier = @"VLCMediaSourceCellIdentifier";
+NSString *VLCMediaSourceDeviceCellIdentifier = @"VLCMediaSourceDeviceCellIdentifier";
-@interface VLCMediaSourceCollectionViewItem ()
+@interface VLCMediaSourceDeviceCollectionViewItem ()
@end
-@implementation VLCMediaSourceCollectionViewItem
+@implementation VLCMediaSourceDeviceCollectionViewItem
- (void)prepareForReuse
{
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 182c885c6b2f85a1d1f789bc852d952f13bf4027..78f5e3625b8a274dc6dd9551319a9abcaebc813e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -496,10 +496,10 @@ modules/gui/macosx/media-source/VLCMediaSource.h
modules/gui/macosx/media-source/VLCMediaSource.m
modules/gui/macosx/media-source/VLCMediaSourceBaseDataSource.h
modules/gui/macosx/media-source/VLCMediaSourceBaseDataSource.m
-modules/gui/macosx/media-source/VLCMediaSourceCollectionViewItem.h
-modules/gui/macosx/media-source/VLCMediaSourceCollectionViewItem.m
modules/gui/macosx/media-source/VLCMediaSourceDataSource.h
modules/gui/macosx/media-source/VLCMediaSourceDataSource.m
+modules/gui/macosx/media-source/VLCMediaSourceDeviceCollectionViewItem.h
+modules/gui/macosx/media-source/VLCMediaSourceDeviceCollectionViewItem.m
modules/gui/macosx/media-source/VLCMediaSourceProvider.h
modules/gui/macosx/media-source/VLCMediaSourceProvider.m
modules/gui/macosx/menus/VLCMainMenu.h