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
9b2c414c
Commit
9b2c414c
authored
Jan 19, 2015
by
Thomas Guillem
Committed by
Rémi Denis-Courmont
Jan 20, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libvlc: don't use functions with leading underscore
Signed-off-by:
Rémi Denis-Courmont
<
remi@remlab.net
>
parent
6bf8fffe
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
19 deletions
+18
-19
lib/media_discoverer.c
lib/media_discoverer.c
+5
-5
lib/media_list.c
lib/media_list.c
+10
-11
lib/media_list_internal.h
lib/media_list_internal.h
+3
-3
No files found.
lib/media_discoverer.c
View file @
9b2c414c
...
...
@@ -37,7 +37,7 @@
#include "libvlc_internal.h"
#include "media_internal.h" // libvlc_media_new_from_input_item()
#include "media_list_internal.h" //
_libvlc_media_list
_add_media()
#include "media_list_internal.h" //
libvlc_media_list_internal
_add_media()
struct
libvlc_media_discoverer_t
{
...
...
@@ -87,7 +87,7 @@ static void services_discovery_item_added( const vlc_event_t * p_event,
/* Insert the md into the root list */
libvlc_media_list_lock
(
p_mdis
->
p_mlist
);
_libvlc_media_list
_add_media
(
p_mdis
->
p_mlist
,
p_catmd
);
libvlc_media_list_internal
_add_media
(
p_mdis
->
p_mlist
,
p_catmd
);
libvlc_media_list_unlock
(
p_mdis
->
p_mlist
);
/* We don't release the mlist cause the dictionary
...
...
@@ -97,7 +97,7 @@ static void services_discovery_item_added( const vlc_event_t * p_event,
}
libvlc_media_list_lock
(
p_mlist
);
_libvlc_media_list
_add_media
(
p_mlist
,
p_md
);
libvlc_media_list_internal
_add_media
(
p_mlist
,
p_md
);
libvlc_media_list_unlock
(
p_mlist
);
libvlc_media_release
(
p_md
);
...
...
@@ -121,7 +121,7 @@ static void services_discovery_item_removed( const vlc_event_t * p_event,
p_md
=
libvlc_media_list_item_at_index
(
p_mdis
->
p_mlist
,
i
);
if
(
p_md
->
p_input_item
==
p_item
)
{
_libvlc_media_list
_remove_index
(
p_mdis
->
p_mlist
,
i
);
libvlc_media_list_internal
_remove_index
(
p_mdis
->
p_mlist
,
i
);
break
;
}
}
...
...
@@ -140,7 +140,7 @@ static void services_discovery_removeall( const vlc_event_t * p_event,
libvlc_media_list_lock
(
p_mdis
->
p_mlist
);
for
(
int
i
=
0
;
i
<
libvlc_media_list_count
(
p_mdis
->
p_mlist
);
i
++
)
{
_libvlc_media_list
_remove_index
(
p_mdis
->
p_mlist
,
i
);
libvlc_media_list_internal
_remove_index
(
p_mdis
->
p_mlist
,
i
);
}
libvlc_media_list_unlock
(
p_mdis
->
p_mlist
);
}
...
...
lib/media_list.c
View file @
9b2c414c
...
...
@@ -334,13 +334,13 @@ int libvlc_media_list_add_media( libvlc_media_list_t * p_mlist,
{
if
(
!
mlist_is_writable
(
p_mlist
)
)
return
-
1
;
_libvlc_media_list
_add_media
(
p_mlist
,
p_md
);
libvlc_media_list_internal
_add_media
(
p_mlist
,
p_md
);
return
0
;
}
/* LibVLC internal version */
void
_libvlc_media_list
_add_media
(
libvlc_media_list_t
*
p_mlist
,
libvlc_media_t
*
p_md
)
void
libvlc_media_list_internal
_add_media
(
libvlc_media_list_t
*
p_mlist
,
libvlc_media_t
*
p_md
)
{
libvlc_media_retain
(
p_md
);
...
...
@@ -362,15 +362,14 @@ int libvlc_media_list_insert_media( libvlc_media_list_t * p_mlist,
{
if
(
!
mlist_is_writable
(
p_mlist
)
)
return
-
1
;
_libvlc_media_list
_insert_media
(
p_mlist
,
p_md
,
index
);
libvlc_media_list_internal
_insert_media
(
p_mlist
,
p_md
,
index
);
return
0
;
}
/* LibVLC internal version */
void
_libvlc_media_list_insert_media
(
libvlc_media_list_t
*
p_mlist
,
libvlc_media_t
*
p_md
,
int
index
)
void
libvlc_media_list_internal_insert_media
(
libvlc_media_list_t
*
p_mlist
,
libvlc_media_t
*
p_md
,
int
index
)
{
libvlc_media_retain
(
p_md
);
...
...
@@ -389,12 +388,12 @@ int libvlc_media_list_remove_index( libvlc_media_list_t * p_mlist,
{
if
(
!
mlist_is_writable
(
p_mlist
)
)
return
-
1
;
return
_libvlc_media_list
_remove_index
(
p_mlist
,
index
);
return
libvlc_media_list_internal
_remove_index
(
p_mlist
,
index
);
}
/* LibVLC internal version */
int
_libvlc_media_list
_remove_index
(
libvlc_media_list_t
*
p_mlist
,
int
index
)
int
libvlc_media_list_internal
_remove_index
(
libvlc_media_list_t
*
p_mlist
,
int
index
)
{
libvlc_media_t
*
p_md
;
...
...
lib/media_list_internal.h
View file @
9b2c414c
...
...
@@ -52,15 +52,15 @@ struct libvlc_media_list_t
};
/* Media List */
void
_libvlc_media_list
_add_media
(
void
libvlc_media_list_internal
_add_media
(
libvlc_media_list_t
*
p_mlist
,
libvlc_media_t
*
p_md
);
void
_libvlc_media_list
_insert_media
(
void
libvlc_media_list_internal
_insert_media
(
libvlc_media_list_t
*
p_mlist
,
libvlc_media_t
*
p_md
,
int
index
);
int
_libvlc_media_list
_remove_index
(
int
libvlc_media_list_internal
_remove_index
(
libvlc_media_list_t
*
p_mlist
,
int
index
);
#endif
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