[Mplayer-cvslog] CVS: main mplayer.c,1.695,1.696 playtreeparser.h,1.4,1.5

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv13601

Modified Files:
	mplayer.c playtreeparser.h 
Log Message:
warning fixes by Dominik Mierzejewski <dominik at rangers.eu.org>

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.695
retrieving revision 1.696
diff -u -r1.695 -r1.696
--- mplayer.c	23 May 2003 15:01:02 -0000	1.695
+++ mplayer.c	30 May 2003 17:53:03 -0000	1.696
@@ -49,6 +49,10 @@
 #include "libvo/font_load.h"
 #include "libvo/sub.h"
 
+#ifdef HAVE_X11
+#include "libvo/x11_common.h"
+#endif
+
 #include "libao2/audio_out.h"
 #include "libao2/audio_plugin.h"
 
@@ -107,6 +111,12 @@
 //             Playtree
 //**************************************************************************//
 #include "playtree.h"
+#include "playtreeparser.h"
+
+#ifdef HAVE_NEW_GUI
+extern int import_playtree_playlist_into_gui(play_tree_t* my_playtree, m_config_t* config);
+extern int import_initial_playtree_into_gui(play_tree_t* my_playtree, m_config_t* config, int enqueue);
+#endif
 
 play_tree_t* playtree;
 play_tree_iter_t* playtree_iter = NULL;
@@ -3292,7 +3302,7 @@
       if (osd_show_sub_changed) {
 	  char *tmp2;
           tmp = subdata->filename;
-	  if (tmp2 = strrchr(tmp, '/')) {
+	  if ((tmp2 = strrchr(tmp, '/'))) {
 	      tmp = tmp2+1;
 	  }
 	  snprintf(osd_text_tmp, 63, "Sub: (%d) %s%s", 

Index: playtreeparser.h
===================================================================
RCS file: /cvsroot/mplayer/main/playtreeparser.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- playtreeparser.h	12 Jan 2003 19:41:37 -0000	1.4
+++ playtreeparser.h	30 May 2003 17:53:03 -0000	1.5
@@ -21,4 +21,7 @@
 play_tree_t*
 play_tree_parser_get_play_tree(play_tree_parser_t* p, int forced);
 
+void
+play_tree_add_bpf(play_tree_t* pt, char* filename);
+
 #endif