Commit 41754b7d authored by David Fuhrmann's avatar David Fuhrmann

macosx: Remove VLCPlaylist reference from PLModel

parent e66d8e65
...@@ -41,8 +41,6 @@ ...@@ -41,8 +41,6 @@
#define URI_COLUMN @"uri" #define URI_COLUMN @"uri"
#define FILESIZE_COLUMN @"file-size" #define FILESIZE_COLUMN @"file-size"
@class VLCPlaylist;
typedef enum { typedef enum {
ROOT_TYPE_PLAYLIST, ROOT_TYPE_PLAYLIST,
ROOT_TYPE_MEDIALIBRARY, ROOT_TYPE_MEDIALIBRARY,
...@@ -54,7 +52,7 @@ typedef enum { ...@@ -54,7 +52,7 @@ typedef enum {
@property(readonly) PLItem *rootItem; @property(readonly) PLItem *rootItem;
@property(readonly, copy) NSArray *draggedItems; @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; - (void)changeRootItem:(playlist_item_t *)p_root;
......
...@@ -107,8 +107,6 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var, ...@@ -107,8 +107,6 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
playlist_t *p_playlist; playlist_t *p_playlist;
__weak NSOutlineView *_outlineView; __weak NSOutlineView *_outlineView;
// TODO: for transition
__weak VLCPlaylist *_playlist;
NSUInteger _retainedRowSelection; NSUInteger _retainedRowSelection;
} }
@end @end
...@@ -118,13 +116,12 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var, ...@@ -118,13 +116,12 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
#pragma mark - #pragma mark -
#pragma mark Init and Stuff #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]; self = [super init];
if (self) { if (self) {
p_playlist = pl; p_playlist = pl;
_outlineView = outlineView; _outlineView = outlineView;
_playlist = plObj;
msg_Dbg(VLCIntf, "Initializing playlist model"); msg_Dbg(VLCIntf, "Initializing playlist model");
var_AddCallback(p_playlist, "item-change", PLItemUpdated, (__bridge void *)self); var_AddCallback(p_playlist, "item-change", PLItemUpdated, (__bridge void *)self);
......
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
playlist_t * p_playlist = pl_Get(VLCIntf); 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 setDataSource:_model];
[_outlineView reloadData]; [_outlineView reloadData];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment