Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9277/src
Modified Files:
menu.c playlist.c post.c
Log Message:
Update to 0.5.11 branch point.
Index: menu.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/menu.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- menu.c 7 Jan 2007 20:26:25 -0000 1.90
+++ menu.c 3 Feb 2007 15:04:44 -0000 1.91
@@ -361,14 +361,14 @@
{ "SubsMenu", NULL, N_("_Subtitles"),
NULL },
{ "VideoMenu", NULL, N_("V_ideo"),
NULL },
CB(VideoSettings, GTK_STOCK_PROPERTIES, /* Video */ N_("_Settings..."),
NULL),
- { "VideoConfigMenu", NULL, N_("_Configure"),
NULL },
- CB(DeinterlaceConf, GTK_STOCK_PREFERENCES, N_("_Deinterlace..."),
NULL),
- CB(VideoPPConf, GTK_STOCK_PREFERENCES, N_("_Post-processing..."),
NULL),
+ { "VideoConfigMenu", GTK_STOCK_PREFERENCES, N_("_Configure"),
NULL },
+ CB(DeinterlaceConf, NULL, N_("_Deinterlace..."),
NULL),
+ CB(VideoPPConf, NULL, N_("_Video
post-processing..."),NULL),
{ "AudioMenu", NULL, N_("_Audio"),
NULL },
CB(AudioSettings, GTK_STOCK_PROPERTIES, /* Audio */ N_("_Settings..."),
NULL),
CB(AudioEq, GTK_STOCK_PROPERTIES, N_("_Equaliser..."),
NULL),
- { "AudioConfigMenu", NULL, N_("_Configure"),
NULL },
- CB(AudioPPConf, GTK_STOCK_PREFERENCES, N_("_Post-processing..."),
NULL),
+ { "AudioConfigMenu", GTK_STOCK_PREFERENCES, N_("_Configure"),
NULL },
+ CB(AudioPPConf, NULL, N_("_Audio
post-processing..."),NULL),
{ "MediaMenu", NULL, N_("_Media"),
NULL },
CB(MediaAdd, GTK_STOCK_NEW, N_("_Add media mark..."),
"<control>D"),
CB(MediaManage, GXINE_MEDIA_MARK, N_("_Manage media marks..."),
"<control>B"),
@@ -477,7 +477,13 @@
"<menuitem action='Prefs' />\n"
"<menuitem action='Keys' />\n"
"<menuitem action='Startup' />\n"
+ "<separator />\n"
+ /* the next 3 items duplicate items in the video & audio menus */
+ "<menuitem action='DeinterlaceConf' />\n"
+ "<menuitem action='VideoPPConf' />\n"
+ "<menuitem action='AudioPPConf' />\n"
#ifdef HAVE_LIRC
+ "<separator />\n"
"<menuitem action='ReloadLIRC' />\n"
#endif
"<separator />\n"
Index: playlist.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/playlist.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- playlist.c 7 Jan 2007 20:26:25 -0000 1.187
+++ playlist.c 3 Feb 2007 15:04:44 -0000 1.188
@@ -290,7 +290,7 @@
static void new_cb (GtkWidget* widget, gpointer data)
{
play_item_t *play_item = play_item_new ("", "", 0);
- if (play_item_edit (play_item, PLAY_ITEM_LIST, NULL, dlg))
+ if (play_item_edit (play_item, PLAY_ITEM_LIST_NEW, NULL, dlg))
playlist_add (play_item, -1);
else
play_item_dispose (play_item);
Index: post.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/post.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- post.c 9 Dec 2006 14:05:30 -0000 1.48
+++ post.c 3 Feb 2007 15:04:44 -0000 1.49
@@ -916,10 +916,9 @@
gtk_box_pack_end (GTK_BOX(info->box), w, FALSE, TRUE, 0);
if (!xine_post_input (post, "parameters"))
gtk_widget_set_sensitive (w, FALSE);
- else
- info->pref_toggled = g_signal_connect (G_OBJECT(w), "toggled",
- G_CALLBACK(post_config_post_window),
- info);
+ info->pref_toggled = g_signal_connect (G_OBJECT(w), "toggled",
+ G_CALLBACK(post_config_post_window),
+ info);
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(chain->dbox)->vbox), info->box,
FALSE, TRUE, 2);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
