Mercurial > mplayer.hg
view mp_osd.h @ 33667:adb10970ec83
Fix bug introduced as a side effect in r33750.
It was no longer possible to start gmplayer from the command line with
a file argument.
Every time gmplayer is called with a file argument this file goes into
the GUI specific playlist. As a side effect, GUI's file(name) to play
and MPlayer's filename point to the same address.
guiInit() pointlessly tries to set GUI's filename (free and strdup) from
MPlayer's filename instead of getting it from its playlist. The previous
memset set GUI's filename to NULL rendering the free() effectless while
now such an operation on the same address to strdup() afterwards isn't a
good idea.
Remove the pointless code.
author | ib |
---|---|
date | Tue, 28 Jun 2011 15:00:05 +0000 |
parents | c1a3f1bbba26 |
children |
line wrap: on
line source
/* * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * MPlayer is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with MPlayer; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef MPLAYER_MP_OSD_H #define MPLAYER_MP_OSD_H #define OSD_MSG_TV_CHANNEL 0 #define OSD_MSG_TEXT 1 #define OSD_MSG_SUB_DELAY 2 #define OSD_MSG_SPEED 3 #define OSD_MSG_OSD_STATUS 4 #define OSD_MSG_BAR 5 #define OSD_MSG_PAUSE 6 #define OSD_MSG_RADIO_CHANNEL 7 /// Base id for messages generated from the commmand to property bridge. #define OSD_MSG_PROPERTY 0x100 #define OSD_MSG_SUB_BASE 0x1000 #define MAX_OSD_LEVEL 3 #define MAX_TERM_OSD_LEVEL 1 // These appear in options list extern int osd_duration; extern int term_osd; void set_osd_bar(int type,const char* name,double min,double max,double val); void set_osd_msg(int id, int level, int time, const char* fmt, ...); void rm_osd_msg(int id); #endif /* MPLAYER_MP_OSD_H */