macosx: Move library segment enum to VLCLibrarySegment class

Signed-off-by: Claudio Cambra <developer@claudiocambra.com>

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

@@ -81,7 +81,7 @@
 		5310AFB12B4FE72700E75F9A /* NSArray+VLCAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 5310AFB02B4FE72700E75F9A /* NSArray+VLCAdditions.m */; };
 		5310AFB52B53EC4F00E75F9A /* iCarousel.m in Sources */ = {isa = PBXBuildFile; fileRef = 5310AFB32B53EC4E00E75F9A /* iCarousel.m */; };
 		531343E72A8E7B94007AEDFA /* VLCLibraryWindowNavigationSidebarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 531343E62A8E7B94007AEDFA /* VLCLibraryWindowNavigationSidebarController.m */; };
-		531343EA2A8E8965007AEDFA /* VLCLibrarySection.m in Sources */ = {isa = PBXBuildFile; fileRef = 531343E92A8E8965007AEDFA /* VLCLibrarySection.m */; };
+		531343EA2A8E8965007AEDFA /* VLCLibrarySegment.m in Sources */ = {isa = PBXBuildFile; fileRef = 531343E92A8E8965007AEDFA /* VLCLibrarySegment.m */; };
 		5317FE04294E3DD3001702F0 /* VLCLibraryCollectionViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 5317FE03294E3DD3001702F0 /* VLCLibraryCollectionViewDelegate.m */; };
 		5325C57D29302E6800B2B63A /* VLCLibraryAudioViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5325C57B29302E6800B2B63A /* VLCLibraryAudioViewController.m */; };
 		533B5D2C29CF94C6003DE887 /* VLCBookmarksTableViewDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 533B5D2B29CF94C6003DE887 /* VLCBookmarksTableViewDataSource.m */; };
@@ -282,8 +282,8 @@
 		5310AFB42B53EC4E00E75F9A /* iCarousel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iCarousel.h; sourceTree = "<group>"; };
 		531343E52A8E7B94007AEDFA /* VLCLibraryWindowNavigationSidebarController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryWindowNavigationSidebarController.h; sourceTree = "<group>"; };
 		531343E62A8E7B94007AEDFA /* VLCLibraryWindowNavigationSidebarController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryWindowNavigationSidebarController.m; sourceTree = "<group>"; };
-		531343E82A8E8965007AEDFA /* VLCLibrarySection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibrarySection.h; sourceTree = "<group>"; };
-		531343E92A8E8965007AEDFA /* VLCLibrarySection.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibrarySection.m; sourceTree = "<group>"; };
+		531343E82A8E8965007AEDFA /* VLCLibrarySegment.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibrarySegment.h; sourceTree = "<group>"; };
+		531343E92A8E8965007AEDFA /* VLCLibrarySegment.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibrarySegment.m; sourceTree = "<group>"; };
 		5317FE02294E3DD3001702F0 /* VLCLibraryCollectionViewDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryCollectionViewDelegate.h; sourceTree = "<group>"; };
 		5317FE03294E3DD3001702F0 /* VLCLibraryCollectionViewDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryCollectionViewDelegate.m; sourceTree = "<group>"; };
 		5317FE05294E8D1A001702F0 /* VLCLibraryCollectionViewDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryCollectionViewDataSource.h; sourceTree = "<group>"; };
@@ -1278,6 +1278,8 @@
 				530771F32AEBBD5B00656D3D /* VLCLibraryRepresentedItem.m */,
 				531343E82A8E8965007AEDFA /* VLCLibrarySection.h */,
 				531343E92A8E8965007AEDFA /* VLCLibrarySection.m */,
+				531343E82A8E8965007AEDFA /* VLCLibrarySegment.h */,
+				531343E92A8E8965007AEDFA /* VLCLibrarySegment.m */,
 				7D22A8F222BC14F80063ECD2 /* VLCLibrarySortingMenuController.h */,
 				7D22A8F322BC14F80063ECD2 /* VLCLibrarySortingMenuController.m */,
 				7DE2F0452282D5D10040DD0A /* VLCLibraryTableCellView.h */,
