From: Darren S. <ds...@us...> - 2005-04-29 19:40:41
|
Update of /cvsroot/xine/gnome-xine/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22690/src Modified Files: menu.c Log Message: Use the new properties. Index: menu.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/menu.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- menu.c 6 Apr 2005 17:58:24 -0000 1.44 +++ menu.c 29 Apr 2005 19:40:17 -0000 1.45 @@ -242,11 +242,11 @@ [JS_CB_SNAPSHOT] = "snapshot ();", [JS_CB_EXIT] = "exit ();", /* View */ - [JS_CB_FULLSCREEN] = "set_fullscreen ();", + [JS_CB_FULLSCREEN] = "vo_fullscreen.toggle ();", [JS_CB_TOOLBAR] = "toolbar_show ();", - [JS_CB_ZOOM_IN] = "set_zoom (get_zoom()+5);", - [JS_CB_ZOOM_OUT] = "set_zoom (get_zoom()-5);", - [JS_CB_ZOOM_100] = "set_zoom (100);", + [JS_CB_ZOOM_IN] = "vo_zoom.v += 5;", + [JS_CB_ZOOM_OUT] = "vo_zoom.v -= 5;", + [JS_CB_ZOOM_100] = "vo_zoom.v = 100;", [JS_CB_VIDEO_SETTINGS] = "settings_show (0);", [JS_CB_POSTPROC_DEINTERLACE] = "deinterlace_show ();", [JS_CB_POSTPROC_VIDEO] = "postproc_video_show ();", @@ -277,14 +277,15 @@ static void js_toggle_cb (gpointer data, guint action, GtkWidget *widget) { static const char *const cmds[] = { - [JS_TOGGLE_CB_DEINTERLACE] = "set_deinterlace", - [JS_TOGGLE_CB_AUTO_RESIZE] = "set_auto_resize", - [JS_TOGGLE_CB_AUTO_RESCALE] = "set_auto_rescale", - [JS_TOGGLE_CB_POSTPROC_VIDEO] = "set_postproc_video", - [JS_TOGGLE_CB_POSTPROC_AUDIO] = "set_postproc_audio", + [JS_TOGGLE_CB_DEINTERLACE] = "vo_deinterlace", + [JS_TOGGLE_CB_AUTO_RESIZE] = "vo_auto_resize", + [JS_TOGGLE_CB_AUTO_RESCALE] = "vo_auto_rescale", + [JS_TOGGLE_CB_POSTPROC_VIDEO] = "vo_postproc", + [JS_TOGGLE_CB_POSTPROC_AUDIO] = "ao_postproc", }; - v_engine_exec ("%s (%d);", NULL, NULL, cmds[action], - gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))); + v_engine_exec ("%s.v = %s;", NULL, NULL, cmds[action], + gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)) + ? "true" : "false"); } static void tbar_position_cb(gpointer data, guint action, GtkWidget *widget) @@ -299,7 +300,7 @@ static void aspect_cb(gpointer data, guint action, GtkWidget *widget) { - v_engine_exec ("set_aspect (%d);", NULL, NULL, action); + v_engine_exec ("vo_aspect = %d;", NULL, NULL, action); } static void vis_none_cb (gpointer callback_data, @@ -320,7 +321,7 @@ static void sub_cb (gpointer data, guint action, GtkWidget *widget) { if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) - v_engine_exec ("set_sub (%d);", NULL, NULL, action); + v_engine_exec ("vo_subtitle.v = %d;", NULL, NULL, action); } static void popdown_idle_cb (GtkWidget *widget) |