浏览代码

for library mode none return empty array add nullability annotations

Tobias Conradi 10 年之前
父节点
当前提交
715211ef8b
共有 2 个文件被更改,包括 7 次插入4 次删除
  1. 2 2
      SharedSources/MLMediaLibrary+playlist.h
  2. 5 2
      SharedSources/MLMediaLibrary+playlist.m

+ 2 - 2
SharedSources/MLMediaLibrary+playlist.h

@@ -23,7 +23,7 @@ typedef NS_ENUM(NSUInteger, VLCLibraryMode) {
 
 @interface MLMediaLibrary (playlist)
 
-- (NSArray *)playlistArrayForGroupObject:(id)groupObject;
-- (NSArray *)playlistArrayForLibraryMode:(VLCLibraryMode)libraryMode;
+- (nonnull NSArray *)playlistArrayForGroupObject:(nonnull id)groupObject;
+- (nonnull NSArray *)playlistArrayForLibraryMode:(VLCLibraryMode)libraryMode;
 
 @end

+ 5 - 2
SharedSources/MLMediaLibrary+playlist.m

@@ -19,7 +19,7 @@
 @implementation MLMediaLibrary (playlist)
 
 
-- (NSArray *)playlistArrayForGroupObject:(id)groupObject
+- (nonnull NSArray *)playlistArrayForGroupObject:(nonnull id)groupObject
 {
     if([groupObject isKindOfClass:[MLLabel class]]) {
         return [(MLLabel *)groupObject sortedFolderItems];
@@ -34,10 +34,13 @@
 }
 
 //TODO: this code could use refactoring to be more readable
-- (NSArray *)playlistArrayForLibraryMode:(VLCLibraryMode)libraryMode
+- (nonnull NSArray *)playlistArrayForLibraryMode:(VLCLibraryMode)libraryMode
 {
 
     NSMutableArray *objects = [NSMutableArray array];
+    if (libraryMode == VLCLibraryModeNone) {
+        return  objects;
+    }
 
     /* add all albums */
     if (libraryMode != VLCLibraryModeAllSeries) {