浏览代码

MacOSX/Framework/VLCMediaLibrary.m: Rework -allMedia, and remove -sublists.

Pierre d'Herbemont 17 年之前
父节点
当前提交
ef5ee063ec
共有 2 个文件被更改,包括 3 次插入16 次删除
  1. 0 1
      Headers/Public/VLCMediaLibrary.h
  2. 3 15
      Sources/VLCMediaLibrary.m

+ 0 - 1
Headers/Public/VLCMediaLibrary.h

@@ -35,5 +35,4 @@
 + (id)sharedMediaLibrary;
 
 - (VLCMediaList *)allMedia;
-- (NSArray *)playlists;
 @end

+ 3 - 15
Sources/VLCMediaLibrary.m

@@ -71,22 +71,10 @@ static VLCMediaLibrary * sharedMediaLibrary = nil;
 {
     if (!allMedia)
     {
-//        libvlc_media_list_t *p_mlist = libvlc_media_library_media_list(mlib, NULL);
-//        libvlc_media_list_t * p_flat_mlist = libvlc_media_list_flat_media_list(p_mlist, NULL);
-//        allMedia = [[VLCMediaList medialistWithLibVLCMediaList: p_flat_mlist] retain];
-//        libvlc_media_list_release(p_flat_mlist);
-//        libvlc_media_list_release(p_mlist);
+        libvlc_media_list_t *p_mlist = libvlc_media_library_media_list(mlib, NULL);
+        allMedia = [[VLCMediaList medialistWithLibVLCMediaList: p_mlist] retain];
+        libvlc_media_list_release(p_mlist);
     }
     return allMedia;
 }
-
-- (NSArray *)playlists
-{
-    libvlc_media_list_t *p_mlist = libvlc_media_library_media_list( mlib, NULL );
-    VLCMediaList *medialist = [VLCMediaList medialistWithLibVLCMediaList:p_mlist];
-    libvlc_media_list_release( p_mlist );
-    NSArray *ret = [medialist sublists];
-    
-    return ret;
-}
 @end