@@ -2017,7 +2019,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				1CCC88EC2078A3D500E5626F /* MainMenu.xib in Sources */,
-				531343EA2A8E8965007AEDFA /* VLCLibrarySection.m in Sources */,
+				531343EA2A8E8965007AEDFA /* VLCLibrarySegment.m in Sources */,
 				53ED473C29CBC64200795DB1 /* NSPasteboardItem+VLCAdditions.m in Sources */,
 				7D713D362201DC640042BEB7 /* VLCLibraryWindow.xib in Sources */,
 				1CCC88EE2078A3D500E5626F /* VLCStatusBarIconMainMenu.xib in Sources */,

modules/gui/macosx/Makefile.am

@@ -130,8 +130,8 @@ libmacosx_plugin_la_SOURCES = \
 	gui/macosx/library/VLCLibraryNavigationState.m \
 	gui/macosx/library/VLCLibraryRepresentedItem.h \
 	gui/macosx/library/VLCLibraryRepresentedItem.m \
-	gui/macosx/library/VLCLibrarySection.h \
-	gui/macosx/library/VLCLibrarySection.m \
+	gui/macosx/library/VLCLibrarySegment.h \
+	gui/macosx/library/VLCLibrarySegment.m \
 	gui/macosx/library/VLCLibrarySortingMenuController.h \
 	gui/macosx/library/VLCLibrarySortingMenuController.m \
 	gui/macosx/library/VLCLibraryTableView.h \

modules/gui/macosx/library/VLCLibrarySection.m → modules/gui/macosx/library/VLCLibrarySegment.h

@@ -20,8 +20,24 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#import "VLCLibrarySection.h"
+#import <Cocoa/Cocoa.h>
 
-@implementation VLCLibrarySection
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(NSUInteger, VLCLibrarySegmentType) {
+    VLCLibraryHomeSegment = 0,
+    VLCLibraryVideoSegment,
+    VLCLibraryMusicSegment,
+    VLCLibraryBrowseSegment,
+    VLCLibraryStreamsSegment
+};
+
+@interface VLCLibrarySegment : NSObject
+
+@property (readonly) VLCLibrarySegmentType segmentType;
+
+- (instancetype)initWithSegmentType:(VLCLibrarySegmentType)segmentType;
 
 @end
+
+NS_ASSUME_NONNULL_END

modules/gui/macosx/library/VLCLibrarySection.h → modules/gui/macosx/library/VLCLibrarySegment.m

@@ -20,12 +20,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#import <Cocoa/Cocoa.h>
+#import "VLCLibrarySegment.h"
 
-NS_ASSUME_NONNULL_BEGIN
+@implementation VLCLibrarySegment
 
-@interface VLCLibrarySection : NSObject
+- (instancetype)initWithSegmentType:(VLCLibrarySegmentType)segmentType
+{
+    self = [super init];
+    if (self) {
+        _segmentType = segmentType;
+    }
+    return self;
+}
 
 @end
-
-NS_ASSUME_NONNULL_END

modules/gui/macosx/library/VLCLibraryWindow.h

@@ -41,14 +41,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol VLCMediaLibraryItemProtocol;
 
