Skip to content

V
vlc-1.1
Commit 7489cd23 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* legacy changes that might be useful if the gtk plugin is ever revived, 

    and are just to be utterly ignored otherwise.
parent 8329bd85
Expand all Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 62 deletions
modules/gui/gtk/gnome.c
View file @ 7489cd23
......@@ -344,7 +344,7 @@ static void Manage( intf_thread_t *p_intf )
}
gnome_popup_menu_do_popup( p_intf->p_sys->p_popup,
NULL, NULL, NULL, NULL );
NULL, NULL, NULL, NULL, NULL );
p_intf->b_menu_change = 0;
}
......
modules/gui/gtk/gnome_interface.c
View file @ 7489cd23
This diff is collapsed.
modules/gui/gtk/gnome_support.c
View file @ 7489cd23
......@@ -126,6 +126,7 @@ create_pixmap (GtkWidget *widget,
}
/* This is an internally used function to create imlib images. */
#if 0
GdkImlibImage*
create_image (const gchar *filename)
{
......@@ -143,4 +144,5 @@ create_image (const gchar *filename)
g_free (pathname);
return image;
}
#endif
modules/gui/gtk/gnome_support.h
View file @ 7489cd23
......@@ -30,5 +30,5 @@ GtkWidget* create_pixmap (GtkWidget *widget,
const gchar *filename,
gboolean gnome_pixmap);
GdkImlibImage* create_image (const gchar *filename);
//GdkImlibImage* create_image (const gchar *filename);
modules/gui/gtk/gtk.c
View file @ 7489cd23
......@@ -440,7 +440,7 @@ static int Manage( intf_thread_t *p_intf )
vout_thread_t *p_vout = NULL;
vlc_bool_t b_need_menus = VLC_FALSE;
vlc_mutex_lock( &p_input->stream.stream_lock );
//vlc_mutex_lock( &p_input->stream.stream_lock );
if( !p_input->b_die )
{
......@@ -481,9 +481,9 @@ static int Manage( intf_thread_t *p_intf )
double f_fpos = (double)newvalue / 100.0;
/* release the lock to be able to seek */
vlc_mutex_unlock( &p_input->stream.stream_lock );
//vlc_mutex_unlock( &p_input->stream.stream_lock );
var_SetFloat( p_input, "position", f_fpos );
vlc_mutex_lock( &p_input->stream.stream_lock );
//vlc_mutex_lock( &p_input->stream.stream_lock );
}
/* Update the old value */
......@@ -536,7 +536,7 @@ static int Manage( intf_thread_t *p_intf )
}
}
vlc_mutex_unlock( &p_input->stream.stream_lock );
//vlc_mutex_unlock( &p_input->stream.stream_lock );
}
else if( p_intf->p_sys->b_playing && !p_intf->b_die )
{
......
modules/gui/gtk/gtk_interface.c
View file @ 7489cd23
......@@ -158,7 +158,7 @@ create_intf_window (void)
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_file_menu", menubar_file_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_file), menubar_file_menu);
menubar_file_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menubar_file_menu));
menubar_file_menu_accels = gtk_menu_get_accel_group (GTK_MENU (menubar_file_menu));
menubar_open = gtk_menu_item_new_with_label ("");
tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_open)->child),
......@@ -279,7 +279,7 @@ create_intf_window (void)
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_view_menu", menubar_view_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_view), menubar_view_menu);
menubar_view_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menubar_view_menu));
menubar_view_menu_accels = gtk_menu_get_accel_group (GTK_MENU (menubar_view_menu));
menubar_interface_hide = gtk_menu_item_new_with_label ("");
tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_interface_hide)->child),
......@@ -396,7 +396,7 @@ create_intf_window (void)
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_settings_menu", menubar_settings_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_settings), menubar_settings_menu);
menubar_settings_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menubar_settings_menu));
menubar_settings_menu_accels = gtk_menu_get_accel_group (GTK_MENU (menubar_settings_menu));
menubar_preferences = gtk_menu_item_new_with_label ("");
tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_preferences)->child),
......@@ -426,7 +426,7 @@ create_intf_window (void)
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_config_audio_menu", menubar_config_audio_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_config_audio), menubar_config_audio_menu);
menubar_config_audio_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menubar_config_audio_menu));
menubar_config_audio_menu_accels = gtk_menu_get_accel_group (GTK_MENU (menubar_config_audio_menu));
menubar_audio = gtk_menu_item_new_with_label ("");
tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_audio)->child),
......@@ -508,7 +508,7 @@ create_intf_window (void)
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_config_video_menu", menubar_config_video_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_config_video), menubar_config_video_menu);
menubar_config_video_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menubar_config_video_menu));
menubar_config_video_menu_accels = gtk_menu_get_accel_group (GTK_MENU (menubar_config_video_menu));
menubar_subpictures = gtk_menu_item_new_with_label ("");
tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_subpictures)->child),
......@@ -580,7 +580,7 @@ create_intf_window (void)
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_help_menu", menubar_help_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_help), menubar_help_menu);
menubar_help_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menubar_help_menu));
menubar_help_menu_accels = gtk_menu_get_accel_group (GTK_MENU (menubar_help_menu));
menubar_about = gtk_menu_item_new_with_label ("");
tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_about)->child),
......@@ -601,16 +601,16 @@ create_intf_window (void)
gtk_widget_show (toolbar_handlebox);
gtk_box_pack_start (GTK_BOX (window_vbox), toolbar_handlebox, FALSE, TRUE, 0);
toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
toolbar = gtk_toolbar_new ();
gtk_widget_ref (toolbar);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar", toolbar,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (toolbar);
gtk_container_add (GTK_CONTAINER (toolbar_handlebox), toolbar);
gtk_container_set_border_width (GTK_CONTAINER (toolbar), 1);
gtk_toolbar_set_space_size (GTK_TOOLBAR (toolbar), 16);
gtk_toolbar_set_space_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_SPACE_LINE);
gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar), GTK_RELIEF_NONE);
//gtk_toolbar_set_space_size (GTK_TOOLBAR (toolbar), 16);
//gtk_toolbar_set_space_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_SPACE_LINE);
//gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar), GTK_RELIEF_NONE);
toolbar_open = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
GTK_TOOLBAR_CHILD_BUTTON,
......@@ -1103,7 +1103,7 @@ create_intf_popup (void)
intf_popup = gtk_menu_new ();
gtk_object_set_data (GTK_OBJECT (intf_popup), "intf_popup", intf_popup);
intf_popup_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (intf_popup));
intf_popup_accels = gtk_menu_get_accel_group (GTK_MENU (intf_popup));
popup_play = gtk_menu_item_new_with_label ("");
tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (popup_play)->child),
......@@ -1228,7 +1228,7 @@ create_intf_popup (void)
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_audio_menu", popup_audio_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (popup_audio), popup_audio_menu);
popup_audio_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (popup_audio_menu));
popup_audio_menu_accels = gtk_menu_get_accel_group (GTK_MENU (popup_audio_menu));
popup_language = gtk_menu_item_new_with_label ("");
tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (popup_language)->child),
......@@ -1305,7 +1305,7 @@ create_intf_popup (void)
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_video_menu", popup_video_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (popup_video), popup_video_menu);
popup_video_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (popup_video_menu));
popup_video_menu_accels = gtk_menu_get_accel_group (GTK_MENU (popup_video_menu));
popup_subpictures = gtk_menu_item_new_with_label ("");
tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (popup_subpictures)->child),
......@@ -1384,7 +1384,7 @@ create_intf_popup (void)
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_open_menu", popup_open_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (popup_open), popup_open_menu);
popup_open_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (popup_open_menu));
popup_open_menu_accels = gtk_menu_get_accel_group (GTK_MENU (popup_open_menu));
popup_file = gtk_menu_item_new_with_label ("");
tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (popup_file)->child),
......@@ -2733,7 +2733,7 @@ create_intf_playlist (void)
gtk_object_set_data_full (GTK_OBJECT (intf_playlist), "playlist_add_menu", playlist_add_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (playlist_add), playlist_add_menu);
playlist_add_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (playlist_add_menu));
playlist_add_menu_accels = gtk_menu_get_accel_group (GTK_MENU (playlist_add_menu));
playlist_add_disc = gtk_menu_item_new_with_label (_("Disc"));
gtk_widget_ref (playlist_add_disc);
......@@ -2775,7 +2775,7 @@ create_intf_playlist (void)
gtk_object_set_data_full (GTK_OBJECT (intf_playlist), "playlist_delete_menu", playlist_delete_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (playlist_delete), playlist_delete_menu);
playlist_delete_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (playlist_delete_menu));
playlist_delete_menu_accels = gtk_menu_get_accel_group (GTK_MENU (playlist_delete_menu));
playlist_delete_all = gtk_menu_item_new_with_label (_("All"));
gtk_widget_ref (playlist_delete_all);
......@@ -2803,7 +2803,7 @@ create_intf_playlist (void)
gtk_object_set_data_full (GTK_OBJECT (intf_playlist), "playlist_selection_menu", playlist_selection_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (playlist_selection), playlist_selection_menu);
playlist_selection_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (playlist_selection_menu));
playlist_selection_menu_accels = gtk_menu_get_accel_group (GTK_MENU (playlist_selection_menu));
playlist_selection_crop = gtk_menu_item_new_with_label ("");
tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (playlist_selection_crop)->child),
......
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