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
48c9ee21
Commit
48c9ee21
authored
Jun 25, 2005
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shoutcast genres fix by Jonas A. Larsen
parent
0e650ec3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
2 deletions
+25
-2
modules/demux/playlist/b4s.c
modules/demux/playlist/b4s.c
+25
-2
No files found.
modules/demux/playlist/b4s.c
View file @
48c9ee21
...
@@ -48,6 +48,7 @@ struct demux_sys_t
...
@@ -48,6 +48,7 @@ struct demux_sys_t
*****************************************************************************/
*****************************************************************************/
static
int
Demux
(
demux_t
*
p_demux
);
static
int
Demux
(
demux_t
*
p_demux
);
static
int
Control
(
demux_t
*
p_demux
,
int
i_query
,
va_list
args
);
static
int
Control
(
demux_t
*
p_demux
,
int
i_query
,
va_list
args
);
static
char
*
get_next_token
(
char
*
cur_string
);
static
int
IsWhitespace
(
char
*
psz_string
);
static
int
IsWhitespace
(
char
*
psz_string
);
static
void
ShoutcastAdd
(
playlist_t
*
p_playlist
,
playlist_item_t
*
p_genre
,
static
void
ShoutcastAdd
(
playlist_t
*
p_playlist
,
playlist_item_t
*
p_genre
,
playlist_item_t
*
p_bitrate
,
playlist_item_t
*
p_item
,
playlist_item_t
*
p_bitrate
,
playlist_item_t
*
p_item
,
...
@@ -360,8 +361,22 @@ static int Demux( demux_t *p_demux )
...
@@ -360,8 +361,22 @@ static int Demux( demux_t *p_demux )
vlc_input_item_CopyOptions
(
&
p_current
->
input
,
vlc_input_item_CopyOptions
(
&
p_current
->
input
,
&
p_item
->
input
);
&
p_item
->
input
);
if
(
b_shoutcast
)
if
(
b_shoutcast
)
{
char
*
psz_genreToken
;
char
*
psz_otherToken
;
psz_genreToken
=
psz_genre
;
while
(
psz_genreToken
&&
(
psz_otherToken
=
get_next_token
(
psz_genreToken
)))
{
ShoutcastAdd
(
p_playlist
,
p_genre
,
p_bitrate
,
p_item
,
ShoutcastAdd
(
p_playlist
,
p_genre
,
p_bitrate
,
p_item
,
psz_genre
,
psz_bitrate
);
psz_genreToken
,
psz_bitrate
);
psz_genreToken
=
psz_otherToken
;
}
}
#define FREE(a) if( a ) free( a ); a = NULL;
#define FREE(a) if( a ) free( a ); a = NULL;
FREE
(
psz_name
);
FREE
(
psz_name
);
FREE
(
psz_mrl
);
FREE
(
psz_mrl
);
...
@@ -410,6 +425,14 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
...
@@ -410,6 +425,14 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
static
char
*
get_next_token
(
char
*
cur_string
)
{
while
(
*
cur_string
&&
!
isspace
(
*
cur_string
))
cur_string
++
;
if
(
!*
cur_string
)
return
NULL
;
*
cur_string
++
=
'\0'
;
while
(
*
cur_string
&&
isspace
(
*
cur_string
))
cur_string
++
;
return
cur_string
;
}
static
int
IsWhitespace
(
char
*
psz_string
)
static
int
IsWhitespace
(
char
*
psz_string
)
{
{
while
(
*
psz_string
)
while
(
*
psz_string
)
...
...
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