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
e1acded8
Commit
e1acded8
authored
May 06, 2008
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use PL_**LOCK instead of vlc_mutex_lock
parent
0843673a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
15 deletions
+15
-15
modules/gui/macosx/playlist.m
modules/gui/macosx/playlist.m
+15
-15
No files found.
modules/gui/macosx/playlist.m
View file @
e1acded8
...
@@ -584,7 +584,7 @@
...
@@ -584,7 +584,7 @@
if
(
p_temp_item
)
if
(
p_temp_item
)
{
{
int
i
;
int
i
;
vlc_mutex_lock
(
&
p_playlist
->
object_lock
)
;
PL_LOCK
;
if
(
b_check
)
if
(
b_check
)
{
{
...
@@ -597,7 +597,7 @@
...
@@ -597,7 +597,7 @@
else
if
(
i
==
p_playlist
->
all_items
.
i_size
-
1
)
else
if
(
i
==
p_playlist
->
all_items
.
i_size
-
1
)
{
{
vlc_object_release
(
p_playlist
);
vlc_object_release
(
p_playlist
);
vlc_mutex_unlock
(
&
p_playlist
->
object_lock
)
;
PL_UNLOCK
;
return
NO
;
return
NO
;
}
}
}
}
...
@@ -608,12 +608,12 @@
...
@@ -608,12 +608,12 @@
p_temp_item
=
p_temp_item
->
p_parent
;
p_temp_item
=
p_temp_item
->
p_parent
;
if
(
p_temp_item
==
p_node
)
if
(
p_temp_item
==
p_node
)
{
{
vlc_mutex_unlock
(
&
p_playlist
->
object_lock
)
;
PL_UNLOCK
;
vlc_object_release
(
p_playlist
);
vlc_object_release
(
p_playlist
);
return
YES
;
return
YES
;
}
}
}
}
vlc_mutex_unlock
(
&
p_playlist
->
object_lock
)
;
PL_UNLOCK
;
}
}
vlc_object_release
(
p_playlist
);
vlc_object_release
(
p_playlist
);
...
@@ -882,16 +882,16 @@
...
@@ -882,16 +882,16 @@
if
(
p_item
->
i_children
>
-
1
)
// the item is a node
if
(
p_item
->
i_children
>
-
1
)
// the item is a node
{
{
vlc_mutex_lock
(
&
p_playlist
->
object_lock
)
;
PL_LOCK
;
playlist_RecursiveNodeSort
(
p_playlist
,
p_item
,
i_mode
,
ORDER_NORMAL
);
playlist_RecursiveNodeSort
(
p_playlist
,
p_item
,
i_mode
,
ORDER_NORMAL
);
vlc_mutex_unlock
(
&
p_playlist
->
object_lock
)
;
PL_UNLOCK
;
}
}
else
else
{
{
vlc_mutex_lock
(
&
p_playlist
->
object_lock
)
;
PL_LOCK
;
playlist_RecursiveNodeSort
(
p_playlist
,
playlist_RecursiveNodeSort
(
p_playlist
,
p_item
->
p_parent
,
i_mode
,
ORDER_NORMAL
);
p_item
->
p_parent
,
i_mode
,
ORDER_NORMAL
);
vlc_mutex_unlock
(
&
p_playlist
->
object_lock
)
;
PL_UNLOCK
;
}
}
vlc_object_release
(
p_playlist
);
vlc_object_release
(
p_playlist
);
[
self
playlistUpdated
];
[
self
playlistUpdated
];
...
@@ -1088,14 +1088,14 @@
...
@@ -1088,14 +1088,14 @@
char
*
psz_temp
;
char
*
psz_temp
;
NSString
*
o_current_name
,
*
o_current_author
;
NSString
*
o_current_name
,
*
o_current_author
;
vlc_mutex_lock
(
&
p_playlist
->
object_lock
)
;
PL_LOCK
;
o_current_name
=
[
NSString
stringWithUTF8String
:
o_current_name
=
[
NSString
stringWithUTF8String
:
p_item
->
pp_children
[
i_current
]
->
p_input
->
psz_name
];
p_item
->
pp_children
[
i_current
]
->
p_input
->
psz_name
];
psz_temp
=
input_ItemGetInfo
(
p_item
->
p_input
,
psz_temp
=
input_ItemGetInfo
(
p_item
->
p_input
,
_
(
"Meta-information"
),
_
(
"Artist"
)
);
_
(
"Meta-information"
),
_
(
"Artist"
)
);
o_current_author
=
[
NSString
stringWithUTF8String
:
psz_temp
];
o_current_author
=
[
NSString
stringWithUTF8String
:
psz_temp
];
free
(
psz_temp
);
free
(
psz_temp
);
vlc_mutex_unlock
(
&
p_playlist
->
object_lock
)
;
PL_UNLOCK
;
if
(
p_selected_item
==
p_item
->
pp_children
[
i_current
]
&&
if
(
p_selected_item
==
p_item
->
pp_children
[
i_current
]
&&
b_selected_item_met
==
NO
)
b_selected_item_met
==
NO
)
...
@@ -1557,8 +1557,8 @@
...
@@ -1557,8 +1557,8 @@
}
}
}
}
vlc_mutex_lock
(
&
p_playlist
->
object_lock
)
;
PL_LOCK
;
// Acually detach the item from the old position
// Ac
t
ually detach the item from the old position
if
(
playlist_NodeRemoveItem
(
p_playlist
,
p_item
,
p_old_parent
)
==
if
(
playlist_NodeRemoveItem
(
p_playlist
,
p_item
,
p_old_parent
)
==
VLC_SUCCESS
)
VLC_SUCCESS
)
{
{
...
@@ -1580,7 +1580,7 @@
...
@@ -1580,7 +1580,7 @@
// Reattach the item to the new position
// Reattach the item to the new position
playlist_NodeInsert
(
p_playlist
,
p_item
,
p_new_parent
,
i_new_index
);
playlist_NodeInsert
(
p_playlist
,
p_item
,
p_new_parent
,
i_new_index
);
}
}
vlc_mutex_unlock
(
&
p_playlist
->
object_lock
)
;
PL_UNLOCK
;
}
}
[
self
playlistUpdated
];
[
self
playlistUpdated
];
i_row
=
[
o_outline_view
rowForItem
:[
o_outline_dict
i_row
=
[
o_outline_view
rowForItem
:[
o_outline_dict
...
...
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