Commit 3c99a3b2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

(prev|next)-(chapter|title) is a void variable. Fix aborts.

parent ed9fae5e
......@@ -1157,15 +1157,9 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
}
}
else if( !strcmp( psz_cmd, "chapter_n" ) )
{
val.b_bool = true;
var_Set( p_input, "next-chapter", val );
}
var_SetVoid( p_input, "next-chapter" );
else if( !strcmp( psz_cmd, "chapter_p" ) )
{
val.b_bool = true;
var_Set( p_input, "prev-chapter", val );
}
var_SetVoid( p_input, "prev-chapter" );
vlc_object_release( p_input );
return VLC_SUCCESS;
}
......@@ -1196,15 +1190,9 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
}
}
else if( !strcmp( psz_cmd, "title_n" ) )
{
val.b_bool = true;
var_Set( p_input, "next-title", val );
}
var_SetVoid( p_input, "next-title" );
else if( !strcmp( psz_cmd, "title_p" ) )
{
val.b_bool = true;
var_Set( p_input, "prev-title", val );
}
var_SetVoid( p_input, "prev-title" );
vlc_object_release( p_input );
return VLC_SUCCESS;
......
......@@ -1168,34 +1168,22 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
case '[':
if( p_sys->p_input )
{
val.b_bool = true;
var_Set( p_sys->p_input, "prev-title", val );
}
var_SetVoid( p_sys->p_input, "prev-title" );
ReturnTrue;
case ']':
if( p_sys->p_input )
{
val.b_bool = true;
var_Set( p_sys->p_input, "next-title", val );
}
var_SetVoid( p_sys->p_input, "next-title" );
ReturnTrue;
case '<':
if( p_sys->p_input )
{
val.b_bool = true;
var_Set( p_sys->p_input, "prev-chapter", val );
}
var_SetVoid( p_sys->p_input, "prev-chapter" );
ReturnTrue;
case '>':
if( p_sys->p_input )
{
val.b_bool = true;
var_Set( p_sys->p_input, "next-chapter", val );
}
var_SetVoid( p_sys->p_input, "next-chapter" );
ReturnTrue;
case 'p':
......
......@@ -664,8 +664,8 @@ void InputManager::sectionPrev()
if( hasInput() )
{
int i_type = var_Type( p_input, "next-chapter" );
var_SetBool( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
"prev-chapter":"prev-title", true );
var_SetVoid( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
"prev-chapter":"prev-title" );
}
}
......@@ -674,8 +674,8 @@ void InputManager::sectionNext()
if( hasInput() )
{
int i_type = var_Type( p_input, "next-chapter" );
var_SetBool( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
"next-chapter":"next-title", true );
var_SetVoid( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
"next-chapter":"next-title" );
}
}
......
......@@ -31,9 +31,7 @@ void CmdDvdNextTitle::execute()
FIND_ANYWHERE );
if( p_input )
{
vlc_value_t val;
val.b_bool = true;
var_Set( p_input, "next-title", val );
var_SetVoid( p_input, "next-title" );
vlc_object_release( p_input );
}
}
......@@ -46,9 +44,7 @@ void CmdDvdPreviousTitle::execute()
FIND_ANYWHERE );
if( p_input )
{
vlc_value_t val;
val.b_bool = true;
var_Set( p_input, "prev-title", val );
var_SetVoid( p_input, "prev-title" );
vlc_object_release( p_input );
}
}
......@@ -61,9 +57,7 @@ void CmdDvdNextChapter::execute()
FIND_ANYWHERE );
if( p_input )
{
vlc_value_t val;
val.b_bool = true;
var_Set( p_input, "next-chapter", val );
var_SetVoid( p_input, "next-chapter" );
vlc_object_release( p_input );
}
}
......@@ -76,9 +70,7 @@ void CmdDvdPreviousChapter::execute()
FIND_ANYWHERE );
if( p_input )
{
vlc_value_t val;
val.b_bool = true;
var_Set( p_input, "prev-chapter", val );
var_SetVoid( p_input, "prev-chapter" );
vlc_object_release( p_input );
}
}
......
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