[MPlayer-cvslog] r30560 - in trunk: mp_core.h mplayer.c

[diego]

Author: diego
Date: Sun Feb 14 12:02:05 2010
New Revision: 30560

Log:
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.

Modified:
   trunk/mp_core.h
   trunk/mplayer.c

Modified: trunk/mp_core.h
==============================================================================
--- trunk/mp_core.h	Sun Feb 14 11:58:01 2010	(r30559)
+++ trunk/mp_core.h	Sun Feb 14 12:02:05 2010	(r30560)
@@ -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);
 

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Sun Feb 14 11:58:01 2010	(r30559)
+++ trunk/mplayer.c	Sun Feb 14 12:02:05 2010	(r30560)
@@ -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 h
   exit(rc);
 }
 
-void exit_player(exit_reason_t how){
+void exit_player(enum exit_reason how)
+{
   exit_player_with_rc(how, 1);
 }