Skip to content

V
vlc-1.1
Commit 9e2ad075 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

fix one potential refcount problem

parent 4aa55602
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
modules/control/rc.c
View file @ 9e2ad075
...@@ -1088,7 +1088,6 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1088,7 +1088,6 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
{ {
val.i_int = config_GetInt( p_intf, "key-jump+3sec" ); val.i_int = config_GetInt( p_intf, "key-jump+3sec" );
var_Set( p_intf->p_vlc, "key-pressed", val ); var_Set( p_intf->p_vlc, "key-pressed", val );
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -1096,14 +1095,12 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1096,14 +1095,12 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
{ {
val.i_int = config_GetInt( p_intf, "key-jump-3sec" ); val.i_int = config_GetInt( p_intf, "key-jump-3sec" );
var_Set( p_intf->p_vlc, "key-pressed", val ); var_Set( p_intf->p_vlc, "key-pressed", val );
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
else if ( !strcmp( psz_cmd, "faster" ) ) else if ( !strcmp( psz_cmd, "faster" ) )
{ {
val.b_bool = VLC_TRUE; val.b_bool = VLC_TRUE;
var_Set( p_input, "rate-faster", val ); var_Set( p_input, "rate-faster", val );
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -1111,7 +1108,6 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1111,7 +1108,6 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
else if ( !strcmp( psz_cmd, "slower" ) ) else if ( !strcmp( psz_cmd, "slower" ) )
{ {
val.b_bool = VLC_TRUE; val.b_bool = VLC_TRUE;
var_Set( p_input, "rate-slower", val ); var_Set( p_input, "rate-slower", val );
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -1119,7 +1115,6 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1119,7 +1115,6 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
else if ( !strcmp( psz_cmd, "normal" ) ) else if ( !strcmp( psz_cmd, "normal" ) )
{ {
val.i_int = INPUT_RATE_DEFAULT; val.i_int = INPUT_RATE_DEFAULT;
var_Set( p_input, "rate", val ); var_Set( p_input, "rate", val );
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -1160,7 +1155,6 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1160,7 +1155,6 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
val.b_bool = VLC_TRUE; val.b_bool = VLC_TRUE;
var_Set( p_input, "prev-chapter", val ); var_Set( p_input, "prev-chapter", val );
} }
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -1206,6 +1200,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1206,6 +1200,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
} }
/* Never reached. */ /* Never reached. */
vlc_object_release( p_input );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1309,7 +1304,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1309,7 +1304,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
/* Replay the current state of the system. */ /* Replay the current state of the system. */
msg_rc( STATUS_CHANGE "( New input: %s )", p_playlist->p_input->input.p_item->psz_uri ); msg_rc( STATUS_CHANGE "( New input: %s )", p_playlist->p_input->input.p_item->psz_uri );
msg_rc( STATUS_CHANGE "( audio volume: %d )", config_GetInt( p_intf, "volume" )); msg_rc( STATUS_CHANGE "( audio volume: %d )", config_GetInt( p_intf, "volume" ));
vlc_mutex_lock( &p_playlist->object_lock ); vlc_mutex_lock( &p_playlist->object_lock );
switch( p_playlist->status.i_status ) switch( p_playlist->status.i_status )
{ {
......
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