Mercurial > mplayer.hg
changeset 30518:654cad7ea876
Rename exit_reason_t enum to exit_reason and do not typedef it.
The _t namespace is reserved for POSIX; the typedef is pointless obfuscation.
| author | diego |
|---|---|
| date | Sun, 14 Feb 2010 11:02:05 +0000 |
| parents | 290e478b07cd |
| children | e96015d17ffb |
| files | mp_core.h mplayer.c |
| diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mp_core.h Sun Feb 14 10:58:01 2010 +0000 +++ b/mp_core.h Sun Feb 14 11:02:05 2010 +0000 @@ -59,12 +59,12 @@ #define PT_UP_PREV -3 #define PT_STOP 4 -typedef enum { +enum exit_reason { EXIT_NONE, EXIT_QUIT, EXIT_EOF, EXIT_ERROR -} exit_reason_t; +}; typedef struct MPContext { int osd_show_percentage; @@ -154,8 +154,8 @@ void init_vo_spudec(void); double playing_audio_pts(sh_audio_t *sh_audio, demux_stream_t *d_audio, const ao_functions_t *audio_out); -void exit_player(exit_reason_t how); -void exit_player_with_rc(exit_reason_t how, int rc); +void exit_player(enum exit_reason how); +void exit_player_with_rc(enum exit_reason how, int rc); void add_subtitles(char *filename, float fps, int noerr); int reinit_video_chain(void);
--- a/mplayer.c Sun Feb 14 10:58:01 2010 +0000 +++ b/mplayer.c Sun Feb 14 11:02:05 2010 +0000 @@ -691,7 +691,8 @@ current_module=NULL; } -void exit_player_with_rc(exit_reason_t how, int rc){ +void exit_player_with_rc(enum exit_reason how, int rc) +{ if (mpctx->user_muted && !mpctx->edl_muted) mixer_mute(&mpctx->mixer); uninit_player(INITIALIZED_ALL); @@ -758,7 +759,8 @@ exit(rc); } -void exit_player(exit_reason_t how){ +void exit_player(enum exit_reason how) +{ exit_player_with_rc(how, 1); }