Mercurial > mplayer.hg

changeset 10211:4bc481804519

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
author alex
date Fri, 30 May 2003 17:57:41 +0000
parents 138ca63dad29
children d358fa9a1068
files TOOLS/subfont-c/subfont.c libmpdemux/demux_xmms.c mplayer.c playtreeparser.h
diffstat 4 files changed, 16 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/TOOLS/subfont-c/subfont.c	Fri May 30 17:38:51 2003 +0000
+++ b/TOOLS/subfont-c/subfont.c	Fri May 30 17:57:41 2003 +0000
@@ -27,7 +27,7 @@
 
 
 #include "../../bswap.h"
-
+#include "../../osdep/timer.h"
 
 #ifndef DEBUG
 #define DEBUG	0
--- a/libmpdemux/demux_xmms.c	Fri May 30 17:38:51 2003 +0000
+++ b/libmpdemux/demux_xmms.c	Fri May 30 17:57:41 2003 +0000
@@ -142,7 +142,7 @@
 static int no_plugins=0;
 
 /* Dummy functions  */
-static int input_get_vis_type(){return 0;}
+static InputVisType input_get_vis_type(){return 0;}
 static void input_add_vis_pcm(int time, AFormat fmt, int nch, int length, void *ptr){}
 static void input_set_info_text(char * text){}
 char *xmms_get_gentitle_format(){ return ""; }
--- a/mplayer.c	Fri May 30 17:38:51 2003 +0000
+++ b/mplayer.c	Fri May 30 17:57:41 2003 +0000
@@ -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", 
--- a/playtreeparser.h	Fri May 30 17:38:51 2003 +0000
+++ b/playtreeparser.h	Fri May 30 17:57:41 2003 +0000
@@ -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