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
0bd6fe5f
Commit
0bd6fe5f
authored
Feb 18, 2009
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: added missing playlist locks
parent
5568c88e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+6
-0
modules/gui/macosx/playlist.m
modules/gui/macosx/playlist.m
+4
-0
No files found.
modules/gui/macosx/intf.m
View file @
0bd6fe5f
...
@@ -1544,7 +1544,11 @@ static void * manage_cleanup( void * args )
...
@@ -1544,7 +1544,11 @@ static void * manage_cleanup( void * args )
/* update our info-panel to reflect the new item, if we don't show
/* update our info-panel to reflect the new item, if we don't show
* the playlist or the selection is empty */
* the playlist or the selection is empty */
if
(
[
self
isPlaylistCollapsed
]
==
YES
)
if
(
[
self
isPlaylistCollapsed
]
==
YES
)
{
PL_LOCK
;
[[
self
getInfo
]
updatePanelWithItem
:
playlist_CurrentPlayingItem
(
p_playlist
)
->
p_input
];
[[
self
getInfo
]
updatePanelWithItem
:
playlist_CurrentPlayingItem
(
p_playlist
)
->
p_input
];
PL_UNLOCK
;
}
/* seekable streams */
/* seekable streams */
b_seekable
=
var_GetBool
(
p_input
,
"can-seek"
);
b_seekable
=
var_GetBool
(
p_input
,
"can-seek"
);
...
@@ -1836,11 +1840,13 @@ end:
...
@@ -1836,11 +1840,13 @@ end:
if
(
p_input
&&
vlc_object_alive
(
p_input
)
)
if
(
p_input
&&
vlc_object_alive
(
p_input
)
)
{
{
NSString
*
o_temp
;
NSString
*
o_temp
;
PL_LOCK
;
playlist_item_t
*
p_item
=
playlist_CurrentPlayingItem
(
p_playlist
);
playlist_item_t
*
p_item
=
playlist_CurrentPlayingItem
(
p_playlist
);
if
(
input_item_GetNowPlaying
(
p_item
->
p_input
)
)
if
(
input_item_GetNowPlaying
(
p_item
->
p_input
)
)
o_temp
=
[
NSString
stringWithUTF8String
:
input_item_GetNowPlaying
(
p_item
->
p_input
)];
o_temp
=
[
NSString
stringWithUTF8String
:
input_item_GetNowPlaying
(
p_item
->
p_input
)];
else
else
o_temp
=
[
NSString
stringWithUTF8String
:
p_item
->
p_input
->
psz_name
];
o_temp
=
[
NSString
stringWithUTF8String
:
p_item
->
p_input
->
psz_name
];
PL_UNLOCK
;
[
self
setScrollField
:
o_temp
stopAfter
:
-
1
];
[
self
setScrollField
:
o_temp
stopAfter
:
-
1
];
[[[
self
getControls
]
getFSPanel
]
setStreamTitle
:
o_temp
];
[[[
self
getControls
]
getFSPanel
]
setStreamTitle
:
o_temp
];
vlc_object_release
(
p_input
);
vlc_object_release
(
p_input
);
...
...
modules/gui/macosx/playlist.m
View file @
0bd6fe5f
...
@@ -573,7 +573,9 @@
...
@@ -573,7 +573,9 @@
playlist_item_t
*
p_item
,
*
p_temp_item
;
playlist_item_t
*
p_item
,
*
p_temp_item
;
NSMutableArray
*
o_array
=
[
NSMutableArray
array
];
NSMutableArray
*
o_array
=
[
NSMutableArray
array
];
PL_LOCK
;
p_item
=
playlist_CurrentPlayingItem
(
p_playlist
);
p_item
=
playlist_CurrentPlayingItem
(
p_playlist
);
PL_UNLOCK
;
if
(
p_item
==
NULL
)
if
(
p_item
==
NULL
)
{
{
pl_Release
(
VLCIntf
);
pl_Release
(
VLCIntf
);
...
@@ -1416,8 +1418,10 @@
...
@@ -1416,8 +1418,10 @@
id
o_playing_item
;
id
o_playing_item
;
PL_LOCK
;
o_playing_item
=
[
o_outline_dict
objectForKey
:
o_playing_item
=
[
o_outline_dict
objectForKey
:
[
NSString
stringWithFormat
:
@"%p"
,
playlist_CurrentPlayingItem
(
p_playlist
)]];
[
NSString
stringWithFormat
:
@"%p"
,
playlist_CurrentPlayingItem
(
p_playlist
)]];
PL_UNLOCK
;
if
(
[
self
isItem
:
[
o_playing_item
pointerValue
]
inNode
:
if
(
[
self
isItem
:
[
o_playing_item
pointerValue
]
inNode
:
[
item
pointerValue
]
checkItemExistence
:
YES
]
[
item
pointerValue
]
checkItemExistence
:
YES
]
...
...
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