diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-05-30 17:57:41 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-05-30 17:57:41 +0000 |
| commit | eb4bffb0b6299697aed196f778218367d33d64ad (patch) | |
| tree | 1eecb8886207a8d3262bf7f8d76ab2d4cec79425 /mplayer.c | |
| parent | e0c59923eca03f6652bd78819fb44e0d79af613f (diff) | |
| download | mpv-eb4bffb0b6299697aed196f778218367d33d64ad.tar.bz2 mpv-eb4bffb0b6299697aed196f778218367d33d64ad.tar.xz | |
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10212 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -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 @@ dvb_history_t *dvb_history; // 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(rel_seek_secs || abs_seek_pos){ 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", |