videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-08-31 06:46:39 +02:00
Code Releases Activity

SD_mediadirs: no need to strdup.

Browse Source
This commit is contained in:
Rémi Duraffort 2009-09-22 22:43:51 +02:00
parent d0142f4e91
commit f0ef421321
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/services_discovery/mediadirs.c
View File

@ -107,7 +107,7 @@ struct services_discovery_sys_t
enum type_e i_type;
char* psz_dir[2];
char* psz_var;
const char* psz_var;
};
/*****************************************************************************
@ -129,21 +129,21 @@ static int Open( vlc_object_t *p_this, enum type_e i_type )
p_sys->psz_dir[0] = config_GetUserDir( VLC_VIDEOS_DIR );
p_sys->psz_dir[1] = var_CreateGetString( p_sd, "input-record-path" );
p_sys->psz_var = strdup( "record-file" );
p_sys->psz_var = "record-file";
}
else if( p_sys->i_type == Audio )
{
p_sys->psz_dir[0] = config_GetUserDir( VLC_MUSIC_DIR );
p_sys->psz_dir[1] = var_CreateGetString( p_sd, "input-record-path" );
p_sys->psz_var = strdup( "record-file" );
p_sys->psz_var = "record-file";
}
else if( p_sys->i_type == Picture )
{
p_sys->psz_dir[0] = config_GetUserDir( VLC_PICTURES_DIR );
p_sys->psz_dir[1] = var_CreateGetString( p_sd, "snapshot-path" );
p_sys->psz_var = strdup( "snapshot-file" );
p_sys->psz_var = "snapshot-file";
}
else
{
@ -156,7 +156,6 @@ static int Open( vlc_object_t *p_this, enum type_e i_type )
if( vlc_clone( &p_sys->thread, Run, p_sd, VLC_THREAD_PRIORITY_LOW ) )
{
var_DelCallback( p_sd->p_libvlc, p_sys->psz_var, onNewFileAdded, p_sd );
free( p_sys->psz_var );
free( p_sys->psz_dir[1] );
free( p_sys->psz_dir[0] );
free( p_sys );
@ -233,7 +232,6 @@ static void Close( vlc_object_t *p_this )
var_DelCallback( p_sd->p_libvlc, p_sys->psz_var, onNewFileAdded, p_sd );
free( p_sys->psz_var );
free( p_sys->psz_dir[1] );
free( p_sys->psz_dir[0] );
free( p_sys );