[MPlayer-cvslog] CVS: main cfg-common.h, 1.161, 1.162 cfg-mencoder.h, 1.107, 1.108 cfg-mplayer.h, 1.263, 1.264 configure, 1.1179, 1.1180 edl.c, 1.7, 1.8 mencoder.c, 1.352, 1.353 mplayer.c, 1.947, 1.948

[Uoti Urpala CVS]

CVS change done by Uoti Urpala CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv23710

Modified Files:
	cfg-common.h cfg-mencoder.h cfg-mplayer.h configure edl.c 
	mencoder.c mplayer.c 
Log Message:
Make EDL compilation unconditional


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- cfg-common.h	24 Apr 2006 07:20:32 -0000	1.161
+++ cfg-common.h	27 Apr 2006 12:40:28 -0000	1.162
@@ -90,11 +90,8 @@
 	{"sb", &seek_to_byte, CONF_TYPE_POSITION, CONF_MIN, 0, 0, NULL},
 	{"ss", &seek_to_sec, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL},
 
-#ifdef USE_EDL
 	{"edl", &edl_filename,  CONF_TYPE_STRING, 0, 0, 0, NULL},
-#else
-	{"edl", "MPlayer was compiled without EDL support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-#endif
+
 	// AVI specific: force non-interleaved mode
 	{"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0, NULL},
@@ -361,10 +358,8 @@
 
 #include "libmpdemux/tv.h"
 
-#ifdef USE_EDL
 extern char* edl_filename;
 extern char* edl_output_filename;
-#endif
 
 #ifdef USE_TV
 m_option_t tvopts_conf[]={

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- cfg-mencoder.h	19 Feb 2006 09:34:36 -0000	1.107
+++ cfg-mencoder.h	27 Apr 2006 12:40:28 -0000	1.108
@@ -204,10 +204,8 @@
 
 	{"frameno-file", &frameno_filename, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
 
-#ifdef USE_EDL
         {"hr-edl-seek", &edl_seek_type, CONF_TYPE_FLAG, 0, 0, 1, NULL},
         {"nohr-edl-seek", &edl_seek_type, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-#endif
 
 	// set output framerate - recommended for variable-FPS (ASF etc) files
 	// and for 29.97FPS progressive MPEG2 streams

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- cfg-mplayer.h	24 Apr 2006 07:20:32 -0000	1.263
+++ cfg-mplayer.h	27 Apr 2006 12:40:28 -0000	1.264
@@ -165,11 +165,7 @@
             CONF_TYPE_PRINT, 0, 0, 0, NULL},
 	{"noalsa", "-noalsa has been removed. Remove it from your config file.\n",
             CONF_TYPE_PRINT, 0, 0, 0, NULL},
-#ifdef USE_EDL
 	{"edlout", &edl_output_filename,  CONF_TYPE_STRING, 0, 0, 0, NULL}, 
-#else
-	{"edlout", "MPlayer was compiled without EDL support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-#endif
 
 #ifdef HAVE_X11
 	{"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0, NULL},

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1179
retrieving revision 1.1180
diff -u -r1.1179 -r1.1180
--- configure	26 Apr 2006 01:59:05 -0000	1.1179
+++ configure	27 Apr 2006 12:40:28 -0000	1.1180
@@ -197,7 +197,6 @@
   --disable-tv-v4l       disable Video4Linux TV Interface support [autodetect]
   --disable-tv-v4l2      disable Video4Linux2 TV Interface support [autodetect]
   --disable-tv-bsdbt848  disable BSD BT848 Interface support [autodetect]
-  --disable-edl          disable EDL (edit decision list) support [enable]
   --disable-rtc          disable RTC (/dev/rtc) on Linux [autodetect]
   --disable-network      disable network support (for: http/mms/rtp) [enable]
   --enable-winsock2      enable winsock2 usage [autodetect]
@@ -1548,7 +1547,6 @@
 _tv_v4l=auto
 _tv_v4l2=auto
 _tv_bsdbt848=auto
-_edl=yes
 _network=yes
 _winsock2=auto
 _smbsupport=auto
@@ -1771,8 +1769,6 @@
   --disable-alsa)	_alsa=no	;;
   --enable-tv)		_tv=yes		;;
   --disable-tv)		_tv=no		;;
-  --enable-edl)		_edl=yes	;;
-  --disable-edl)	_edl=no		;;
   --enable-tv-bsdbt848)	_tv_bsdbt848=yes	;;
   --disable-tv-bsdbt848)	_tv_bsdbt848=no	;;
   --enable-tv-v4l)	_tv_v4l=yes	;;
@@ -6550,16 +6546,6 @@
 fi
 echores "$_tv"
 
-echocheck "EDL support"
-if test "$_edl" = yes ; then
-  _def_edl='#define USE_EDL'
-  _inputmodules="edl $_inputmodules"
-else
-  _noinputmodules="edl $_noinputmodules"
-  _def_edl='#undef USE_EDL'
-fi
-echores "$_edl"
-
 echocheck "*BSD BrookTree 848 TV interface"
 if test "$_tv_bsdbt848" = auto ; then
  _tv_bsdbt848=no