-typedef NS_ENUM(NSUInteger, VLCLibrarySegment) {
-    VLCLibraryHomeSegment = 0,
-    VLCLibraryVideoSegment,
-    VLCLibraryMusicSegment,
-    VLCLibraryBrowseSegment,
-    VLCLibraryStreamsSegment
-};
-
 typedef NS_ENUM(NSInteger, VLCLibraryViewModeSegment) {
     VLCLibrarySmallestSentinelViewModeSegment = -1,
     VLCLibraryGridViewModeSegment,

modules/gui/macosx/library/VLCLibraryWindow.m

@@ -38,10 +38,11 @@
 
 #import "library/VLCLibraryController.h"
 #import "library/VLCLibraryCollectionViewItem.h"
-#import "library/VLCLibraryModel.h"
 #import "library/VLCLibraryCollectionViewSupplementaryElementView.h"
-#import "library/VLCLibrarySortingMenuController.h"
+#import "library/VLCLibraryModel.h"
 #import "library/VLCLibraryNavigationStack.h"
+#import "library/VLCLibrarySegment.h"
+#import "library/VLCLibrarySortingMenuController.h"
 #import "library/VLCLibraryUIUnits.h"
 #import "library/VLCLibraryWindowPersistentPreferences.h"
 
@@ -373,7 +374,7 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
 
 - (void)updateGridVsListViewModeSegmentedControl
 {
-    const VLCLibrarySegment selectedLibrarySegment = _segmentedTitleControl.selectedSegment;
+    const VLCLibrarySegmentType selectedLibrarySegment = _segmentedTitleControl.selectedSegment;
     VLCLibraryWindowPersistentPreferences * const preferences = VLCLibraryWindowPersistentPreferences.sharedInstance;
 
     switch (selectedLibrarySegment) {
@@ -458,7 +459,7 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
 
     _currentSelectedViewModeSegment = _gridVsListSegmentedControl.selectedSegment;
 
-    const VLCLibrarySegment selectedLibrarySegment = _segmentedTitleControl.selectedSegment;
+    const VLCLibrarySegmentType selectedLibrarySegment = _segmentedTitleControl.selectedSegment;
     VLCLibraryWindowPersistentPreferences * const preferences = VLCLibraryWindowPersistentPreferences.sharedInstance;
 
     switch (selectedLibrarySegment) {
@@ -635,7 +636,7 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
     [_libraryAudioViewController presentAudioView];
 }
 
-- (void)showMediaSourceLibraryWithSegment:(VLCLibrarySegment)segment
+- (void)showMediaSourceLibraryWithSegment:(VLCLibrarySegmentType)segment
 {
     NSParameterAssert(segment == VLCLibraryBrowseSegment || segment == VLCLibraryStreamsSegment);
 

modules/gui/macosx/library/VLCLibraryWindowController.m

@@ -23,6 +23,7 @@
 #import "VLCLibraryWindowController.h"
 
 #import "library/VLCLibraryNavigationStack.h"
+#import "library/VLCLibrarySegment.h"
 #import "library/VLCLibraryWindow.h"
 #import "library/audio-library/VLCLibraryAudioViewController.h"
 #import "main/VLCMain.h"

modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.m

@@ -30,6 +30,7 @@
 #import "library/VLCLibraryDataTypes.h"
 #import "library/VLCLibraryModel.h"
 #import "library/VLCLibraryNavigationStack.h"
+#import "library/VLCLibrarySegment.h"
 #import "library/VLCLibraryTwoPaneSplitViewDelegate.h"
 #import "library/VLCLibraryWindow.h"
 #import "library/VLCLibraryWindowPersistentPreferences.h"

modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewController.m

@@ -31,6 +31,7 @@
 #import "library/VLCLibraryCollectionViewFlowLayout.h"
 #import "library/VLCLibraryCollectionViewItem.h"
 #import "library/VLCLibraryController.h"
+#import "library/VLCLibrarySegment.h"
 #import "library/VLCLibraryUIUnits.h"
 #import "library/VLCLibraryWindow.h"
 
@@ -157,7 +158,7 @@
     [self presentMediaSourceView:VLCLibraryStreamsSegment];
 }
 
-- (void)presentMediaSourceView:(VLCLibrarySegment)viewSegment
+- (void)presentMediaSourceView:(VLCLibrarySegmentType)viewSegment
 {
     _libraryTargetView.subviews = @[];
 

modules/gui/macosx/library/video-library/VLCLibraryVideoViewController.m

@@ -30,6 +30,7 @@
 #import "library/VLCLibraryCollectionViewSupplementaryElementView.h"
 #import "library/VLCLibraryController.h"
 #import "library/VLCLibraryModel.h"
+#import "library/VLCLibrarySegment.h"
 #import "library/VLCLibraryTableCellView.h"
 #import "library/VLCLibraryTwoPaneSplitViewDelegate.h"
 #import "library/VLCLibraryUIUnits.h"