mplayer.hg: mplayer.c comparison

comparison mplayer.c @ 16490:f17b3c152fd6

Add comments to a few #endif statements in order to make clear which #ifdef they belong to.

author	diego
date	Thu, 15 Sep 2005 03:08:35 +0000
parents	3092afa97d36
children	49ef03cb382a

comparison

equal deleted inserted replaced

-:3092afa97d36
+:f17b3c152fd6
 #include <linux/rtc.h>
 #else
 #include <rtc.h>
 #define RTC_IRQP_SET RTCIO_IRQP_SET
 #define RTC_PIE_ON   RTCIO_PIE_ON
-#endif
+#endif /* __linux__ */
-#endif
+#endif /* HAVE_RTC */
 #ifdef USE_TV
 #include "libmpdemux/tv.h"
 #endif
 else if (set_of_sub_size <= 0 && subdata != NULL) { // *subdata was added
 set_of_subtitles[set_of_sub_pos=set_of_sub_size] = subdata;
 ++set_of_sub_size;
 }
 }
-#endif
+#endif /* USE_SUB */
 /*
 * In Mac OS X the SDL-lib is built upon Cocoa. The easiest way to
 * make it all work is to use the builtin SDL-bootstrap code, which
 * will be done automatically by replacing our main() if we include SDL.h.
 for (i = 0; i < vo_sub_last->lines; i++) {
 	fprintf(f, "%s\n", vo_sub_last->text[i]);
 }
 fclose(f);
 }
-#endif
+#endif /* USE_SUB */
 int main(int argc,char* argv[]){
 char * mem_ptr;
 #endif
 #ifdef HAVE_SSE2
 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE2");
 #endif
 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n\n");
-#endif
+#endif /* RUNTIME_CPUDETECT */
-#endif
+#endif /* defined(ARCH_X86) || defined(ARCH_X86_64) */
 #if defined(WIN32) && defined(USE_WIN32DLL)
 {  /*make our codec dirs available for LoadLibraryA()*/
 char tmppath[MAX_PATH*2 + 1];
 char win32path[MAX_PATH];
 play_tree_add_bpf(playtree, cwd);
 }
 // Import initital playtree into gui
 import_initial_playtree_into_gui(playtree, mconfig, enqueue);
 }
-#endif
+#endif /* HAVE_NEW_GUI */
 if(video_driver_list && strcmp(video_driver_list[0],"help")==0){
 list_video_out();
 opt_exit = 1;
 }
 vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
 }
 #ifdef HAVE_FONTCONFIG
 }
 #endif
-#endif
+#endif /* USE_OSD */
 vo_init_osd();
 #ifdef HAVE_RTC
 if(!nortc)
 {
 // breaks DGA and SVGAlib and VESA drivers:  --A'rpi
 // and now ? -- Pontscho
 if(use_gui) setuid( getuid() ); // strongly test, please check this.
 #endif
 if(rtc_fd<0)
-#endif
+#endif /* HAVE_RTC */
 mp_msg(MSGT_CPLAYER, MSGL_V, "Using %s timing\n",
 	     softsleep?"software":timer_name);
 #ifdef USE_TERMCAP
 if ( !use_gui ) load_termcap(NULL); // load key-codes
 	    filename = play_tree_iter_get_file(playtree_iter,1);
 	   }
 }
 }
 }
-#endif
+#endif /* HAVE_NEW_GUI */
 while (player_idle_mode && !filename) {
 play_tree_t * entry = NULL;
 mp_cmd_t * cmd;
 while (!(cmd = mp_input_get_cmd(0,1,0))) { // wait for command
 // setup global sub numbering
 global_sub_indices[SUB_SOURCE_SUBS] = global_sub_size; // the global # of the first sub.
 global_sub_size += set_of_sub_size;
 }
 }
-#endif
+#endif /* USE_SUB */
 if (global_sub_size) {
 // find the best sub to use
 if (vobsub_id >= 0) {
 // if user asks for a vobsub id, use that first.
 	    current_module="sleep_soft";
 	    if(time_frame<0) mp_msg(MSGT_AVSYNC, MSGL_WARN, MSGTR_SoftsleepUnderflow);
 	    while(time_frame>0) time_frame-=GetRelativeTime(); // burn the CPU
 	}
 }
