changeset 7202:b414c2e34b2e

removed buggy fd<0 check for disallowing dumpstream/cache
author arpi
date Sat, 31 Aug 2002 15:44:41 +0000
parents 22beff6edf75
children 69cc665855dc
files libmpdemux/cache2.c mplayer.c
diffstat 2 files changed, 12 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/cache2.c	Sat Aug 31 15:04:18 2002 +0000
+++ b/libmpdemux/cache2.c	Sat Aug 31 15:44:41 2002 +0000
@@ -200,11 +200,12 @@
   int ss=(stream->type==STREAMTYPE_VCD)?VCD_SECTOR_DATA:STREAM_BUFFER_SIZE;
   cache_vars_t* s;
 
-  if (stream->fd < 0) {
-    // The stream has no 'fd' behind it, so is non-cacheable
-    mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n");
-    return 1;
-  }
+// this check is bad! for example DVD, CDDA etc support uses stream but fd=-1 !
+//  if (stream->fd < 0) {
+//    // The stream has no 'fd' behind it, so is non-cacheable
+//    mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n");
+//    return 1;
+//  }
 
   if(size<32*1024) size=32*1024; // 32kb min
   s=cache_init(size,ss);
--- a/mplayer.c	Sat Aug 31 15:04:18 2002 +0000
+++ b/mplayer.c	Sat Aug 31 15:44:41 2002 +0000
@@ -1021,10 +1021,11 @@
   int len;
   FILE *f;
   current_module="dumpstream";
-  if(stream->fd<0){
-    mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Cannot dump this stream - no 'fd' available\n");
-    exit_player(MSGTR_Exit_error);
-  }
+// this check is bad! for example DVD, CDDA etc support uses stream but fd=-1 !
+//  if(stream->fd<0){
+//    mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Cannot dump this stream - no 'fd' available\n");
+//    exit_player(MSGTR_Exit_error);
+//  }
   stream_reset(stream);
   stream_seek(stream,stream->start_pos);
   f=fopen(stream_dump_name,"wb");
@@ -1221,6 +1222,7 @@
 if(sh_audio){
   // Go through the codec.conf and find the best codec...
   sh_audio->codec=NULL;
+  mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
   if(audio_fm) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceAudioFmtStr,audio_fm);
   while(1){
     sh_audio->codec=find_codec(sh_audio->format,NULL,sh_audio->codec,1);