Mercurial > mplayer.hg
diff mplayer.c @ 10211:4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
| author | alex |
|---|---|
| date | Fri, 30 May 2003 17:57:41 +0000 |
| parents | 531b00ad6f2d |
| children | d608097901b1 |
line wrap: on
line diff
--- 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",