Commit eb463cab authored by zorglub's avatar zorglub
Browse files

Fix a few bugs

parent b5c95699
...@@ -275,7 +275,7 @@ int __var_Create( vlc_object_t *p_this, const char *psz_name, int i_type ) ...@@ -275,7 +275,7 @@ int __var_Create( vlc_object_t *p_this, const char *psz_name, int i_type )
vlc_value_t val; vlc_value_t val;
if( InheritValue( p_this, psz_name, &val, p_var->i_type ) if( InheritValue( p_this, psz_name, &val, p_var->i_type )
== VLC_SUCCESS ); == VLC_SUCCESS )
{ {
/* Free data if needed */ /* Free data if needed */
p_var->pf_free( &p_var->val ); p_var->pf_free( &p_var->val );
...@@ -619,7 +619,7 @@ int __var_Change( vlc_object_t *p_this, const char *psz_name, ...@@ -619,7 +619,7 @@ int __var_Change( vlc_object_t *p_this, const char *psz_name,
vlc_value_t val; vlc_value_t val;
if( InheritValue( p_this, psz_name, &val, p_var->i_type ) if( InheritValue( p_this, psz_name, &val, p_var->i_type )
== VLC_SUCCESS ); == VLC_SUCCESS )
{ {
/* Duplicate already done */ /* Duplicate already done */
......
...@@ -232,7 +232,7 @@ int playlist_AskForArtEnqueue( playlist_t *p_playlist, ...@@ -232,7 +232,7 @@ int playlist_AskForArtEnqueue( playlist_t *p_playlist,
p_playlist->p_secondary_preparse->i_waiting, p_playlist->p_secondary_preparse->i_waiting,
i, p ); i, p );
vlc_mutex_unlock( &p_playlist->p_secondary_preparse->object_lock ); vlc_mutex_unlock( &p_playlist->p_secondary_preparse->object_lock );
vlc_cond_signal( &p_playlist->p_secondary_preparse->object_lock ); vlc_cond_signal( &p_playlist->p_secondary_preparse->object_wait );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
...@@ -206,19 +206,15 @@ static void EndPlaylist( playlist_t *p_playlist ) ...@@ -206,19 +206,15 @@ static void EndPlaylist( playlist_t *p_playlist )
*****************************************************************************/ *****************************************************************************/
static void RunPreparse ( playlist_preparse_t *p_obj ) static void RunPreparse ( playlist_preparse_t *p_obj )
{ {
playlist_t *p_playlist = (playlist_t *)p_obj->p_parent;
/* Tell above that we're ready */ /* Tell above that we're ready */
vlc_thread_ready( p_obj ); vlc_thread_ready( p_obj );
playlist_PreparseLoop( p_obj ); playlist_PreparseLoop( p_obj );
} }
static void RunSecondaryPreparse( playlist_secondary_preparse_t *p_obj ) static void RunSecondaryPreparse( playlist_secondary_preparse_t *p_obj )
{ {
playlist_t *p_playlist = (playlist_t *)p_obj->p_parent;
/* Tell above that we're ready */ /* Tell above that we're ready */
vlc_thread_ready( p_obj ); vlc_thread_ready( p_obj );
playlist_SecondaryPreparseLoop( p_obj ); playlist_SecondaryPreparseLoop( p_obj );
} }
......
...@@ -240,7 +240,7 @@ void streaming_ParameterApply( sout_param_t *p_param, char **ppsz_dest, ...@@ -240,7 +240,7 @@ void streaming_ParameterApply( sout_param_t *p_param, char **ppsz_dest,
break; break;
case VLC_VAR_STRING: case VLC_VAR_STRING:
assert( ppsz_dest ); assert( ppsz_dest );
FREENULL( **ppsz_dest ); free( *ppsz_dest );
*ppsz_dest = p_param->value.psz_string ? *ppsz_dest = p_param->value.psz_string ?
strdup( p_param->value.psz_string ) : strdup( p_param->value.psz_string ) :
NULL; NULL;
......
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