-#endif
+#endif /* SYS_DARWIN */
 }
 //if(!frame_time_remaining){	// should we display the frame now?
 //====================== FLIP PAGE (VIDEO BLT): =========================
 			cache_uninit(stream);
 			goto goto_enable_cache;
 		}
 	  }
 	}
-#endif
+#endif /* HAS_DVBIN_SUPPORT */
 break;
 case MP_CMD_TV_SET_CHANNEL :  {
 if (file_format == DEMUXER_TYPE_TV) {
 	tv_set_channel((tvi_handle_t*)(demuxer->priv), cmd->args[0].v.s);
 #ifdef USE_OSD
 		  goto goto_enable_cache;
 		}
 	  }
 	}
 }
-#endif
+#endif /* HAS_DVBIN_SUPPORT	*/
 case MP_CMD_TV_LAST_CHANNEL :  {
 if (file_format == DEMUXER_TYPE_TV) {
 	tv_last_channel((tvi_handle_t*)(demuxer->priv));
 #ifdef USE_OSD
 	if (tv_channel_list) {
 } break;
 case MP_CMD_TV_STEP_CHANNEL_LIST :  {
 if (file_format == DEMUXER_TYPE_TV)
 	tv_step_chanlist((tvi_handle_t*)(demuxer->priv));
 } break;
-#endif
+#endif /* USE_TV */
 case MP_CMD_SWITCH_VSYNC:  {
 vo_vsync = ( cmd->nargs > 0 )? cmd->args[0].v.i : !vo_vsync;
 } break;
 case MP_CMD_VO_FULLSCREEN:
 {
 if (set_of_sub_size <= 0)
 global_sub_indices[SUB_SOURCE_SUBS] = -1;
 set_of_subtitles[set_of_sub_size] = NULL;
 }
 }
-#endif
+#endif /* USE_SUB */
 } break;
 case MP_CMD_GET_SUB_VISIBILITY:
 	{
 #ifdef USE_SUB
 	if (sh_video) {
 d_dvdsub->id,stream_change->physical);
 // FIXME: need a better way to change SPU id
 d_dvdsub->id=dvdsub_id=stream_change->physical;
 if (vo_spudec) spudec_reset(vo_spudec);
 }
-#endif
+#endif /* DVDNAVVERSION > 012 */
 break;
 }
 case DVDNAV_AUDIO_STREAM_CHANGE: {
 int aid_temp;
 #if DVDNAVVERSION > 012
 mp_msg(MSGT_CPLAYER, MSGL_V, "Weird DVD Nav cmd %d\n",cmd->args[0].v.i);
 break;
 }
 break;
 }
-#endif
+#endif /* USE_DVDNAV */
 default : {
 #ifdef HAVE_NEW_GUI
 if ( ( use_gui )&&( cmd->id > MP_CMD_GUI_EVENTS ) ) guiGetEvent( guiIEvent,(char *)cmd->id );
 else
 #endif
 	    vo_osd_progbar_value=demuxer_get_percent_pos(demuxer) * 256 / 100;
 	    vo_osd_changed(OSDTYPE_PROGBAR);
 	  }
 	}
 }
-#endif
+#endif /* USE_OSD */
 if(sh_video) {
 	c_total=0;
 	max_pts_correction=0.1;
 	osd_visible=sh_video->fps; // to rewert to PLAY pointer after 1 sec
 	audio_time_usage=0; video_time_usage=0; vout_time_usage=0;
 	  dvd_priv_t * dvdp = stream->priv;
 	  guiIntfStruct.DVD.current_chapter=dvd_chapter_from_cell(dvdp,guiIntfStruct.DVD.current_title-1, dvdp->cur_cell)+1;
 	 }
 #endif
 }
-#endif
+#endif /* HAVE_NEW_GUI */
 //================= Update OSD ====================
 #ifdef USE_OSD
 if(osd_level>=1 && sh_video){
 vo_osd_changed(OSDTYPE_OSD);
 osd_show_status--;
 }
 //  for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0;
 //  vo_osd_text=osd_text_buffer;
-#endif
+#endif /* USE_OSD */
 #ifdef USE_SUB
 // find sub
 if(subdata &&  sh_video && sh_video->pts>0){
 float pts=sh_video->pts;

Mercurial > mplayer.hg

comparison mplayer.c @ 16490:f17b3c152fd6