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 | |
| 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
| -rw-r--r-- | TOOLS/subfont-c/subfont.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_xmms.c | 2 | ||||
| -rw-r--r-- | mplayer.c | 12 | ||||
| -rw-r--r-- | playtreeparser.h | 3 |
4 files changed, 16 insertions, 3 deletions
diff --git a/TOOLS/subfont-c/subfont.c b/TOOLS/subfont-c/subfont.c index 8608fa12e4..7c7b16fd3c 100644 --- a/TOOLS/subfont-c/subfont.c +++ b/TOOLS/subfont-c/subfont.c @@ -27,7 +27,7 @@ #include "../../bswap.h" - +#include "../../osdep/timer.h" #ifndef DEBUG #define DEBUG 0 diff --git a/libmpdemux/demux_xmms.c b/libmpdemux/demux_xmms.c index 163b91adc9..5bfc64a410 100644 --- a/libmpdemux/demux_xmms.c +++ b/libmpdemux/demux_xmms.c @@ -142,7 +142,7 @@ static InputPlugin* input_plugins[100]; 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 ""; } @@ -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", diff --git a/playtreeparser.h b/playtreeparser.h index 0cfd8dd9f1..b43f1c23fa 100644 --- a/playtreeparser.h +++ b/playtreeparser.h @@ -21,4 +21,7 @@ play_tree_parser_free(play_tree_parser_t* p); 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 |