Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
41754b7d
Commit
41754b7d
authored
Jan 01, 2016
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: Remove VLCPlaylist reference from PLModel
parent
e66d8e65
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
modules/gui/macosx/PLModel.h
modules/gui/macosx/PLModel.h
+1
-3
modules/gui/macosx/PLModel.m
modules/gui/macosx/PLModel.m
+1
-4
modules/gui/macosx/VLCPlaylist.m
modules/gui/macosx/VLCPlaylist.m
+1
-1
No files found.
modules/gui/macosx/PLModel.h
View file @
41754b7d
...
...
@@ -41,8 +41,6 @@
#define URI_COLUMN @"uri"
#define FILESIZE_COLUMN @"file-size"
@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
;
...
...
modules/gui/macosx/PLModel.m
View file @
41754b7d
...
...
@@ -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
);
...
...
modules/gui/macosx/VLCPlaylist.m
View file @
41754b7d
...
...
@@ -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
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment