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
b06569fa
Commit
b06569fa
authored
Feb 06, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SD listing: remove module lookup hack
Based on an idea from Jean-Philippe André
parent
ccfd6a88
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
17 deletions
+1
-17
src/playlist/services_discovery.c
src/playlist/services_discovery.c
+1
-17
No files found.
src/playlist/services_discovery.c
View file @
b06569fa
...
@@ -291,27 +291,18 @@ int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist,
...
@@ -291,27 +291,18 @@ int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist,
if
(
!
p_sd
)
if
(
!
p_sd
)
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
module_t
*
m
=
module_find_by_shortcut
(
p_sd
->
psz_name
);
if
(
!
m
)
{
msg_Err
(
p_playlist
,
"No such module: %s"
,
p_sd
->
psz_name
);
vlc_sd_Destroy
(
p_sd
);
return
VLC_EGENERIC
;
}
/* Free in playlist_ServicesDiscoveryRemove */
/* Free in playlist_ServicesDiscoveryRemove */
vlc_sd_internal_t
*
p_sds
=
malloc
(
sizeof
(
*
p_sds
)
);
vlc_sd_internal_t
*
p_sds
=
malloc
(
sizeof
(
*
p_sds
)
);
if
(
!
p_sds
)
if
(
!
p_sds
)
{
{
vlc_sd_Destroy
(
p_sd
);
vlc_sd_Destroy
(
p_sd
);
module_release
(
m
);
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
}
playlist_item_t
*
p_node
;
playlist_item_t
*
p_node
;
/* Look for configuration chain "longname" */
/* Look for configuration chain "longname" */
const
char
*
psz_longname
=
NULL
;
const
char
*
psz_longname
=
"?"
;
if
(
p_sd
->
p_cfg
)
if
(
p_sd
->
p_cfg
)
{
{
config_chain_t
*
cfg
=
p_sd
->
p_cfg
;
config_chain_t
*
cfg
=
p_sd
->
p_cfg
;
...
@@ -326,17 +317,10 @@ int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist,
...
@@ -326,17 +317,10 @@ int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist,
}
}
}
}
/* Fallback on module's long name if not found */
if
(
!
psz_longname
)
{
psz_longname
=
module_get_name
(
m
,
true
);
}
PL_LOCK
;
PL_LOCK
;
p_node
=
playlist_NodeCreate
(
p_playlist
,
psz_longname
,
p_node
=
playlist_NodeCreate
(
p_playlist
,
psz_longname
,
p_playlist
->
p_root
,
0
,
NULL
);
p_playlist
->
p_root
,
0
,
NULL
);
PL_UNLOCK
;
PL_UNLOCK
;
module_release
(
m
);
vlc_event_attach
(
services_discovery_EventManager
(
p_sd
),
vlc_event_attach
(
services_discovery_EventManager
(
p_sd
),
vlc_ServicesDiscoveryItemAdded
,
vlc_ServicesDiscoveryItemAdded
,
...
...
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