@@ -7816,9 +7802,6 @@
 /* Enable TV Interface support */
 $_def_tv
 
-/* Enable EDL support */
-$_def_edl
-
 /* Enable Video 4 Linux TV interface support */
 $_def_tv_v4l
 

Index: edl.c
===================================================================
RCS file: /cvsroot/mplayer/main/edl.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- edl.c	10 Mar 2006 21:34:54 -0000	1.7
+++ edl.c	27 Apr 2006 12:40:28 -0000	1.8
@@ -8,8 +8,6 @@
 char *edl_filename; // file to extract EDL entries from (-edl)
 char *edl_output_filename; // file to put EDL entries in (-edlout)
 
-#ifdef USE_EDL
-
 /**
  *  Allocates a new EDL record and makes sure allocation was successful.
  *
@@ -131,5 +129,3 @@
 
     return edl_records;
 }
-
-#endif

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- mencoder.c	26 Apr 2006 20:24:03 -0000	1.352
+++ mencoder.c	27 Apr 2006 12:40:28 -0000	1.353
@@ -268,7 +268,6 @@
 /// Deletes audio or video as told by -delay to sync
 static void fixdelay(demux_stream_t *d_video, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy);
 
-#ifdef USE_EDL
 #include "edl.h"
 static edl_record_ptr edl_records = NULL; ///< EDL entries memory area
 static edl_record_ptr next_edl_record = NULL; ///< only for traversing edl_records
@@ -279,7 +278,6 @@
     \return 1 for success, 0 for failure, 2 for EOF.
 */
 static int edl_seek(edl_record_ptr next_edl_record, demuxer_t* demuxer, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy);
-#endif
 
 #include "cfg-mencoder.h"
 
@@ -1074,7 +1072,6 @@
 play_n_frames=play_n_frames_mf;
 if (curfile && end_at_type == END_AT_TIME) end_at += mux_v->timer;
 
-#ifdef USE_EDL
 if (edl_records) free_edl(edl_records);
 next_edl_record = edl_records = NULL;
 edl_muted = 0;
@@ -1082,7 +1079,6 @@
 if (edl_filename) {
     next_edl_record = edl_records = edl_parse_file();
 }
-#endif
 
 if (sh_audio && audio_delay != 0.) fixdelay(d_video, d_audio, mux_a, &frame_data, mux_v->codec==VCODEC_COPY);
 
@@ -1102,7 +1098,6 @@
       if(play_n_frames<0) break;
     }
 
-#ifdef USE_EDL
 goto_redo_edl:
     if (next_edl_record && sh_video && sh_video->pts >= next_edl_record->start_sec) {
         if (next_edl_record->action == EDL_SKIP && edl_seeking) {
@@ -1140,7 +1135,6 @@
             next_edl_record=next_edl_record->next;
         }
     }
-#endif
 
 
 if(sh_audio){
@@ -1655,7 +1649,6 @@
 	float timeleft = -1;
 	if (play_n_frames >= 0) timeleft = mux_v->timer + play_n_frames * (double)(mux_v->h.dwScale) / mux_v->h.dwRate;
 	if (end_at_type == END_AT_TIME && (timeleft > end_at || timeleft == -1)) timeleft = end_at;
-#ifdef USE_EDL
 	if (next_edl_record && demuxer && demuxer->video) { // everything is OK to be checked
 		float tmp = mux_v->timer + next_edl_record->start_sec - demuxer->video->pts;
 		if (timeleft == -1 || timeleft > tmp) {
@@ -1668,7 +1661,6 @@
 			}
 		}
 	}
-#endif
 	return timeleft;
 }
 
@@ -1743,12 +1735,10 @@
             decode_video(sh_video, frame_data->start, frame_data->in_size, !softskip, MP_NOPTS_VALUE);
         }
 
-#ifdef USE_EDL
         if (print_info) mp_msg(MSGT_MENCODER, MSGL_STATUS,
                "EDL SKIP: Start: %.2f  End: %.2f   Current: V: %.2f  A: %.2f     \r",
                next_edl_record->start_sec, next_edl_record->stop_sec,
                sh_video->pts, a_pts);
-#endif
     }
     if (interrupted) return 2;
     return 1;
@@ -1775,7 +1765,6 @@
     slowseek(a_pts - audio_delay, d_video, d_audio, mux_a, frame_data, framecopy, 0);
 }
 
-#ifdef USE_EDL
 static int edl_seek(edl_record_ptr next_edl_record, demuxer_t* demuxer, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy) {
     sh_video_t * sh_video = demuxer->video ? demuxer->video->sh : NULL;
 
@@ -1799,4 +1788,3 @@
 
     return slowseek(next_edl_record->stop_sec, demuxer->video, d_audio, mux_a, frame_data, framecopy, 1);
 }
