Skip to content

V
vlc-1.1
Commit c57da819 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

* gtk: don't use input_ChangeArea.

parent a7017516
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 116 deletions
modules/gui/gtk/gtk_callbacks.c
View file @ c57da819
...@@ -231,106 +231,52 @@ gboolean GtkSliderPress( GtkWidget *widget, ...@@ -231,106 +231,52 @@ gboolean GtkSliderPress( GtkWidget *widget,
void GtkTitlePrev( GtkButton * button, gpointer user_data ) void GtkTitlePrev( GtkButton * button, gpointer user_data )
{ {
intf_thread_t * p_intf; intf_thread_t * p_intf = GtkGetIntf( button );
input_area_t * p_area;
int i_id;
p_intf = GtkGetIntf( button ); var_SetVoid( p_intf->p_sys->p_input, "prev-title" );
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
i_id = p_intf->p_sys->p_input->stream.p_selected_area->i_id - 1;
if( i_id > 0 )
{
p_area = p_intf->p_sys->p_input->stream.pp_areas[i_id];
vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
input_ChangeArea( p_intf->p_sys->p_input, p_area );
var_SetInteger( p_intf->p_sys->p_input, PLAYING_S );
p_intf->p_sys->b_title_update = VLC_TRUE;
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
GtkSetupMenus( p_intf );
}
p_intf->p_sys->b_title_update = VLC_TRUE;
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
GtkSetupMenus( p_intf );
vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock ); vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
} }
void GtkTitleNext( GtkButton * button, gpointer user_data ) void GtkTitleNext( GtkButton * button, gpointer user_data )
{ {
intf_thread_t * p_intf; intf_thread_t * p_intf = GtkGetIntf( button );
input_area_t * p_area;
unsigned int i_id;
p_intf = GtkGetIntf( button );
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
i_id = p_intf->p_sys->p_input->stream.p_selected_area->i_id + 1;
if( i_id < p_intf->p_sys->p_input->stream.i_area_nb )
{
p_area = p_intf->p_sys->p_input->stream.pp_areas[i_id];
vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
input_ChangeArea( p_intf->p_sys->p_input, p_area );
var_SetInteger( p_intf->p_sys->p_input, PLAYING_S );
p_intf->p_sys->b_title_update = VLC_TRUE; var_SetVoid( p_intf->p_sys->p_input, "next-title" );
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
GtkSetupMenus( p_intf );
}
p_intf->p_sys->b_title_update = VLC_TRUE;
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
GtkSetupMenus( p_intf );
vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock ); vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
} }
void GtkChapterPrev( GtkButton * button, gpointer user_data ) void GtkChapterPrev( GtkButton * button, gpointer user_data )
{ {
intf_thread_t * p_intf; intf_thread_t * p_intf = GtkGetIntf( button );
input_area_t * p_area;
p_intf = GtkGetIntf( button ); var_SetVoid( p_intf->p_sys->p_input, "prev-chapter" );
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
p_area = p_intf->p_sys->p_input->stream.p_selected_area;
if( p_area->i_part - 1 > 0 )
{
p_area->i_part--;
vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
input_ChangeArea( p_intf->p_sys->p_input, p_area );
var_SetInteger( p_intf->p_sys->p_input, PLAYING_S );
p_intf->p_sys->b_chapter_update = VLC_TRUE;
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
GtkSetupMenus( p_intf );
}
p_intf->p_sys->b_chapter_update = VLC_TRUE;
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
GtkSetupMenus( p_intf );
vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock ); vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
} }
void GtkChapterNext( GtkButton * button, gpointer user_data ) void GtkChapterNext( GtkButton * button, gpointer user_data )
{ {
intf_thread_t * p_intf; intf_thread_t * p_intf = GtkGetIntf( button );
input_area_t * p_area;
p_intf = GtkGetIntf( button ); var_SetVoid( p_intf->p_sys->p_input, "next-chapter" );
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
p_area = p_intf->p_sys->p_input->stream.p_selected_area;
if( p_area->i_part + 1 < p_area->i_part_nb )
{
p_area->i_part++;
vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
input_ChangeArea( p_intf->p_sys->p_input, p_area );
var_SetInteger( p_intf->p_sys->p_input, PLAYING_S );
p_intf->p_sys->b_chapter_update = VLC_TRUE;
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
GtkSetupMenus( p_intf );
}
p_intf->p_sys->b_chapter_update = VLC_TRUE;
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
GtkSetupMenus( p_intf );
vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock ); vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
} }
......
modules/gui/gtk/menu.c
View file @ c57da819
...@@ -160,33 +160,16 @@ void GtkPopupNavigationToggle( GtkCheckMenuItem * menuitem, ...@@ -160,33 +160,16 @@ void GtkPopupNavigationToggle( GtkCheckMenuItem * menuitem,
guint i_title = DATA2TITLE( user_data ); guint i_title = DATA2TITLE( user_data );
guint i_chapter = DATA2CHAPTER( user_data ); guint i_chapter = DATA2CHAPTER( user_data );
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock ); /* FIXME use "navigation" variable */
p_area = p_intf->p_sys->p_input->stream.p_selected_area; var_SetInteger( p_intf->p_sys->p_input, "title", i_title );
var_SetInteger( p_intf->p_sys->p_input, "chapter", i_chapter );
i_title = __MIN( i_title,
p_intf->p_sys->p_input->stream.i_area_nb - 1 );
i_title = __MAX( i_title, 1 );
if( p_area != p_intf->p_sys->p_input->stream.pp_areas[i_title] )
{
p_area = p_intf->p_sys->p_input->stream.pp_areas[i_title];
p_intf->p_sys->b_title_update = VLC_TRUE;
}
i_chapter = __MIN( i_chapter, p_area->i_part_nb - 1 );
i_chapter = __MAX( i_chapter, 1 );
p_area->i_part = i_chapter;
vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
input_ChangeArea( p_intf->p_sys->p_input, (input_area_t*)p_area );
p_intf->p_sys->b_title_update = VLC_TRUE;
p_intf->p_sys->b_chapter_update = VLC_TRUE; p_intf->p_sys->b_chapter_update = VLC_TRUE;
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock ); vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
GtkSetupMenus( p_intf ); GtkSetupMenus( p_intf );
vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock ); vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
} }
} }
...@@ -235,22 +218,12 @@ void GtkMenubarTitleToggle( GtkCheckMenuItem * menuitem, gpointer user_data ) ...@@ -235,22 +218,12 @@ void GtkMenubarTitleToggle( GtkCheckMenuItem * menuitem, gpointer user_data )
{ {
guint i_title = (ptrdiff_t)user_data; guint i_title = (ptrdiff_t)user_data;
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock ); var_SetInteger( p_intf->p_sys->p_input, "title", i_title );
i_title = __MIN( i_title,
p_intf->p_sys->p_input->stream.i_area_nb - 1 );
i_title = __MAX( i_title, 1 );
vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
input_ChangeArea( p_intf->p_sys->p_input,
p_intf->p_sys->p_input->stream.pp_areas[i_title] );
p_intf->p_sys->b_title_update = VLC_TRUE; p_intf->p_sys->b_title_update = VLC_TRUE;
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock ); vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
GtkSetupMenus( p_intf ); GtkSetupMenus( p_intf );
vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock ); vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
p_intf->p_sys->b_title_update = VLC_FALSE;
var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
} }
} }
...@@ -271,13 +244,7 @@ void GtkMenubarChapterToggle( GtkCheckMenuItem * menuitem, gpointer user_data ) ...@@ -271,13 +244,7 @@ void GtkMenubarChapterToggle( GtkCheckMenuItem * menuitem, gpointer user_data )
if( menuitem->active && !p_intf->p_sys->b_chapter_update ) if( menuitem->active && !p_intf->p_sys->b_chapter_update )
{ {
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock ); var_SetInteger( p_intf->p_sys->p_input, "chapter", i_chapter );
i_chapter = __MIN( i_chapter, p_area->i_part_nb - 1 );
i_chapter = __MAX( i_chapter, 1 );
p_area->i_part = i_chapter;
vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
input_ChangeArea( p_intf->p_sys->p_input, (input_area_t*)p_area );
p_intf->p_sys->b_chapter_update = VLC_TRUE; p_intf->p_sys->b_chapter_update = VLC_TRUE;
p_popup_menu = GTK_WIDGET( gtk_object_get_data( GTK_OBJECT( p_popup_menu = GTK_WIDGET( gtk_object_get_data( GTK_OBJECT(
...@@ -288,8 +255,6 @@ void GtkMenubarChapterToggle( GtkCheckMenuItem * menuitem, gpointer user_data ) ...@@ -288,8 +255,6 @@ void GtkMenubarChapterToggle( GtkCheckMenuItem * menuitem, gpointer user_data )
vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock ); vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
p_intf->p_sys->b_chapter_update = VLC_FALSE; p_intf->p_sys->b_chapter_update = VLC_FALSE;
var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
} }
} }
......
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