From 8a67379319806dedf421f5bf217091084baab573 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Feb 2010 11:02:05 +0000 Subject: [PATCH] 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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30560 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mp_core.h | 8 ++++---- mplayer.c | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mp_core.h b/mp_core.h index c26dff3de4..026628af2f 100644 --- a/mp_core.h +++ b/mp_core.h @@ -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 reinit_audio_chain(void); 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); diff --git a/mplayer.c b/mplayer.c index fa88002344..7637a75658 100644 --- a/mplayer.c +++ b/mplayer.c @@ -691,7 +691,8 @@ void uninit_player(unsigned int mask){ 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 @@ void exit_player_with_rc(exit_reason_t how, int rc){ exit(rc); } -void exit_player(exit_reason_t how){ +void exit_player(enum exit_reason how) +{ exit_player_with_rc(how, 1); }