-#endif

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.947
retrieving revision 1.948
diff -u -r1.947 -r1.948
--- mplayer.c	27 Apr 2006 11:13:20 -0000	1.947
+++ mplayer.c	27 Apr 2006 12:40:28 -0000	1.948
@@ -71,9 +71,7 @@
 #include <dvdnav.h>
 #endif
 
-#ifdef USE_EDL
 #include "edl.h"
-#endif
 
 #include "spudec.h"
 #include "vobsub.h"
@@ -395,14 +393,12 @@
 static char* rtc_device;
 #endif
 
-#ifdef USE_EDL
 edl_record_ptr edl_records = NULL; ///< EDL entries memory area
 edl_record_ptr next_edl_record = NULL; ///< only for traversing edl_records
 short user_muted = 0; ///< Stores whether User wanted muted mode.
 short edl_muted  = 0; ///< Stores whether EDL is currently in muted mode.
 short edl_decision = 0; ///< 1 when an EDL operation has been made
 FILE* edl_fd = NULL; ///< fd to write to when in -edlout mode
-#endif
 
 static unsigned int inited_flags=0;
 #define INITED_VO 1
@@ -542,9 +538,7 @@
     play_tree_free(playtree, 1);
 
 
-#ifdef USE_EDL
   if(edl_records != NULL) free(edl_records); // free mem allocated for EDL
-#endif
   if(how) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_ExitingHow,how);
   mp_msg(MSGT_CPLAYER,MSGL_DBG2,"max framesize was %d bytes\n",max_framesize);
 
@@ -1488,10 +1482,8 @@
         return M_PROPERTY_NOT_IMPLEMENTED;
     }
 
-#ifdef USE_EDL
     if (edl_muted) return M_PROPERTY_DISABLED;
     user_muted = 0;
-#endif
 
     switch(action) {
    case M_PROPERTY_SET:
@@ -1522,28 +1514,22 @@
     
     switch(action) {
     case M_PROPERTY_SET:
-#ifdef USE_EDL
         if(edl_muted) return M_PROPERTY_DISABLED;
-#endif
         if(!arg) return 0;
         if((!!*(int*)arg) != mixer.muted)
             mixer_mute(&mixer);
         return 1;
     case M_PROPERTY_STEP_UP:
     case M_PROPERTY_STEP_DOWN:
-#ifdef USE_EDL
         if(edl_muted) return M_PROPERTY_DISABLED;
-#endif
         mixer_mute(&mixer);
         return 1;
     case M_PROPERTY_PRINT:
         if(!arg) return 0;
-#ifdef USE_EDL
         if(edl_muted) {
             *(char**)arg = strdup(MSGTR_EnabledEdl);
             return 1;
         }
-#endif
     default:
         return m_property_flag(prop,action,arg,&mixer.muted);
 
@@ -2869,7 +2855,6 @@
 
     if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing, filename);
 
-#ifdef USE_EDL
 if (edl_filename) {
     if (edl_records) free_edl(edl_records);
     next_edl_record = edl_records = edl_parse_file();
@@ -2882,7 +2867,6 @@
                edl_output_filename);
     }
 }
-#endif
 
 //==================== Open VOB-Sub ============================
 
@@ -4137,7 +4121,6 @@
 
 //================= EDL =========================================
 
-#ifdef USE_EDL
  if( next_edl_record ) { // Are we (still?) doing EDL?
   if ( !sh_video ) {
     mp_msg( MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlNOsh_video );
@@ -4161,7 +4144,6 @@
    }
   }
  }
-#endif
 
 //================= Keyboard events, SEEKing ====================
 
@@ -4227,14 +4209,12 @@
         mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_%s=%s\n",cmd->args[0].v.s,tmp);
         free(tmp);
     } break;
-#ifdef USE_EDL
     case MP_CMD_EDL_MARK:
       if( edl_fd ) {
 	float v = sh_video->pts;
 	fprintf( edl_fd, "%f %f %d\n", v-2, v, 0 );
       }
       break;
-#endif
     case MP_CMD_SWITCH_RATIO : {
       if (cmd->nargs == 0)
 	movie_aspect = (float) sh_video->disp_w / sh_video->disp_h;
@@ -4918,9 +4898,7 @@
       }
         // Set OSD:
       if(!loop_seek){
-#ifdef USE_EDL
 	if( !edl_decision )
-#endif
           set_osd_bar(0,"Position",0,100,demuxer_get_percent_pos(demuxer));
       }
 
@@ -4936,7 +4914,6 @@
         if(vo_spudec) spudec_reset(vo_spudec);
       }
   }
-#ifdef USE_EDL
 /*
  * We saw a seek, have to rewind the EDL operations stack
  * and find the next EDL action to take care of.
@@ -4959,7 +4936,7 @@
 
 }
 if ((user_muted | edl_muted) != mixer.muted) mixer_mute(&mixer);
-#endif
+
   rel_seek_secs=0;
   abs_seek_pos=0;
   frame_time_remaining=0;