Commit 532e2f3e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

RAM: force meta data to UTF-8

As already stated (I think), this might be wrong. I have no clue what
codeset this file format is supposed to use.
parent effea1b9
...@@ -50,6 +50,7 @@ http://service.real.com/help/library/guides/realone/IntroGuide/HTML/htmfiles/ram ...@@ -50,6 +50,7 @@ http://service.real.com/help/library/guides/realone/IntroGuide/HTML/htmfiles/ram
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_demux.h> #include <vlc_demux.h>
#include <vlc_url.h> #include <vlc_url.h>
#include <vlc_charset.h>
#include "playlist.h" #include "playlist.h"
...@@ -282,7 +283,10 @@ static int Demux( demux_t *p_demux ) ...@@ -282,7 +283,10 @@ static int Demux( demux_t *p_demux )
&psz_cdnum, &psz_comments ); /* clipinfo has various sub parameters, which is parsed by this function */ &psz_cdnum, &psz_comments ); /* clipinfo has various sub parameters, which is parsed by this function */
} }
else if( !strcmp( psz_param, "author" ) ) else if( !strcmp( psz_param, "author" ) )
{
psz_author = decode_URI_duplicate(psz_value); psz_author = decode_URI_duplicate(psz_value);
EnsureUTF8( psz_author );
}
else if( !strcmp( psz_param, "start" ) ) else if( !strcmp( psz_param, "start" ) )
{ {
i_start = ParseTime( psz_value, strlen( psz_value ) ); i_start = ParseTime( psz_value, strlen( psz_value ) );
...@@ -304,9 +308,15 @@ static int Demux( demux_t *p_demux ) ...@@ -304,9 +308,15 @@ static int Demux( demux_t *p_demux )
} }
} }
else if( !strcmp( psz_param, "title" ) ) else if( !strcmp( psz_param, "title" ) )
{
psz_title = decode_URI_duplicate(psz_value); psz_title = decode_URI_duplicate(psz_value);
EnsureUTF8( psz_title );
}
else if( !strcmp( psz_param, "copyright" ) ) else if( !strcmp( psz_param, "copyright" ) )
{
psz_copyright = decode_URI_duplicate(psz_value); psz_copyright = decode_URI_duplicate(psz_value);
EnsureUTF8( psz_copyright );
}
else else
{ /* TODO: insert option anyway? Currently ignores*/ { /* TODO: insert option anyway? Currently ignores*/
/* INSERT_ELEM( ppsz_options, i_options, i_options, psz_option ); */ /* INSERT_ELEM( ppsz_options, i_options, i_options, psz_option ); */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment