Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
c48296e1
Commit
c48296e1
authored
Sep 28, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove p_root hacks
parent
f317dd7a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
19 deletions
+6
-19
src/misc/objects.c
src/misc/objects.c
+6
-19
No files found.
src/misc/objects.c
View file @
c48296e1
...
...
@@ -150,16 +150,10 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size,
}
if
(
p_this
==
NULL
)
{
if
(
i_type
==
VLC_OBJECT_LIBVLC
)
{
libvlc_int_t
*
self
=
(
libvlc_int_t
*
)
p_new
;
p_new
->
p_libvlc
=
self
;
vlc_mutex_init
(
&
(
libvlc_priv
(
self
)
->
structure_lock
));
}
else
/* TODO: get rid of the dummy root object */
p_new
->
p_libvlc
=
NULL
;
p_this
=
p_priv
->
next
=
p_priv
->
prev
=
p_new
;
}
else
...
...
@@ -183,12 +177,10 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size,
p_priv
->
pipes
[
0
]
=
p_priv
->
pipes
[
1
]
=
-
1
;
p_priv
->
next
=
p_this
;
if
(
p_new
->
p_libvlc
)
libvlc_lock
(
p_new
->
p_libvlc
);
p_priv
->
prev
=
vlc_internals
(
p_this
)
->
prev
;
vlc_internals
(
p_this
)
->
prev
=
p_new
;
vlc_internals
(
p_priv
->
prev
)
->
next
=
p_new
;
if
(
p_new
->
p_libvlc
)
libvlc_unlock
(
p_new
->
p_libvlc
);
if
(
i_type
==
VLC_OBJECT_LIBVLC
)
...
...
@@ -653,11 +645,6 @@ void __vlc_object_release( vlc_object_t *p_this )
}
vlc_spin_unlock
(
&
internals
->
ref_spin
);
if
(
p_this
->
p_libvlc
==
NULL
)
/* the legacy root object */
{
b_should_destroy
=
!--
internals
->
i_refcount
;
goto
notree
;
}
/* Slow path */
/* Remember that we cannot hold the spin while waiting on the mutex */
libvlc_lock
(
p_this
->
p_libvlc
);
...
...
@@ -706,7 +693,7 @@ void __vlc_object_release( vlc_object_t *p_this )
vlc_object_detach_unlocked
(
p_this
);
}
libvlc_unlock
(
p_this
->
p_libvlc
);
notree:
if
(
b_should_destroy
)
{
int
canc
;
...
...
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