[xine-cvs] CVS: xine-lib/src/input input_file.c,1.39,1.40 input_plugin.h,1.20,1.21

[Guenter B. <gu...@us...>]

Update of /cvsroot/xine/xine-lib/src/input
In directory usw-pr-cvs1:/tmp/cvs-serv2647/src/input

Modified Files:
	input_file.c input_plugin.h 
Log Message:
framerate and other fixes for demux_asf

Index: input_file.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_file.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- input_file.c	17 Feb 2002 17:32:50 -0000	1.39
+++ input_file.c	16 Mar 2002 20:53:50 -0000	1.40
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2000 the xine project
+ * Copyright (C) 2000-2002 the xine project
  * 
- * This file is part of xine, a unix video player.
+ * This file is part of xine, a free video player.
  * 
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -379,6 +379,9 @@
 static off_t file_plugin_get_current_pos (input_plugin_t *this_gen){
   file_input_plugin_t *this = (file_input_plugin_t *) this_gen;
 
+  if (this->fh <0)
+    return 0;
+
   return lseek (this->fh, 0, SEEK_CUR);
 }
 
@@ -389,6 +392,9 @@
 
   struct stat          buf ;
   file_input_plugin_t *this = (file_input_plugin_t *) this_gen;
+
+  if (this->fh <0)
+    return 0;
 
   if (fstat (this->fh, &buf) == 0) {
     return buf.st_size;

Index: input_plugin.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_plugin.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- input_plugin.h	9 Dec 2001 23:09:32 -0000	1.20
+++ input_plugin.h	16 Mar 2002 20:53:50 -0000	1.21
@@ -1,7 +1,7 @@
 /* 
- * Copyright (C) 2000, 2001 the xine project
+ * Copyright (C) 2000-2002 the xine project
  * 
- * This file is part of xine, a unix video player.
+ * This file is part of xine, a free video player.
  * 
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -299,6 +299,7 @@
 #define INPUT_OPTIONAL_DATA_TEXTSPU0  4
 #define INPUT_OPTIONAL_DATA_TEXTSPU1  5
 #define INPUT_OPTIONAL_DATA_TEXTSPU2  6
+#define INPUT_OPTIONAL_DATA_PREVIEW   7
 
 /*
  * each input plugin _must_ implement this function: