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
1f67a0dd
Commit
1f67a0dd
authored
Jun 30, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
src: remove vlc_object_alive()
parent
62d9e9b2
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
0 additions
and
45 deletions
+0
-45
include/vlc_objects.h
include/vlc_objects.h
+0
-4
src/input/input.c
src/input/input.c
+0
-4
src/libvlc.h
src/libvlc.h
+0
-2
src/libvlccore.sym
src/libvlccore.sym
+0
-1
src/misc/objects.c
src/misc/objects.c
+0
-31
src/misc/variables.h
src/misc/variables.h
+0
-3
No files found.
include/vlc_objects.h
View file @
1f67a0dd
...
@@ -67,8 +67,4 @@ VLC_API char *vlc_object_get_name( const vlc_object_t * ) VLC_USED;
...
@@ -67,8 +67,4 @@ VLC_API char *vlc_object_get_name( const vlc_object_t * ) VLC_USED;
#define vlc_list_children(a) \
#define vlc_list_children(a) \
vlc_list_children( VLC_OBJECT(a) )
vlc_list_children( VLC_OBJECT(a) )
/* Objects and threading */
VLC_API
VLC_USED
VLC_DEPRECATED
bool
vlc_object_alive
(
vlc_object_t
*
);
#define vlc_object_alive(a) vlc_object_alive( VLC_OBJECT(a) )
/** @} */
/** @} */
src/input/input.c
View file @
1f67a0dd
...
@@ -219,10 +219,6 @@ int input_Start( input_thread_t *p_input )
...
@@ -219,10 +219,6 @@ int input_Start( input_thread_t *p_input )
*/
*/
void
input_Stop
(
input_thread_t
*
p_input
)
void
input_Stop
(
input_thread_t
*
p_input
)
{
{
/* Set die for input and ALL of this childrens (even (grand-)grand-childrens)
*/
ObjectKillChildrens
(
VLC_OBJECT
(
p_input
)
);
input_thread_private_t
*
sys
=
p_input
->
p
;
input_thread_private_t
*
sys
=
p_input
->
p
;
vlc_mutex_lock
(
&
sys
->
lock_control
);
vlc_mutex_lock
(
&
sys
->
lock_control
);
...
...
src/libvlc.h
View file @
1f67a0dd
...
@@ -57,8 +57,6 @@ void vlc_CPU_dump(vlc_object_t *);
...
@@ -57,8 +57,6 @@ void vlc_CPU_dump(vlc_object_t *);
/* This cannot be used as is from plugins yet: */
/* This cannot be used as is from plugins yet: */
int
vlc_clone_detach
(
vlc_thread_t
*
,
void
*
(
*
)(
void
*
),
void
*
,
int
);
int
vlc_clone_detach
(
vlc_thread_t
*
,
void
*
(
*
)(
void
*
),
void
*
,
int
);
void
ObjectKillChildrens
(
vlc_object_t
*
);
int
vlc_set_priority
(
vlc_thread_t
,
int
);
int
vlc_set_priority
(
vlc_thread_t
,
int
);
void
vlc_threads_setup
(
libvlc_int_t
*
);
void
vlc_threads_setup
(
libvlc_int_t
*
);
...
...
src/libvlccore.sym
View file @
1f67a0dd
...
@@ -584,7 +584,6 @@ vlc_object_find_name
...
@@ -584,7 +584,6 @@ vlc_object_find_name
vlc_object_hold
vlc_object_hold
vlc_object_release
vlc_object_release
vlc_object_get_name
vlc_object_get_name
vlc_object_alive
vlc_rand_bytes
vlc_rand_bytes
vlc_drand48
vlc_drand48
vlc_lrand48
vlc_lrand48
...
...
src/misc/objects.c
View file @
1f67a0dd
...
@@ -128,7 +128,6 @@ void *vlc_custom_create (vlc_object_t *parent, size_t length,
...
@@ -128,7 +128,6 @@ void *vlc_custom_create (vlc_object_t *parent, size_t length,
/* Attach the parent to its child (structure lock needed) */
/* Attach the parent to its child (structure lock needed) */
libvlc_lock
(
obj
->
p_libvlc
);
libvlc_lock
(
obj
->
p_libvlc
);
atomic_init
(
&
priv
->
alive
,
atomic_load
(
&
papriv
->
alive
));
priv
->
next
=
papriv
->
first
;
priv
->
next
=
papriv
->
first
;
if
(
priv
->
next
!=
NULL
)
if
(
priv
->
next
!=
NULL
)
priv
->
next
->
prev
=
priv
;
priv
->
next
->
prev
=
priv
;
...
@@ -142,7 +141,6 @@ void *vlc_custom_create (vlc_object_t *parent, size_t length,
...
@@ -142,7 +141,6 @@ void *vlc_custom_create (vlc_object_t *parent, size_t length,
obj
->
i_flags
=
0
;
obj
->
i_flags
=
0
;
obj
->
p_libvlc
=
self
;
obj
->
p_libvlc
=
self
;
obj
->
p_parent
=
NULL
;
obj
->
p_parent
=
NULL
;
atomic_init
(
&
priv
->
alive
,
true
);
priv
->
next
=
NULL
;
priv
->
next
=
NULL
;
vlc_mutex_init
(
&
(
libvlc_priv
(
self
)
->
structure_lock
));
vlc_mutex_init
(
&
(
libvlc_priv
(
self
)
->
structure_lock
));
...
@@ -256,24 +254,6 @@ static void vlc_object_destroy( vlc_object_t *p_this )
...
@@ -256,24 +254,6 @@ static void vlc_object_destroy( vlc_object_t *p_this )
}
}
/**
* Hack for input objects. Should be removed eventually.
*/
void
ObjectKillChildrens
(
vlc_object_t
*
p_obj
)
{
/* FIXME ObjectKillChildrens seems a very bad idea in fact */
/*if( p_obj == VLC_OBJECT(p_input->p->p_sout) ) return;*/
vlc_object_internals_t
*
priv
=
vlc_internals
(
p_obj
);
atomic_store
(
&
priv
->
alive
,
false
);
vlc_list_t
*
p_list
=
vlc_list_children
(
p_obj
);
for
(
int
i
=
0
;
i
<
p_list
->
i_count
;
i
++
)
ObjectKillChildrens
(
p_list
->
p_values
[
i
].
p_address
);
vlc_list_release
(
p_list
);
}
#undef vlc_object_find_name
#undef vlc_object_find_name
/**
/**
* Finds a named object and increment its reference count.
* Finds a named object and increment its reference count.
...
@@ -396,17 +376,6 @@ void vlc_object_release( vlc_object_t *p_this )
...
@@ -396,17 +376,6 @@ void vlc_object_release( vlc_object_t *p_this )
}
}
}
}
#undef vlc_object_alive
/**
* This function returns true, except when it returns false.
* \warning Do not use this function. Ever. You were warned.
*/
bool
vlc_object_alive
(
vlc_object_t
*
obj
)
{
vlc_object_internals_t
*
internals
=
vlc_internals
(
obj
);
return
atomic_load
(
&
internals
->
alive
);
}
#undef vlc_list_children
#undef vlc_list_children
/**
/**
* Gets the list of children of an object, and increment their reference
* Gets the list of children of an object, and increment their reference
...
...
src/misc/variables.h
View file @
1f67a0dd
...
@@ -39,9 +39,6 @@ struct vlc_object_internals
...
@@ -39,9 +39,6 @@ struct vlc_object_internals
vlc_mutex_t
var_lock
;
vlc_mutex_t
var_lock
;
vlc_cond_t
var_wait
;
vlc_cond_t
var_wait
;
/* Objects thread synchronization */
atomic_bool
alive
;
/* Objects management */
/* Objects management */
atomic_uint
refs
;
atomic_uint
refs
;
vlc_destructor_t
pf_destructor
;
vlc_destructor_t
pf_destructor
;
...
...
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