[vlc-commits] macosx: Remove VLCPlaylist reference from PLModel

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Fri Jan  1 22:39:45 2016 +0100| [41754b7da7806eb11cfda77e44fae4a2dc8b9456] | committer: David Fuhrmann

macosx: Remove VLCPlaylist reference from PLModel

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=41754b7da7806eb11cfda77e44fae4a2dc8b9456
---

 modules/gui/macosx/PLModel.h     |    4 +---
 modules/gui/macosx/PLModel.m     |    5 +----
 modules/gui/macosx/VLCPlaylist.m |    2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/gui/macosx/PLModel.h b/modules/gui/macosx/PLModel.h
index a46cf40..b016e25 100644
--- a/modules/gui/macosx/PLModel.h
+++ b/modules/gui/macosx/PLModel.h
@@ -41,8 +41,6 @@
 #define URI_COLUMN @"uri"
 #define FILESIZE_COLUMN @"file-size"
 
- at class VLCPlaylist;
-
 typedef enum {
     ROOT_TYPE_PLAYLIST,
     ROOT_TYPE_MEDIALIBRARY,
@@ -54,7 +52,7 @@ typedef enum {
 @property(readonly) PLItem *rootItem;
 @property(readonly, copy) NSArray *draggedItems;
 
-- (id)initWithOutlineView:(NSOutlineView *)outlineView playlist:(playlist_t *)pl rootItem:(playlist_item_t *)root playlistObject:(id)plObj;
+- (id)initWithOutlineView:(NSOutlineView *)outlineView playlist:(playlist_t *)pl rootItem:(playlist_item_t *)root;
 
 - (void)changeRootItem:(playlist_item_t *)p_root;
 
diff --git a/modules/gui/macosx/PLModel.m b/modules/gui/macosx/PLModel.m
index fddfd8a..8a6aa73 100644
--- a/modules/gui/macosx/PLModel.m
+++ b/modules/gui/macosx/PLModel.m
@@ -107,8 +107,6 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
     playlist_t *p_playlist;
     __weak NSOutlineView *_outlineView;
 
-    // TODO: for transition
-    __weak VLCPlaylist *_playlist;
     NSUInteger _retainedRowSelection;
 }
 @end
@@ -118,13 +116,12 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
 #pragma mark -
 #pragma mark Init and Stuff
 
-- (id)initWithOutlineView:(NSOutlineView *)outlineView playlist:(playlist_t *)pl rootItem:(playlist_item_t *)root playlistObject:(id)plObj;
+- (id)initWithOutlineView:(NSOutlineView *)outlineView playlist:(playlist_t *)pl rootItem:(playlist_item_t *)root;
 {
     self = [super init];
     if (self) {
         p_playlist = pl;
         _outlineView = outlineView;
-        _playlist = plObj;
 
         msg_Dbg(VLCIntf, "Initializing playlist model");
         var_AddCallback(p_playlist, "item-change", PLItemUpdated, (__bridge void *)self);
diff --git a/modules/gui/macosx/VLCPlaylist.m b/modules/gui/macosx/VLCPlaylist.m
index 7aab812..6d9e0b9 100644
--- a/modules/gui/macosx/VLCPlaylist.m
+++ b/modules/gui/macosx/VLCPlaylist.m
@@ -152,7 +152,7 @@
 
     playlist_t * p_playlist = pl_Get(VLCIntf);
 
-    _model = [[PLModel alloc] initWithOutlineView:_outlineView playlist:p_playlist rootItem:p_playlist->p_playing playlistObject:self];
+    _model = [[PLModel alloc] initWithOutlineView:_outlineView playlist:p_playlist rootItem:p_playlist->p_playing];
     [_outlineView setDataSource:_model];
     [_outlineView reloadData];