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
2d561683
Commit
2d561683
authored
Nov 07, 2004
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* fixing the OSX playlist (at least it compiles again)
parent
fbe079e2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
6 deletions
+23
-6
modules/gui/macosx/playlist.m
modules/gui/macosx/playlist.m
+13
-4
modules/gui/macosx/playlistinfo.m
modules/gui/macosx/playlistinfo.m
+10
-2
No files found.
modules/gui/macosx/playlist.m
View file @
2d561683
...
@@ -84,7 +84,7 @@
...
@@ -84,7 +84,7 @@
o_number
=
[
o_to_delete
lastObject
];
o_number
=
[
o_to_delete
lastObject
];
i_row
=
[
o_number
intValue
];
i_row
=
[
o_number
intValue
];
if
(
p_playlist
->
i_index
==
i_row
&&
p_playlist
->
i_status
)
if
(
p_playlist
->
i_index
==
i_row
&&
p_playlist
->
status
.
i_status
)
{
{
playlist_Stop
(
p_playlist
);
playlist_Stop
(
p_playlist
);
}
}
...
@@ -368,7 +368,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
...
@@ -368,7 +368,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
o_number
=
[
o_to_delete
lastObject
];
o_number
=
[
o_to_delete
lastObject
];
i_row
=
[
o_number
intValue
];
i_row
=
[
o_number
intValue
];
if
(
p_playlist
->
i_index
==
i_row
&&
p_playlist
->
i_status
)
if
(
p_playlist
->
i_index
==
i_row
&&
p_playlist
->
status
.
i_status
)
{
{
playlist_Stop
(
p_playlist
);
playlist_Stop
(
p_playlist
);
}
}
...
@@ -388,6 +388,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
...
@@ -388,6 +388,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
-
(
IBAction
)
toggleItemsEnabled
:(
id
)
sender
-
(
IBAction
)
toggleItemsEnabled
:(
id
)
sender
{
{
#if 0
int i, c, i_row;
int i, c, i_row;
NSMutableArray *o_selected;
NSMutableArray *o_selected;
NSNumber *o_number;
NSNumber *o_number;
...
@@ -410,7 +411,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
...
@@ -410,7 +411,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
{
{
o_number = [o_selected lastObject];
o_number = [o_selected lastObject];
i_row = [o_number intValue];
i_row = [o_number intValue];
if
(
p_playlist
->
i_index
==
i_row
&&
p_playlist
->
i_status
)
if( p_playlist->i_index == i_row && p_playlist->
status.
i_status )
{
{
playlist_Stop( p_playlist );
playlist_Stop( p_playlist );
}
}
...
@@ -430,10 +431,12 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
...
@@ -430,10 +431,12 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
}
}
vlc_object_release( p_playlist );
vlc_object_release( p_playlist );
[self playlistUpdated];
[self playlistUpdated];
#endif
}
}
-
(
IBAction
)
enableGroup
:(
id
)
sender
-
(
IBAction
)
enableGroup
:(
id
)
sender
{
{
#if 0
intf_thread_t * p_intf = VLCIntf;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
FIND_ANYWHERE );
...
@@ -444,10 +447,12 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
...
@@ -444,10 +447,12 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
p_playlist->pp_items[[o_table_view selectedRow]]->i_group);
p_playlist->pp_items[[o_table_view selectedRow]]->i_group);
vlc_object_release(p_playlist);
vlc_object_release(p_playlist);
}
}
#endif
}
}
-
(
IBAction
)
disableGroup
:(
id
)
sender
-
(
IBAction
)
disableGroup
:(
id
)
sender
{
{
#if 0
intf_thread_t * p_intf = VLCIntf;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
FIND_ANYWHERE );
...
@@ -458,6 +463,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
...
@@ -458,6 +463,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
p_playlist->pp_items[[o_table_view selectedRow]]->i_group);
p_playlist->pp_items[[o_table_view selectedRow]]->i_group);
vlc_object_release(p_playlist);
vlc_object_release(p_playlist);
}
}
#endif
}
}
-
(
IBAction
)
selectAll
:(
id
)
sender
-
(
IBAction
)
selectAll
:(
id
)
sender
...
@@ -728,6 +734,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
...
@@ -728,6 +734,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
-
(
void
)
deleteGroup
:(
int
)
i_id
-
(
void
)
deleteGroup
:(
int
)
i_id
{
{
#if 0
intf_thread_t * p_intf = VLCIntf;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
FIND_ANYWHERE );
...
@@ -776,6 +783,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
...
@@ -776,6 +783,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
vlc_object_release(p_playlist);
vlc_object_release(p_playlist);
[self playlistUpdated];
[self playlistUpdated];
}
}
#endif
}
}
-
(
NSColor
*
)
getColor
:(
int
)
i_group
-
(
NSColor
*
)
getColor
:(
int
)
i_group
...
@@ -927,6 +935,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
...
@@ -927,6 +935,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
FIND_ANYWHERE
);
FIND_ANYWHERE
);
if
(
p_playlist
)
if
(
p_playlist
)
{
{
#if 0
if ((p_playlist->i_groups) > 1 )
if ((p_playlist->i_groups) > 1 )
{
{
[o_cell setDrawsBackground: VLC_TRUE];
[o_cell setDrawsBackground: VLC_TRUE];
...
@@ -937,7 +946,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
...
@@ -937,7 +946,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
{
{
[o_cell setDrawsBackground: VLC_FALSE];
[o_cell setDrawsBackground: VLC_FALSE];
}
}
#endif
if
(
!
p_playlist
->
pp_items
[
i_rows
]
->
b_enabled
)
if
(
!
p_playlist
->
pp_items
[
i_rows
]
->
b_enabled
)
{
{
[
o_cell
setTextColor
:
[
NSColor
colorWithDeviceRed
:
0
.
3686
green
:
0
.
3686
blue
:
0
.
3686
alpha
:
1
.
0
]];
[
o_cell
setTextColor
:
[
NSColor
colorWithDeviceRed
:
0
.
3686
green
:
0
.
3686
blue
:
0
.
3686
alpha
:
1
.
0
]];
...
...
modules/gui/macosx/playlistinfo.m
View file @
2d561683
...
@@ -179,7 +179,7 @@
...
@@ -179,7 +179,7 @@
playlist_ItemAddInfo
(
p_playlist
->
pp_items
[
i_item
],
_
(
"General"
),
_
(
"Author"
),
[[
o_author_txt
stringValue
]
cString
]);
playlist_ItemAddInfo
(
p_playlist
->
pp_items
[
i_item
],
_
(
"General"
),
_
(
"Author"
),
[[
o_author_txt
stringValue
]
cString
]);
c
=
(
int
)[
o_selected
count
];
c
=
(
int
)[
o_selected
count
];
#if 0
if ([[o_group_cbx stringValue] isEqual:
if ([[o_group_cbx stringValue] isEqual:
[o_group_cbx objectValueOfSelectedItem]])
[o_group_cbx objectValueOfSelectedItem]])
{
{
...
@@ -208,7 +208,7 @@
...
@@ -208,7 +208,7 @@
}
}
}
}
#endif
vlc_mutex_unlock
(
&
p_playlist
->
pp_items
[
i_item
]
->
input
.
lock
);
vlc_mutex_unlock
(
&
p_playlist
->
pp_items
[
i_item
]
->
input
.
lock
);
val
.
b_bool
=
VLC_TRUE
;
val
.
b_bool
=
VLC_TRUE
;
var_Set
(
p_playlist
,
"intf-change"
,
val
);
var_Set
(
p_playlist
,
"intf-change"
,
val
);
...
@@ -219,6 +219,7 @@
...
@@ -219,6 +219,7 @@
-
(
IBAction
)
handleGroup
:(
id
)
sender
-
(
IBAction
)
handleGroup
:(
id
)
sender
{
{
#if 0
intf_thread_t * p_intf = VLCIntf;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
FIND_ANYWHERE );
...
@@ -240,10 +241,12 @@
...
@@ -240,10 +241,12 @@
}
}
vlc_object_release(p_playlist);
vlc_object_release(p_playlist);
}
}
#endif
}
}
-
(
IBAction
)
deleteOutlineGroup
:(
id
)
sender
-
(
IBAction
)
deleteOutlineGroup
:(
id
)
sender
{
{
#if 0
intf_thread_t * p_intf = VLCIntf;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
FIND_ANYWHERE );
...
@@ -265,10 +268,12 @@
...
@@ -265,10 +268,12 @@
}
}
vlc_object_release(p_playlist);
vlc_object_release(p_playlist);
}
}
#endif
}
}
-
(
IBAction
)
createOutlineGroup
:(
id
)
sender
;
-
(
IBAction
)
createOutlineGroup
:(
id
)
sender
;
{
{
#if 0
intf_thread_t * p_intf = VLCIntf;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
FIND_ANYWHERE );
...
@@ -281,10 +286,12 @@
...
@@ -281,10 +286,12 @@
[[[VLCMain sharedInstance] getPlaylist] playlistUpdated];
[[[VLCMain sharedInstance] getPlaylist] playlistUpdated];
vlc_object_release(p_playlist);
vlc_object_release(p_playlist);
}
}
#endif
}
}
-
(
void
)
createComboBox
-
(
void
)
createComboBox
{
{
#if 0
intf_thread_t * p_intf = VLCIntf;
intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
FIND_ANYWHERE );
...
@@ -307,6 +314,7 @@
...
@@ -307,6 +314,7 @@
}
}
vlc_object_release(p_playlist);
vlc_object_release(p_playlist);
}
}
#endif
}
}
-
(
int
)
getItem
-
(
int
)
getItem
...
...
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