Skip to content

V
vlc
Commit 3c99a3b2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

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

parent ed9fae5e
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 48 deletions
modules/control/rc.c
View file @ 3c99a3b2
...@@ -1157,15 +1157,9 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1157,15 +1157,9 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
} }
} }
else if( !strcmp( psz_cmd, "chapter_n" ) ) else if( !strcmp( psz_cmd, "chapter_n" ) )
{ var_SetVoid( p_input, "next-chapter" );
val.b_bool = true;
var_Set( p_input, "next-chapter", val );
}
else if( !strcmp( psz_cmd, "chapter_p" ) ) else if( !strcmp( psz_cmd, "chapter_p" ) )
{ var_SetVoid( p_input, "prev-chapter" );
val.b_bool = true;
var_Set( p_input, "prev-chapter", val );
}
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -1196,15 +1190,9 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1196,15 +1190,9 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
} }
} }
else if( !strcmp( psz_cmd, "title_n" ) ) else if( !strcmp( psz_cmd, "title_n" ) )
{ var_SetVoid( p_input, "next-title" );
val.b_bool = true;
var_Set( p_input, "next-title", val );
}
else if( !strcmp( psz_cmd, "title_p" ) ) else if( !strcmp( psz_cmd, "title_p" ) )
{ var_SetVoid( p_input, "prev-title" );
val.b_bool = true;
var_Set( p_input, "prev-title", val );
}
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_SUCCESS; return VLC_SUCCESS;
......
modules/gui/ncurses.c
View file @ 3c99a3b2
...@@ -1168,34 +1168,22 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) ...@@ -1168,34 +1168,22 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
case '[': case '[':
if( p_sys->p_input ) if( p_sys->p_input )
{ var_SetVoid( p_sys->p_input, "prev-title" );
val.b_bool = true;
var_Set( p_sys->p_input, "prev-title", val );
}
ReturnTrue; ReturnTrue;
case ']': case ']':
if( p_sys->p_input ) if( p_sys->p_input )
{ var_SetVoid( p_sys->p_input, "next-title" );
val.b_bool = true;
var_Set( p_sys->p_input, "next-title", val );
}
ReturnTrue; ReturnTrue;
case '<': case '<':
if( p_sys->p_input ) if( p_sys->p_input )
{ var_SetVoid( p_sys->p_input, "prev-chapter" );
val.b_bool = true;
var_Set( p_sys->p_input, "prev-chapter", val );
}
ReturnTrue; ReturnTrue;
case '>': case '>':
if( p_sys->p_input ) if( p_sys->p_input )
{ var_SetVoid( p_sys->p_input, "next-chapter" );
val.b_bool = true;
var_Set( p_sys->p_input, "next-chapter", val );
}
ReturnTrue; ReturnTrue;
case 'p': case 'p':
......
modules/gui/qt4/input_manager.cpp
View file @ 3c99a3b2
...@@ -664,8 +664,8 @@ void InputManager::sectionPrev() ...@@ -664,8 +664,8 @@ void InputManager::sectionPrev()
if( hasInput() ) if( hasInput() )
{ {
int i_type = var_Type( p_input, "next-chapter" ); int i_type = var_Type( p_input, "next-chapter" );
var_SetBool( p_input, (i_type & VLC_VAR_TYPE) != 0 ? var_SetVoid( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
"prev-chapter":"prev-title", true ); "prev-chapter":"prev-title" );
} }
} }
...@@ -674,8 +674,8 @@ void InputManager::sectionNext() ...@@ -674,8 +674,8 @@ void InputManager::sectionNext()
if( hasInput() ) if( hasInput() )
{ {
int i_type = var_Type( p_input, "next-chapter" ); int i_type = var_Type( p_input, "next-chapter" );
var_SetBool( p_input, (i_type & VLC_VAR_TYPE) != 0 ? var_SetVoid( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
"next-chapter":"next-title", true ); "next-chapter":"next-title" );
} }
} }
......
modules/gui/skins2/commands/cmd_dvd.cpp
View file @ 3c99a3b2
...@@ -31,9 +31,7 @@ void CmdDvdNextTitle::execute() ...@@ -31,9 +31,7 @@ void CmdDvdNextTitle::execute()
FIND_ANYWHERE ); FIND_ANYWHERE );
if( p_input ) if( p_input )
{ {
vlc_value_t val; var_SetVoid( p_input, "next-title" );
val.b_bool = true;
var_Set( p_input, "next-title", val );
vlc_object_release( p_input ); vlc_object_release( p_input );
} }
} }
...@@ -46,9 +44,7 @@ void CmdDvdPreviousTitle::execute() ...@@ -46,9 +44,7 @@ void CmdDvdPreviousTitle::execute()
FIND_ANYWHERE ); FIND_ANYWHERE );
if( p_input ) if( p_input )
{ {
vlc_value_t val; var_SetVoid( p_input, "prev-title" );
val.b_bool = true;
var_Set( p_input, "prev-title", val );
vlc_object_release( p_input ); vlc_object_release( p_input );
} }
} }
...@@ -61,9 +57,7 @@ void CmdDvdNextChapter::execute() ...@@ -61,9 +57,7 @@ void CmdDvdNextChapter::execute()
FIND_ANYWHERE ); FIND_ANYWHERE );
if( p_input ) if( p_input )
{ {
vlc_value_t val; var_SetVoid( p_input, "next-chapter" );
val.b_bool = true;
var_Set( p_input, "next-chapter", val );
vlc_object_release( p_input ); vlc_object_release( p_input );
} }
} }
...@@ -76,9 +70,7 @@ void CmdDvdPreviousChapter::execute() ...@@ -76,9 +70,7 @@ void CmdDvdPreviousChapter::execute()
FIND_ANYWHERE ); FIND_ANYWHERE );
if( p_input ) if( p_input )
{ {
vlc_value_t val; var_SetVoid( p_input, "prev-chapter" );
val.b_bool = true;
var_Set( p_input, "prev-chapter", val );
vlc_object_release( p_input ); 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