[MPlayer-cvslog] r31423 - trunk/libmpdemux/demux_ty.c

[reimar]

Author: reimar
Date: Mon Jun 14 22:11:44 2010
New Revision: 31423

Log:
Cleanup some demux_ty code and at the same time possibly fix vstream support (untested).

Modified:
   trunk/libmpdemux/demux_ty.c

Modified: trunk/libmpdemux/demux_ty.c
==============================================================================
--- trunk/libmpdemux/demux_ty.c	Mon Jun 14 21:17:38 2010	(r31422)
+++ trunk/libmpdemux/demux_ty.c	Mon Jun 14 22:11:44 2010	(r31423)
@@ -105,8 +105,6 @@ typedef struct
    int             tmf_totalparts;
 } TiVoInfo;
 
-off_t vstream_streamsize( );
-
 // ===========================================================================
 #define TMF_SIG "showing.xml"
 
@@ -362,16 +360,14 @@ static int demux_ty_fill_buffer( demuxer
    // ======================================================================
    // If we haven't figured out the size of the stream, let's do so
    // ======================================================================
-#ifdef STREAMTYPE_STREAM_TY
-   if ( demux->stream->type == STREAMTYPE_STREAM_TY )
+   if ( demux->stream->type == STREAMTYPE_VSTREAM )
    {
       // The vstream code figures out the exact size of the stream
       demux->movi_start = 0;
-      demux->movi_end = vstream_streamsize();
-      tivo->size = vstream_streamsize();
+      demux->movi_end = demux->stream->end_pos;
+      tivo->size = demux->stream->end_pos;
    }
    else
-#endif
    {
       // If its a local file, try to find the Part Headers, so we can
       // calculate the ACTUAL stream size