Skip to content

V
vlc-1.1
Commit aa41414d authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* src/input/control.c: fixed INPUT_DEL_BOOKMARK.

parent 0880ea2e
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 33 deletions
src/input/control.c
View file @ aa41414d
...@@ -85,45 +85,27 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) ...@@ -85,45 +85,27 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
break; break;
case INPUT_DEL_BOOKMARK: case INPUT_DEL_BOOKMARK:
p_bkmk = (seekpoint_t *)va_arg( args, seekpoint_t * ); i_bkmk = (int)va_arg( args, int );
if( p_input->i_bookmarks ) if( i_bkmk < p_input->i_bookmarks )
{ {
int i; int i;
p_bkmk = p_input->pp_bookmarks[i_bkmk];
TAB_REMOVE( p_input->i_bookmarks, p_input->pp_bookmarks,
p_bkmk );
vlc_seekpoint_Delete( p_bkmk );
/* Reflect the changes on the object var */
var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 );
for( i = 0; i < p_input->i_bookmarks; i++ ) for( i = 0; i < p_input->i_bookmarks; i++ )
{ {
if( ( p_bkmk->i_byte_offset && val.i_int = i;
p_input->pp_bookmarks[i]->i_byte_offset == text.psz_string = p_input->pp_bookmarks[i]->psz_name;
p_bkmk->i_byte_offset ) || var_Change( p_input, "bookmark", VLC_VAR_ADDCHOICE,
( p_bkmk->i_time_offset && &val, &text );
p_input->pp_bookmarks[i]->i_time_offset ==
p_bkmk->i_time_offset ) ||
( !p_bkmk->i_byte_offset && !p_bkmk->i_time_offset &&
p_input->pp_bookmarks[i]->i_byte_offset ==
p_bkmk->i_byte_offset ) )
{
p_bkmk = p_input->pp_bookmarks[i];
break;
}
}
if( i < p_input->i_bookmarks )
{
TAB_REMOVE( p_input->i_bookmarks, p_input->pp_bookmarks,
p_bkmk );
vlc_seekpoint_Delete( p_bkmk );
/* Reflect the changes on the object var */
var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES,
0, 0 );
for( i = 0; i < p_input->i_bookmarks; i++ )
{
val.i_int = i;
text.psz_string = p_input->pp_bookmarks[i]->psz_name;
var_Change( p_input, "bookmark", VLC_VAR_ADDCHOICE,
&val, &text );
}
} }
i_ret = VLC_SUCCESS;
} }
i_ret = VLC_SUCCESS; else i_ret = VLC_EGENERIC;
break; break;
case INPUT_GET_BOOKMARKS: case INPUT_GET_BOOKMARKS:
...@@ -163,6 +145,7 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) ...@@ -163,6 +145,7 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
p_bkmk ); p_bkmk );
vlc_seekpoint_Delete( p_bkmk ); vlc_seekpoint_Delete( p_bkmk );
} }
var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 );
} }
i_ret = VLC_SUCCESS; i_ret = VLC_SUCCESS;
break; break;
......
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