Mercurial > mplayer.hg
view libmpcodecs/ad.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 | 456417526407 |
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_AD_H #define MPLAYER_AD_H #include "mpc_info.h" #include "libmpdemux/stheader.h" extern float drc_level; typedef mp_codec_info_t ad_info_t; /* interface of video decoder drivers */ typedef struct ad_functions { const ad_info_t *info; int (*preinit)(sh_audio_t *sh); int (*init)(sh_audio_t *sh); void (*uninit)(sh_audio_t *sh); int (*control)(sh_audio_t *sh,int cmd,void* arg, ...); int (*decode_audio)(sh_audio_t *sh,unsigned char* buffer,int minlen,int maxlen); } ad_functions_t; // NULL terminated array of all drivers extern const ad_functions_t * const mpcodecs_ad_drivers[]; // fallback if ADCTRL_RESYNC not implemented: sh_audio->a_in_buffer_len=0; #define ADCTRL_RESYNC_STREAM 1 /* resync, called after seeking! */ // fallback if ADCTRL_SKIP not implemented: ds_fill_buffer(sh_audio->ds); #define ADCTRL_SKIP_FRAME 2 /* skip block/frame, called while seeking! */ // fallback if ADCTRL_QUERY_FORMAT not implemented: sh_audio->sample_format #define ADCTRL_QUERY_FORMAT 3 /* test for availabilty of a format */ // fallback: use hw mixer in libao #define ADCTRL_SET_VOLUME 4 /* set volume (used for mp3lib and liba52) */ #endif /* MPLAYER_AD_H */