#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <vlc_meta.h>
+#include <vlc_charset.h>
#include <assert.h>
#include <libmodplug/modplug.h>
const int i_bk = ( p_sys->fmt.audio.i_bitspersample / 8 ) *
p_sys->fmt.audio.i_channels;
- p_frame = block_New( p_demux, p_sys->fmt.audio.i_rate / 10 * i_bk );
+ p_frame = block_Alloc( p_sys->fmt.audio.i_rate / 10 * i_bk );
if( !p_frame )
return -1;
char *psz_module_info, *psz_instrument_info;
unsigned i_temp_index = 0;
const char *psz_name = ModPlug_GetName( p_sys->f );
- if( psz_name && *psz_name )
+ if( psz_name && *psz_name && IsUTF8( psz_name ) )
vlc_meta_SetTitle( p_meta, psz_name );
/* Comment field from artist - not in every type of MOD */
psz_name = ModPlug_GetMessage( p_sys->f );
- if( psz_name && *psz_name )
+ if( psz_name && *psz_name && IsUTF8( psz_name ) )
vlc_meta_SetDescription( p_meta, psz_name );
/* Instruments only in newer MODs - so don't show if 0 */
{
char lBuffer[33];
ModPlug_InstrumentName( p_sys->f, i, lBuffer );
- if ( !lBuffer[0] ) continue; // don't add empty fields.
+ if ( !lBuffer[0] || !IsUTF8( lBuffer ) ) continue;
i_temp_index += snprintf( &psz_temp[i_temp_index], sizeof(psz_temp) - i_temp_index, "%s\n", lBuffer );
}
{
char psz_buffer[33];
ModPlug_SampleName( p_sys->f, i, psz_buffer );
- if ( !psz_buffer[0] ) continue; // don't add empty fields.
+ if ( !psz_buffer[0] || !IsUTF8( psz_buffer ) ) continue;
i_temp_index += snprintf( &psz_temp[i_temp_index], sizeof(psz_temp) - i_temp_index, "%s\n", psz_buffer );
}