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
7b1d9b54
Commit
7b1d9b54
authored
Feb 20, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vlc_list_children: use vlc_value_t.p_address, not .p_object
This was a remnant from the times of VLC_VAR_OBJECT.
parent
a6b259b7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
12 deletions
+7
-12
include/vlc_common.h
include/vlc_common.h
+0
-1
modules/gui/ncurses.c
modules/gui/ncurses.c
+1
-1
modules/gui/qt4/components/complete_preferences.cpp
modules/gui/qt4/components/complete_preferences.cpp
+1
-1
modules/gui/qt4/dialogs/messages.cpp
modules/gui/qt4/dialogs/messages.cpp
+1
-1
src/misc/objects.c
src/misc/objects.c
+4
-8
No files found.
include/vlc_common.h
View file @
7b1d9b54
...
...
@@ -340,7 +340,6 @@ typedef union
float
f_float
;
char
*
psz_string
;
void
*
p_address
;
vlc_object_t
*
p_object
;
vlc_list_t
*
p_list
;
mtime_t
i_time
;
struct
{
int32_t
x
;
int32_t
y
;
}
coords
;
...
...
modules/gui/ncurses.c
View file @
7b1d9b54
...
...
@@ -718,7 +718,7 @@ static int SubDrawObject(intf_sys_t *sys, int l, vlc_object_t *p_obj, int i_leve
vlc_list_t
*
list
=
vlc_list_children
(
p_obj
);
for
(
int
i
=
0
;
i
<
list
->
i_count
;
i
++
)
{
l
=
SubDrawObject
(
sys
,
l
,
list
->
p_values
[
i
].
p_
object
,
i_level
,
l
=
SubDrawObject
(
sys
,
l
,
list
->
p_values
[
i
].
p_
address
,
i_level
,
(
i
==
list
->
i_count
-
1
)
?
"`-"
:
"|-"
);
}
vlc_list_release
(
list
);
...
...
modules/gui/qt4/components/complete_preferences.cpp
View file @
7b1d9b54
...
...
@@ -408,7 +408,7 @@ static void populateLoadedSet( QSet<QString> *loaded, vlc_object_t *p_node )
vlc_list_t
*
l
=
vlc_list_children
(
p_node
);
for
(
int
i
=
0
;
i
<
l
->
i_count
;
i
++
)
populateLoadedSet
(
loaded
,
l
->
p_values
[
i
].
p_object
);
populateLoadedSet
(
loaded
,
(
vlc_object_t
*
)
l
->
p_values
[
i
].
p_address
);
vlc_list_release
(
l
);
}
...
...
modules/gui/qt4/dialogs/messages.cpp
View file @
7b1d9b54
...
...
@@ -309,7 +309,7 @@ void MessagesDialog::buildTree( QTreeWidgetItem *parentItem,
vlc_list_t
*
l
=
vlc_list_children
(
p_obj
);
for
(
int
i
=
0
;
i
<
l
->
i_count
;
i
++
)
buildTree
(
item
,
l
->
p_values
[
i
].
p_object
);
buildTree
(
item
,
(
vlc_object_t
*
)
l
->
p_values
[
i
].
p_address
);
vlc_list_release
(
l
);
}
...
...
src/misc/objects.c
View file @
7b1d9b54
...
...
@@ -403,7 +403,7 @@ void ObjectKillChildrens( vlc_object_t *p_obj )
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_
object
);
ObjectKillChildrens
(
p_list
->
p_values
[
i
].
p_
address
);
vlc_list_release
(
p_list
);
}
...
...
@@ -562,7 +562,7 @@ vlc_list_t *vlc_list_children( vlc_object_t *obj )
unsigned
i
=
0
;
for
(
priv
=
vlc_internals
(
obj
)
->
first
;
priv
;
priv
=
priv
->
next
)
l
->
p_values
[
i
++
].
p_
object
=
vlc_object_hold
(
vlc_externals
(
priv
));
l
->
p_values
[
i
++
].
p_
address
=
vlc_object_hold
(
vlc_externals
(
priv
));
}
libvlc_unlock
(
obj
->
p_libvlc
);
return
l
;
...
...
@@ -697,12 +697,8 @@ static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd,
*****************************************************************************/
void
vlc_list_release
(
vlc_list_t
*
p_list
)
{
int
i_index
;
for
(
i_index
=
0
;
i_index
<
p_list
->
i_count
;
i_index
++
)
{
vlc_object_release
(
p_list
->
p_values
[
i_index
].
p_object
);
}
for
(
int
i
=
0
;
i
<
p_list
->
i_count
;
i
++
)
vlc_object_release
(
p_list
->
p_values
[
i
].
p_address
);
free
(
p_list
->
p_values
);
free
(
p_list
);
...
...
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