mirror of https://github.com/mpv-player/mpv
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10212 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
e0c59923ec
commit
eb4bffb0b6
|
@ -27,7 +27,7 @@
|
|||
|
||||
|
||||
#include "../../bswap.h"
|
||||
|
||||
#include "../../osdep/timer.h"
|
||||
|
||||
#ifndef DEBUG
|
||||
#define DEBUG 0
|
||||
|
|
|
@ -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 ""; }
|
||||
|
|
12
mplayer.c
12
mplayer.c
|
@ -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",
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue