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
b1580c14
Commit
b1580c14
authored
May 28, 2006
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
this patch allows xml comments directly before the root node. Patch by Daniel Stranger.
parent
4e3a00fb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
15 deletions
+11
-15
modules/demux/playlist/xspf.c
modules/demux/playlist/xspf.c
+11
-15
No files found.
modules/demux/playlist/xspf.c
View file @
b1580c14
...
@@ -88,30 +88,25 @@ int xspf_import_Demux( demux_t *p_demux )
...
@@ -88,30 +88,25 @@ int xspf_import_Demux( demux_t *p_demux )
i_ret
=
VLC_EGENERIC
;
i_ret
=
VLC_EGENERIC
;
}
}
/* start with parsing the root node */
/* locating the root node */
if
(
i_ret
==
VLC_SUCCESS
)
while
(
i_ret
==
VLC_SUCCESS
&&
xml_ReaderNodeType
(
p_xml_reader
)
!=
XML_READER_STARTELEM
)
if
(
xml_ReaderRead
(
p_xml_reader
)
!=
1
)
if
(
xml_ReaderRead
(
p_xml_reader
)
!=
1
)
{
{
msg_Err
(
p_demux
,
"can't read xml stream"
);
msg_Err
(
p_demux
,
"can't read xml stream"
);
i_ret
=
VLC_EGENERIC
;
i_ret
=
VLC_EGENERIC
;
}
}
/* checking root node
typ
e */
/* checking root node
nam
e */
if
(
i_ret
==
VLC_SUCCESS
)
if
(
i_ret
==
VLC_SUCCESS
)
if
(
xml_ReaderNodeType
(
p_xml_reader
)
!=
XML_READER_STARTELEM
)
{
psz_name
=
xml_ReaderName
(
p_xml_reader
);
if
(
!
psz_name
||
strcmp
(
psz_name
,
"playlist"
)
)
{
{
msg_Err
(
p_demux
,
"invalid root node type: %i"
,
msg_Err
(
p_demux
,
"invalid root node name: %s"
,
psz_name
);
xml_ReaderNodeType
(
p_xml_reader
)
);
i_ret
=
VLC_EGENERIC
;
i_ret
=
VLC_EGENERIC
;
}
}
/* checking root node name */
FREE_NAME
();
if
(
i_ret
==
VLC_SUCCESS
)
psz_name
=
xml_ReaderName
(
p_xml_reader
);
if
(
!
psz_name
||
strcmp
(
psz_name
,
"playlist"
)
)
{
msg_Err
(
p_demux
,
"invalid root node name: %s"
,
psz_name
);
i_ret
=
VLC_EGENERIC
;
}
}
FREE_NAME
();
i_ret
=
parse_playlist_node
(
p_demux
,
p_playlist
,
p_current
,
NULL
,
i_ret
=
parse_playlist_node
(
p_demux
,
p_playlist
,
p_current
,
NULL
,
p_xml_reader
,
"playlist"
);
p_xml_reader
,
"playlist"
);
...
@@ -135,7 +130,8 @@ int xspf_import_Control( demux_t *p_demux, int i_query, va_list args )
...
@@ -135,7 +130,8 @@ int xspf_import_Control( demux_t *p_demux, int i_query, va_list args )
* \brief parse the root node of a XSPF playlist
* \brief parse the root node of a XSPF playlist
* \param p_demux demuxer instance
* \param p_demux demuxer instance
* \param p_playlist playlist instance
* \param p_playlist playlist instance
* \param p_item current playlist node
* \param p_item current playlist item
* \param p_input current input item
* \param p_xml_reader xml reader instance
* \param p_xml_reader xml reader instance
* \param psz_element name of element to parse
* \param psz_element name of element to parse
*/
*/
...
...
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