RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
diego 2010-02-14 11:02:05 +00:00
parent 8c21a0fd73
commit 8a67379319
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mp_core.h
View File

@ -59,12 +59,12 @@
#define PT_UP_PREV -3 #define PT_UP_PREV -3
#define PT_STOP 4 #define PT_STOP 4
typedef enum { enum exit_reason {
EXIT_NONE, EXIT_NONE,
EXIT_QUIT, EXIT_QUIT,
EXIT_EOF, EXIT_EOF,
EXIT_ERROR EXIT_ERROR
} exit_reason_t; };
typedef struct MPContext { typedef struct MPContext {
int osd_show_percentage; int osd_show_percentage;
@ -154,8 +154,8 @@ void reinit_audio_chain(void);
void init_vo_spudec(void); void init_vo_spudec(void);
double playing_audio_pts(sh_audio_t *sh_audio, demux_stream_t *d_audio, double playing_audio_pts(sh_audio_t *sh_audio, demux_stream_t *d_audio,
const ao_functions_t *audio_out); const ao_functions_t *audio_out);
void exit_player(exit_reason_t how); void exit_player(enum exit_reason how);
void exit_player_with_rc(exit_reason_t how, int rc); void exit_player_with_rc(enum exit_reason how, int rc);
void add_subtitles(char *filename, float fps, int noerr); void add_subtitles(char *filename, float fps, int noerr);
int reinit_video_chain(void); int reinit_video_chain(void);

6
mplayer.c
View File

@ -691,7 +691,8 @@ void uninit_player(unsigned int mask){
current_module=NULL; 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); if (mpctx->user_muted && !mpctx->edl_muted) mixer_mute(&mpctx->mixer);
uninit_player(INITIALIZED_ALL); uninit_player(INITIALIZED_ALL);
@ -758,7 +759,8 @@ void exit_player_with_rc(exit_reason_t how, int rc){
exit(rc); exit(rc);
} }
void exit_player(exit_reason_t how){ void exit_player(enum exit_reason how)
{
exit_player_with_rc(how, 1); exit_player_with_rc(how, 1);
} }