Mercurial > mplayer.hg
view libmpcodecs/ae.h @ 33307:552f1f7731c8
Set GUI initialization flag earlier.
So far, the flag is set after the call of guiInit(), but there are calls
to GUI functions (like reading the GUI config) before that. As MPlayer
(when exiting) only calls GUI's cleanup function guiDone() if the flag
is set, it neglects calling guiDone() on any error between the first GUI
function call and execution of guiInit(). Now the flag is set before the
first GUI function call.
As a result, GUI's own exit function (also used for fatal GUI errors, and
thus also for errors occurring before guiInit() properly finishes) doesn't
have to handle cleanup any longer. The code can be moved to guiDone().
author | ib |
---|---|
date | Sat, 07 May 2011 15:30:14 +0000 |
parents | bbb6ebec87a0 |
children | 5a9d68a07ed1 |
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_AE_H #define MPLAYER_AE_H #include "libmpdemux/muxer.h" #define ACODEC_COPY 0 #define ACODEC_PCM 1 #define ACODEC_VBRMP3 2 #define ACODEC_NULL 3 #define ACODEC_LAVC 4 #define ACODEC_TOOLAME 5 #define ACODEC_FAAC 6 #define ACODEC_TWOLAME 7 #define AE_NEEDS_COMPRESSED_INPUT 1 typedef struct { int channels; int sample_rate; int bitrate; int samples_per_frame; int audio_preload; } audio_encoding_params_t; typedef struct audio_encoder_s { int codec; int flags; muxer_stream_t *stream; audio_encoding_params_t params; int audio_preload; //in ms int input_format; int min_buffer_size, max_buffer_size; //for init_audio_filters unsigned char *decode_buffer; int decode_buffer_size; int decode_buffer_len; void *priv; int (*bind)(struct audio_encoder_s*, muxer_stream_t*); int (*get_frame_size)(struct audio_encoder_s*); int (*set_decoded_len)(struct audio_encoder_s *encoder, int len); int (*encode)(struct audio_encoder_s *encoder, uint8_t *dest, void *src, int nsamples, int max_size); void (*fixup)(struct audio_encoder_s *encoder); int (*close)(struct audio_encoder_s *encoder); } audio_encoder_t; audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params_t *params); #endif /* MPLAYER_AE_H */