[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[518] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[518] mplayerxp
|
From: <nic...@us...> - 2012-12-07 17:51:03
|
Revision: 518
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=518&view=rev
Author: nickols_k
Date: 2012-12-07 17:50:52 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
convert struct stream_t into Stream
Modified Paths:
--------------
mplayerxp/dump.cpp
mplayerxp/dump.h
mplayerxp/libmpdemux/demux_aiff.cpp
mplayerxp/libmpdemux/demux_asf.cpp
mplayerxp/libmpdemux/demux_audio.cpp
mplayerxp/libmpdemux/demux_avi.cpp
mplayerxp/libmpdemux/demux_lavf.cpp
mplayerxp/libmpdemux/demux_mkv.cpp
mplayerxp/libmpdemux/demux_mov.cpp
mplayerxp/libmpdemux/demux_mpg.cpp
mplayerxp/libmpdemux/demux_mpxp64.cpp
mplayerxp/libmpdemux/demux_ogg.cpp
mplayerxp/libmpdemux/demux_rawaudio.cpp
mplayerxp/libmpdemux/demux_rawvideo.cpp
mplayerxp/libmpdemux/demux_real.cpp
mplayerxp/libmpdemux/demux_ts.cpp
mplayerxp/libmpdemux/demux_ty.cpp
mplayerxp/libmpdemux/demux_vqf.cpp
mplayerxp/libmpdemux/demuxer.cpp
mplayerxp/libmpdemux/demuxer.h
mplayerxp/libmpdemux/demuxer_stream.cpp
mplayerxp/libmpdemux/demuxer_stream.h
mplayerxp/libmpdemux/parse_mp4.cpp
mplayerxp/libmpdemux/yuv4mpeg.cpp
mplayerxp/libmpdemux/yuv4mpeg.h
mplayerxp/libmpstream/cache2.cpp
mplayerxp/libmpstream/cddb.cpp
mplayerxp/libmpstream/network.h
mplayerxp/libmpstream/s_cdd.cpp
mplayerxp/libmpstream/s_dvdnav.cpp
mplayerxp/libmpstream/s_dvdread.cpp
mplayerxp/libmpstream/s_file.cpp
mplayerxp/libmpstream/s_ftp.cpp
mplayerxp/libmpstream/s_lavc.cpp
mplayerxp/libmpstream/s_network.cpp
mplayerxp/libmpstream/s_null.cpp
mplayerxp/libmpstream/s_oss.cpp
mplayerxp/libmpstream/s_rtsp.cpp
mplayerxp/libmpstream/s_tv.cpp
mplayerxp/libmpstream/s_udp.cpp
mplayerxp/libmpstream/s_vcdnav.cpp
mplayerxp/libmpstream/stream.cpp
mplayerxp/libmpstream/stream.h
mplayerxp/libmpstream/stream_internal.h
mplayerxp/libmpsub/vobsub.cpp
mplayerxp/libplaytree/asxparser.cpp
mplayerxp/libplaytree/playtree.h
mplayerxp/libplaytree/playtreeparser.cpp
mplayerxp/libplaytree/playtreeparser.h
mplayerxp/mplayerxp.cpp
Modified: mplayerxp/dump.cpp
===================================================================
--- mplayerxp/dump.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/dump.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -36,7 +36,7 @@
return type;
}
-void dump_stream(stream_t *stream)
+void dump_stream(Stream *stream)
{
char buf[4096];
int len;
@@ -92,7 +92,7 @@
libinput_t* libinput;
};
-void __FASTCALL__ dump_stream_event_handler(stream_t *s,const stream_packet_t*sp)
+void __FASTCALL__ dump_stream_event_handler(Stream *s,const stream_packet_t*sp)
{
}
Modified: mplayerxp/dump.h
===================================================================
--- mplayerxp/dump.h 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/dump.h 2012-12-07 17:50:52 UTC (rev 518)
@@ -6,10 +6,10 @@
#include "libmpdemux/demuxer_r.h"
namespace mpxp {
int dump_parse(const char *param);
- void dump_stream(stream_t *stream);
+ void dump_stream(Stream *stream);
void dump_mux_init(Demuxer *demuxer,libinput_t*libinput);
void dump_mux(Demuxer *demuxer,int use_pts,const char *seek_to_sec,unsigned play_n_frames);
void dump_mux_close(Demuxer *demuxer);
- void __FASTCALL__ dump_stream_event_handler(stream_t *s,const stream_packet_t*sp);
+ void __FASTCALL__ dump_stream_event_handler(Stream *s,const stream_packet_t*sp);
} //namespace
#endif
Modified: mplayerxp/libmpdemux/demux_aiff.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_aiff.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demux_aiff.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -43,7 +43,7 @@
static MPXP_Rc aiff_probe(Demuxer* demuxer)
{
char buf[12];
- stream_t *s;
+ Stream *s;
s = demuxer->stream;
stream_read(s,buf,12);
if(*((uint32_t *)&buf[0])==mmioFOURCC('F','O','R','M') && *((uint32_t *)&buf[8])==mmioFOURCC('A','I','F','F')) return MPXP_Ok;
@@ -54,7 +54,7 @@
static Opaque* aiff_open(Demuxer* demuxer) {
sh_audio_t* sh_audio;
WAVEFORMATEX* w;
- stream_t *s;
+ Stream *s;
priv_t *priv;
char preamble[8];
s = demuxer->stream;
@@ -205,7 +205,7 @@
}
static void aiff_seek(Demuxer *demuxer,const seek_args_t* seeka){
- stream_t* s = demuxer->stream;
+ Stream* s = demuxer->stream;
sh_audio_t* sh_audio = reinterpret_cast<sh_audio_t*>(demuxer->audio->sh);
off_t base,pos;
Modified: mplayerxp/libmpdemux/demux_asf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_asf.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demux_asf.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -502,7 +502,7 @@
// 0 = EOF or no stream found
// 1 = successfully read a packet
static int asf_demux(Demuxer *demux,Demuxer_Stream *ds){
-stream_t *stream=demux->stream;
+Stream *stream=demux->stream;
asf_priv_t *apriv=static_cast<asf_priv_t*>(demux->priv);
int done=0;
while(!done)
Modified: mplayerxp/libmpdemux/demux_audio.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_audio.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demux_audio.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -431,7 +431,7 @@
static int read_mp3v1_tags(Demuxer *demuxer,uint8_t *hdr, off_t pos )
{
unsigned n;
- stream_t *s=demuxer->stream;
+ Stream *s=demuxer->stream;
for(n = 0; n < 5 ; n++) {
MSG_DBG2("read_mp3v1_tags\n");
pos = mp_decode_mp3_header(hdr,NULL,NULL,NULL,NULL);
@@ -486,7 +486,7 @@
{
uint8_t b[8];
unsigned n;
- stream_t *s=demuxer->stream;
+ Stream *s=demuxer->stream;
demuxer->movi_end = s->end_pos();
memcpy(b,hdr,4);
stream_seek(s,pos+4);
@@ -510,7 +510,7 @@
{
uint8_t b[12];
unsigned n;
- stream_t *s=demuxer->stream;
+ Stream *s=demuxer->stream;
demuxer->movi_end = s->end_pos();
memcpy(b,hdr,4);
stream_seek(s,pos+4);
@@ -548,7 +548,7 @@
static int read_id3v22_tags(Demuxer *demuxer,unsigned flags,unsigned hsize)
{
off_t pos,epos;
- stream_t *s=demuxer->stream;
+ Stream *s=demuxer->stream;
if( flags==ID3V22_ZERO_FLAG ||
flags==ID3V22_UNSYNCH_FLAG ||
flags==ID3V22_COMPRESS_FLAG) return 0;
@@ -613,7 +613,7 @@
static int read_id3v23_tags(Demuxer *demuxer,unsigned flags,unsigned hsize)
{
off_t pos,epos;
- stream_t *s=demuxer->stream;
+ Stream *s=demuxer->stream;
if( flags==ID3V23_ZERO_FLAG ||
flags==ID3V23_UNSYNCH_FLAG) return 0;
if( flags==ID3V23_EXT_HEADER_FLAG )
@@ -689,7 +689,7 @@
static int read_id3v24_tags(Demuxer *demuxer,unsigned flags,unsigned hsize)
{
off_t pos,epos;
- stream_t *s=demuxer->stream;
+ Stream *s=demuxer->stream;
if( flags==ID3V24_ZERO_FLAG ||
flags==ID3V24_UNSYNCH_FLAG) return 0;
if( flags==ID3V24_EXT_HEADER_FLAG )
@@ -744,7 +744,7 @@
static int read_id3v2_tags(Demuxer *demuxer)
{
char buf[4];
- stream_t* s=demuxer->stream;
+ Stream* s=demuxer->stream;
unsigned vers,rev,flags,hsize;
stream_seek(s,3); /* skip 'ID3' */
vers=stream_read_char(s);
@@ -767,7 +767,7 @@
int retval=0;
uint32_t fcc,fcc1,fmt;
uint8_t *p,b[32];
- stream_t *s;
+ Stream *s;
*brate=*samplerate=*channels=0;
s = demuxer->stream;
stream_seek(s,fptr);
@@ -803,7 +803,7 @@
static MPXP_Rc audio_probe(Demuxer* demuxer)
{
uint32_t fcc1,fcc2;
- stream_t *s;
+ Stream *s;
uint8_t *p;
s = demuxer->stream;
fcc1=stream_read_dword(s);
@@ -829,7 +829,7 @@
#define FRAMES_AND_BYTES (FRAMES_FLAG | BYTES_FLAG)
#define MPG_MD_MONO 3
-static void Xing_test(stream_t *s,uint8_t *hdr,da_priv_t *priv)
+static void Xing_test(Stream *s,uint8_t *hdr,da_priv_t *priv)
{
off_t fpos;
unsigned mpeg1, mode, sr_index;
@@ -865,7 +865,7 @@
extern const demuxer_driver_t demux_audio;
static Opaque* audio_open(Demuxer* demuxer) {
- stream_t *s;
+ Stream *s;
sh_audio_t* sh_audio;
uint8_t hdr[HDR_SIZE];
uint32_t fcc,fcc2;
@@ -1375,7 +1375,7 @@
return priv;
}
-static uint32_t mpc_get_bits(da_priv_t* priv, stream_t* s, int bits) {
+static uint32_t mpc_get_bits(da_priv_t* priv, Stream* s, int bits) {
uint32_t out = priv->dword;
uint32_t mask = (1 << bits) - 1;
priv->pos += bits;
@@ -1398,7 +1398,7 @@
sh_audio_t* sh_audio;
Demuxer* demux;
da_priv_t* priv;
- stream_t* s;
+ Stream* s;
int frmt,seof;
#ifdef MP_DEBUG
assert(ds != NULL);
@@ -1552,7 +1552,7 @@
s = demux->stream;
sh_audio = reinterpret_cast<sh_audio_t*>(ds->sh);
- if (s->eof) return 0;
+ if (s->eof()) return 0;
bit_len = mpc_get_bits(priv, s, 20);
Demuxer_Packet* dp=new(zeromem) Demuxer_Packet((bit_len + 7) / 8);
@@ -1644,7 +1644,7 @@
static void audio_seek(Demuxer *demuxer,const seek_args_t* seeka){
sh_audio_t* sh_audio;
- stream_t* s;
+ Stream* s;
int base,pos,frmt;
float len;
da_priv_t* priv;
@@ -1672,7 +1672,7 @@
}
mpc_get_bits(priv, s, bit_len % 32);
priv->last_pts += priv->pts_per_packet;
- if (s->eof) break;
+ if (s->eof()) break;
}
return;
}
Modified: mplayerxp/libmpdemux/demux_avi.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_avi.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demux_avi.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -1141,7 +1141,7 @@
demuxer->priv=priv;
//---- AVI header:
- read_avi_header(demuxer,(demuxer->stream->type()&STREAMTYPE_SEEKABLE)?index_mode:-2);
+ read_avi_header(demuxer,(demuxer->stream->type()&Stream::Type_Seekable)?index_mode:-2);
if(demuxer->audio->id>=0 && !demuxer->get_sh_audio(demuxer->audio->id)){
MSG_WARN("AVI: invalid audio stream ID: %d - ignoring (nosound)\n",demuxer->audio->id);
Modified: mplayerxp/libmpdemux/demux_lavf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_lavf.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demux_lavf.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -129,19 +129,19 @@
}
static int mpxp_read(any_t*opaque, unsigned char *buf, int size){
- stream_t* stream=reinterpret_cast<stream_t*>(opaque);
+ Stream* stream=reinterpret_cast<Stream*>(opaque);
int ret;
if(stream_eof(stream)) //needed?
return -1;
ret=stream_read(stream, buf, size);
- MSG_DBG2("%d=mp_read(%p, %p, %d), eof:%d\n", ret, stream, buf, size, stream->eof);
+ MSG_DBG2("%d=mp_read(%p, %p, %d), eof:%d\n", ret, stream, buf, size, stream->eof());
return ret;
}
static int64_t mpxp_seek(any_t*opaque, int64_t pos, int whence){
- stream_t* stream=reinterpret_cast<stream_t*>(opaque);
+ Stream* stream=reinterpret_cast<Stream*>(opaque);
MSG_DBG2("mpxp_seek(%p, %d, %d)\n", stream, (int)pos, whence);
if(whence == SEEK_CUR)
pos +=stream_tell(stream);
@@ -150,7 +150,7 @@
else if(whence != SEEK_SET)
return -1;
- if(pos<stream->end_pos() && stream->eof)
+ if(pos<stream->end_pos() && stream->eof())
stream_reset(stream);
if(stream_seek(stream, pos)==0)
return -1;
Modified: mplayerxp/libmpdemux/demux_mkv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demux_mkv.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -114,7 +114,7 @@
static uint32_t
-ebml_read_id (stream_t *s, int *length)
+ebml_read_id (Stream *s, int *length)
{
int i, len_mask = 0x80;
uint32_t id;
@@ -182,7 +182,7 @@
* Read: element content length.
*/
static uint64_t
-ebml_read_length (stream_t *s, int *length)
+ebml_read_length (Stream *s, int *length)
{
int i, j, num_ffs = 0, len_mask = 0x80;
uint64_t len;
@@ -211,7 +211,7 @@
* Read the next element as an unsigned int.
*/
static uint64_t
-ebml_read_uint (stream_t *s, uint64_t *length)
+ebml_read_uint (Stream *s, uint64_t *length)
{
uint64_t len, value = 0;
int l;
@@ -232,7 +232,7 @@
* Read the next element as a signed int.
*/
static int64_t
-ebml_read_int (stream_t *s, uint64_t *length)
+ebml_read_int (Stream *s, uint64_t *length)
{
int64_t value = 0;
uint64_t len;
@@ -259,7 +259,7 @@
* Read the next element as a float.
*/
static long double
-ebml_read_float (stream_t *s, uint64_t *length)
+ebml_read_float (Stream *s, uint64_t *length)
{
long double value;
uint64_t len;
@@ -307,7 +307,7 @@
* Read the next element as an ASCII string.
*/
static char *
-ebml_read_ascii (stream_t *s, uint64_t *length)
+ebml_read_ascii (Stream *s, uint64_t *length)
{
uint64_t len;
char *str;
@@ -334,7 +334,7 @@
* Read the next element as a UTF-8 string.
*/
static char *
-ebml_read_utf8 (stream_t *s, uint64_t *length)
+ebml_read_utf8 (Stream *s, uint64_t *length)
{
return ebml_read_ascii (s, length);
}
@@ -343,7 +343,7 @@
* Skip the next element.
*/
static int
-ebml_read_skip (stream_t *s, uint64_t *length)
+ebml_read_skip (Stream *s, uint64_t *length)
{
uint64_t len;
int l;
@@ -364,7 +364,7 @@
* are supposed to be sub-elements which can be read separately.
*/
static uint32_t
-ebml_read_master (stream_t *s, uint64_t *length)
+ebml_read_master (Stream *s, uint64_t *length)
{
uint64_t len;
uint32_t id;
@@ -387,7 +387,7 @@
* Read an EBML header.
*/
static char *
-ebml_read_header (stream_t *s, int *version)
+ebml_read_header (Stream *s, int *version)
{
uint64_t length, l, num;
uint32_t id;
@@ -1055,7 +1055,7 @@
demux_mkv_read_info (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
- stream_t *s = demuxer->stream;
+ Stream *s = demuxer->stream;
uint64_t length, l;
int il;
uint64_t tc_scale = 1000000;
@@ -1114,7 +1114,7 @@
static int
demux_mkv_read_trackencodings (Demuxer *demuxer, mkv_track_t *track)
{
- stream_t *s = demuxer->stream;
+ Stream *s = demuxer->stream;
mkv_content_encoding_t *ce, e;
uint64_t len, length, l;
int il, n;
@@ -1266,7 +1266,7 @@
static int
demux_mkv_read_trackaudio (Demuxer *demuxer, mkv_track_t *track)
{
- stream_t *s = demuxer->stream;
+ Stream *s = demuxer->stream;
uint64_t len, length, l;
int il;
@@ -1324,7 +1324,7 @@
static int
demux_mkv_read_trackvideo (Demuxer *demuxer, mkv_track_t *track)
{
- stream_t *s = demuxer->stream;
+ Stream *s = demuxer->stream;
uint64_t len, length, l;
int il;
@@ -1404,7 +1404,7 @@
demux_mkv_read_trackentry (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
- stream_t *s = demuxer->stream;
+ Stream *s = demuxer->stream;
mkv_track_t *track;
uint64_t len, length, l;
int il;
@@ -1585,7 +1585,7 @@
demux_mkv_read_tracks (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
- stream_t *s = demuxer->stream;
+ Stream *s = demuxer->stream;
uint64_t length, l;
int il;
@@ -1620,7 +1620,7 @@
demux_mkv_read_cues (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
- stream_t *s = demuxer->stream;
+ Stream *s = demuxer->stream;
uint64_t length, l, time, track, pos;
off_t off;
int i, il;
@@ -1736,7 +1736,7 @@
demux_mkv_read_chapters (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
- stream_t *s = demuxer->stream;
+ Stream *s = demuxer->stream;
uint64_t length, l;
int il;
@@ -1880,7 +1880,7 @@
demux_mkv_read_attachments (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
- stream_t *s = demuxer->stream;
+ Stream *s = demuxer->stream;
uint64_t length, l;
int il;
@@ -1995,7 +1995,7 @@
demux_mkv_read_seekhead (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
- stream_t *s = demuxer->stream;
+ Stream *s = demuxer->stream;
uint64_t length, l, seek_pos, saved_pos, num;
uint32_t seek_id;
int i, il, res = 0;
@@ -2788,7 +2788,7 @@
static MPXP_Rc mkv_probe(Demuxer *demuxer)
{
- stream_t *s = demuxer->stream;
+ Stream *s = demuxer->stream;
int version;
char *str;
stream_seek(s, s->start_pos());
@@ -2803,7 +2803,7 @@
static Opaque* mkv_open(Demuxer *demuxer)
{
- stream_t *s = demuxer->stream;
+ Stream *s = demuxer->stream;
mkv_demuxer_t *mkv_d;
mkv_track_t *track;
int i, version, cont = 0;
@@ -3671,7 +3671,7 @@
{
UNUSED(ds);
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
- stream_t *s = demuxer->stream;
+ Stream *s = demuxer->stream;
uint64_t l;
int il, tmp;
@@ -3821,7 +3821,7 @@
mkv_d->free_cached_dps ();
if (!(seeka->flags & 2)) /* time in secs */
{
- stream_t *s = demuxer->stream;
+ Stream *s = demuxer->stream;
int64_t target_timecode = 0, diff, min_diff=0xFFFFFFFFFFFFFFFLL;
int i;
@@ -3846,7 +3846,7 @@
else
stream_seek (s, stream_tell (s) + mkv_d->cluster_size);
/* parse all the clusters upto target_filepos */
- while (!s->eof && stream_tell(s) < (off_t) target_filepos)
+ while (!s->eof() && stream_tell(s) < (off_t) target_filepos)
{
switch (ebml_read_id (s, &i))
{
@@ -3860,7 +3860,7 @@
}
ebml_read_skip (s, NULL);
}
- if (s->eof)
+ if (s->eof())
stream_reset(s);
}
@@ -3942,7 +3942,7 @@
else
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
- stream_t *s = demuxer->stream;
+ Stream *s = demuxer->stream;
uint64_t target_filepos;
mkv_index_t *_index = NULL;
int i;
Modified: mplayerxp/libmpdemux/demux_mov.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mov.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demux_mov.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -1327,7 +1327,7 @@
unsigned char* moov_buf=new unsigned char[moov_sz+16];
int zret;
z_stream zstrm;
- stream_t* backup;
+ Stream* backup;
if (moov_sz > std::numeric_limits<size_t>::max() - 16) {
MSG_ERR( "Invalid cmvd atom size %d\n", moov_sz);
Modified: mplayerxp/libmpdemux/demux_mpg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpg.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demux_mpg.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -79,7 +79,7 @@
int num_mp3audio_packets;
}mpg_stat;
-static unsigned int read_mpeg_timestamp(stream_t *s,int c){
+static unsigned int read_mpeg_timestamp(Stream *s,int c){
int d,e;
unsigned int pts;
d=stream_read_word(s);
@@ -561,7 +561,7 @@
}
if(newpos<demuxer->movi_start){
- if(!(demuxer->stream->type()&STREAMTYPE_PROGRAM)) demuxer->movi_start=0; // for VCD
+ if(!(demuxer->stream->type()&Stream::Type_Program)) demuxer->movi_start=0; // for VCD
if(newpos<demuxer->movi_start) newpos=demuxer->movi_start;
}
Modified: mplayerxp/libmpdemux/demux_mpxp64.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demux_mpxp64.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -140,7 +140,7 @@
static void mpxpav64_read_indexes(Demuxer *demuxer,unsigned id,uint64_t idx_off)
{
uint64_t i,fpos,iid;
- stream_t *s=demuxer->stream;
+ Stream *s=demuxer->stream;
mpxpav64_priv_t *priv=static_cast<mpxpav64_priv_t*>(demuxer->priv);
unsigned sid;
int is_valid;
@@ -185,7 +185,7 @@
static int mpxpav64_read_st64v(Demuxer *demuxer,unsigned hsize,unsigned id){
mpxpav64_priv_t *priv=static_cast<mpxpav64_priv_t*>(demuxer->priv);
- stream_t *s=demuxer->stream;
+ Stream *s=demuxer->stream;
uint32_t fourcc,fsize;
int have_bih=0;
sh_video_t *sh=demuxer->new_sh_video(id);
@@ -259,7 +259,7 @@
}
static int mpxpav64_read_st64a(Demuxer *demuxer,unsigned hsize,unsigned id){
- stream_t *s=demuxer->stream;
+ Stream *s=demuxer->stream;
uint32_t fourcc,fsize;
int have_wf=0;
sh_audio_t *sh=demuxer->new_sh_audio(id);
@@ -308,7 +308,7 @@
}
static int mpxpav64_read_st64(Demuxer *demuxer,unsigned hsize,unsigned id){
- stream_t *s=demuxer->stream;
+ Stream *s=demuxer->stream;
mpxpav64_priv_t *priv=static_cast<mpxpav64_priv_t*>(demuxer->priv);
uint64_t idx_off;
uint32_t fourcc,hoff;
@@ -362,7 +362,7 @@
static void mpxpav64_read_fcnt(Demuxer* demuxer,unsigned fsize)
{
mpxpav64_priv_t *priv=static_cast<mpxpav64_priv_t*>(demuxer->priv);
- stream_t *s=demuxer->stream;
+ Stream *s=demuxer->stream;
int64_t hoff;
const char * codepage;
hoff=stream_tell(s)+fsize;
@@ -434,7 +434,7 @@
}
static Opaque* mpxpav64_open(Demuxer* demuxer){
- stream_t *s=demuxer->stream;
+ Stream *s=demuxer->stream;
uint64_t id,hsize,t;
uint32_t fourcc;
uint16_t scount=0;
@@ -529,7 +529,7 @@
static int mpxpav64_read_packet(Demuxer *demux,unsigned id,uint64_t len,float pts,int keyframe)
{
Demuxer_Stream *ds=NULL;
- stream_t* s=demux->stream;
+ Stream* s=demux->stream;
if(demux->video->id==-1)
if(demux->get_sh_video(id))
@@ -578,7 +578,7 @@
/* DATx|stn|size|pts|stream data of size32 */
static int mpxpav64_demux(Demuxer *demux,Demuxer_Stream *__ds){
- stream_t* s=demux->stream;
+ Stream* s=demux->stream;
mpxpav64_priv_t *priv=static_cast<mpxpav64_priv_t*>(demux->priv);
uint8_t flg;
char p[8];
@@ -695,7 +695,7 @@
static int mpxpav64_test_seekpoint(Demuxer *demuxer)
{
- stream_t* s=demuxer->stream;
+ Stream* s=demuxer->stream;
uint64_t len=0;
int is_key,nkeys=0;
char p[4];
@@ -751,7 +751,7 @@
static int mpxpav64_sync(Demuxer *demuxer)
{
- stream_t* s=demuxer->stream;
+ Stream* s=demuxer->stream;
char p[4];
off_t rpos,cpos=stream_tell(s);
while(!stream_eof(s))
Modified: mplayerxp/libmpdemux/demux_ogg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ogg.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demux_ogg.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -592,7 +592,7 @@
/// otherwise try to get at least the final_granulepos
static void demux_ogg_scan_stream(Demuxer* demuxer) {
ogg_demuxer_t* ogg_d = static_cast<ogg_demuxer_t*>(demuxer->priv);
- stream_t *s = demuxer->stream;
+ Stream *s = demuxer->stream;
ogg_sync_state* sync = &ogg_d->sync;
ogg_page* page= &ogg_d->page;
ogg_stream_state* oss;
@@ -635,7 +635,7 @@
if(np <= 0) { // We need more data
char* buf = ogg_sync_buffer(sync,BLOCK_SIZE);
int len = stream_read(s,buf,BLOCK_SIZE);
- if(len == 0 && s->eof)
+ if(len == 0 && s->eof())
break;
ogg_sync_wrote(sync,len);
continue;
@@ -690,7 +690,7 @@
if(np <= 0) { // We need more data
char* buf = ogg_sync_buffer(sync,BLOCK_SIZE);
int len = stream_read(s,buf,BLOCK_SIZE);
- if(len == 0 && s->eof) {
+ if(len == 0 && s->eof()) {
MSG_ERR("EOF while trying to get the first page !!!!\n");
break;
}
@@ -743,7 +743,7 @@
/// Open an ogg physical stream
static Opaque* ogg_open(Demuxer* demuxer) {
ogg_demuxer_t* ogg_d;
- stream_t *s;
+ Stream *s;
char* buf;
int np,s_no, n_audio = 0, n_video = 0;
int audio_id = -1, video_id = -1, text_id = -1;
@@ -785,7 +785,7 @@
int len;
buf = ogg_sync_buffer(sync,BLOCK_SIZE);
len = stream_read(s,buf,BLOCK_SIZE);
- if(len == 0 && s->eof) {
+ if(len == 0 && s->eof()) {
goto err_out;
}
ogg_sync_wrote(sync,len);
@@ -1090,7 +1090,7 @@
static int ogg_demux(Demuxer *d,Demuxer_Stream *__ds) {
UNUSED(__ds);
ogg_demuxer_t* ogg_d;
- stream_t *s;
+ Stream *s;
Demuxer_Stream *ds;
ogg_sync_state* sync;
ogg_stream_state* os;
@@ -1131,7 +1131,7 @@
/// We need more data
buf = ogg_sync_buffer(sync,BLOCK_SIZE);
len = stream_read(s,buf,BLOCK_SIZE);
- if(len == 0 && s->eof) {
+ if(len == 0 && s->eof()) {
MSG_DBG2("Ogg : Stream EOF !!!!\n");
return 0;
}
@@ -1274,7 +1274,7 @@
if(np <= 0) { // We need more data
char* buf = ogg_sync_buffer(sync,BLOCK_SIZE);
int len = stream_read(demuxer->stream,buf,BLOCK_SIZE);
- if(len == 0 && demuxer->stream->eof) {
+ if(len == 0 && demuxer->stream->eof()) {
MSG_ERR("EOF while trying to seek !!!!\n");
break;
}
Modified: mplayerxp/libmpdemux/demux_rawaudio.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_rawaudio.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demux_rawaudio.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -36,7 +36,7 @@
static MPXP_Rc rawaudio_probe(Demuxer* demuxer)
{
- if(demuxer->stream->type() & STREAMTYPE_RAWAUDIO || use_rawaudio) {
+ if(demuxer->stream->type() & Stream::Type_RawAudio || use_rawaudio) {
demuxer->file_format=Demuxer::Type_RAWAUDIO;
return MPXP_Ok;
}
@@ -71,7 +71,7 @@
demuxer->audio->sh = sh_audio;
demuxer->audio->id = 0;
sh_audio->ds = demuxer->audio;
- if(!(demuxer->stream->type() & STREAMTYPE_SEEKABLE)) demuxer->flags &= ~Demuxer::Seekable;
+ if(!(demuxer->stream->type() & Stream::Type_Seekable)) demuxer->flags &= ~Demuxer::Seekable;
check_pin("demuxer",demuxer->pin,DEMUX_PIN);
return demuxer;
}
@@ -96,7 +96,7 @@
}
static void rawaudio_seek(Demuxer *demuxer,const seek_args_t* seeka){
- stream_t* s = demuxer->stream;
+ Stream* s = demuxer->stream;
sh_audio_t* sh_audio = reinterpret_cast<sh_audio_t*>(demuxer->audio->sh);
off_t base,pos;
Modified: mplayerxp/libmpdemux/demux_rawvideo.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_rawvideo.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demux_rawvideo.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -60,7 +60,7 @@
static MPXP_Rc rawvideo_probe(Demuxer* demuxer)
{
- if(demuxer->stream->type() & STREAMTYPE_RAWVIDEO || priv.use_rawvideo) {
+ if(demuxer->stream->type() & Stream::Type_RawVideo || priv.use_rawvideo) {
priv.fps=25;
demuxer->file_format=Demuxer::Type_RAWVIDEO;
return MPXP_Ok;
@@ -131,7 +131,7 @@
}
static void rawvideo_seek(Demuxer *demuxer,const seek_args_t* seeka){
- stream_t* s = demuxer->stream;
+ Stream* s = demuxer->stream;
off_t pos;
pos =(seeka->flags & DEMUX_SEEK_SET)?demuxer->movi_start:stream_tell(s);
Modified: mplayerxp/libmpdemux/demux_real.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_real.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demux_real.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -452,7 +452,7 @@
len = stream_read_word(demuxer->stream);
} else if ((version == 0x494e) && (len == 0x4458)) {
MSG_V("demux_real: Found INDX chunk. EOF.\n");
- demuxer->stream->eof=1;
+ demuxer->stream->eof(1);
return 0;
}
Modified: mplayerxp/libmpdemux/demux_ts.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ts.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demux_ts.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -392,7 +392,7 @@
while(((c=stream_read_char(demuxer->stream)) != 0x47)
&& (c >= 0)
&& (i < MAX_CHECK_SIZE)
- && ! demuxer->stream->eof
+ && ! demuxer->stream->eof()
) i++;
@@ -652,7 +652,7 @@
while(1)
{
pos = stream_tell(demuxer->stream);
- if(pos > end_pos || demuxer->stream->eof)
+ if(pos > end_pos || demuxer->stream->eof())
break;
if(ts_parse(demuxer, &es, tmp, 1))
@@ -883,7 +883,7 @@
if(video_found || audio_found)
{
- if(demuxer->stream->eof && (ret == 0))
+ if(demuxer->stream->eof() && (ret == 0))
ret = init_pos;
MSG_INFO( " PROGRAM N. %d\n", param->prog);
}
@@ -1484,13 +1484,13 @@
-static int ts_sync(stream_t *stream)
+static int ts_sync(Stream *stream)
{
int c=0;
MSG_DBG2( "TS_SYNC \n");
- while(((c=stream_read_char(stream)) != 0x47) && ! stream->eof);
+ while(((c=stream_read_char(stream)) != 0x47) && ! stream->eof());
if(c == 0x47)
return c;
@@ -2588,7 +2588,7 @@
int buf_size, is_start, pid, base;
int len, cc, cc_ok, afc, retv = 0, is_video, is_audio, is_sub;
ts_priv_t * priv = static_cast<ts_priv_t*>(demuxer->priv);
- stream_t *stream = demuxer->stream;
+ Stream *stream = demuxer->stream;
unsigned char *p;
Demuxer_Stream *ds = NULL;
Demuxer_Packet **dp = NULL;
Modified: mplayerxp/libmpdemux/demux_ty.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ty.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demux_ty.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -122,7 +122,7 @@
stream_seek(demux->stream, 0);
MSG_DBG3("Dumping tar contents\n" );
- while (!demux->stream->eof)
+ while (!demux->stream->eof())
{
char header[ 512 ];
char *name;
@@ -360,7 +360,7 @@
#endif
MSG_DBG3( "ty:ty processing\n" );
- if( demux->stream->eof ) return 0;
+ if( demux->stream->eof()) return 0;
// ======================================================================
// If we haven't figured out the size of the stream, let's do so
@@ -465,7 +465,7 @@
if ( tivo->size > 0 && stream_tell( demux->stream ) > tivo->size )
{
- demux->stream->eof = 1;
+ demux->stream->eof(1);
return 0;
}
Modified: mplayerxp/libmpdemux/demux_vqf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_vqf.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demux_vqf.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -42,7 +42,7 @@
static MPXP_Rc vqf_probe(Demuxer* demuxer)
{
char buf[12];
- stream_t *s;
+ Stream *s;
s = demuxer->stream;
stream_read(s,buf,12);
if(memcmp(buf,"TWIN",4)==0) return MPXP_Ok; /*version: 97012000*/
@@ -52,7 +52,7 @@
static Opaque* vqf_open(Demuxer* demuxer) {
sh_audio_t* sh_audio;
WAVEFORMATEX* w;
- stream_t *s;
+ Stream *s;
headerInfo *hi;
s = demuxer->stream;
@@ -210,7 +210,7 @@
}
static void vqf_seek(Demuxer *demuxer,const seek_args_t* seeka){
- stream_t* s = demuxer->stream;
+ Stream* s = demuxer->stream;
sh_audio_t* sh_audio = reinterpret_cast<sh_audio_t*>(demuxer->audio->sh);
off_t base,pos;
Modified: mplayerxp/libmpdemux/demuxer.cpp
===================================================================
--- mplayerxp/libmpdemux/demuxer.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demuxer.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -114,7 +114,7 @@
}
}
-void Demuxer::_init(stream_t *_stream,int a_id,int v_id,int s_id)
+void Demuxer::_init(Stream *_stream,int a_id,int v_id,int s_id)
{
stream=_stream;
movi_start=_stream->start_pos();
@@ -138,7 +138,7 @@
pin=DEMUX_PIN;
}
-Demuxer::Demuxer(stream_t *_stream,int a_id,int v_id,int s_id)
+Demuxer::Demuxer(Stream *_stream,int a_id,int v_id,int s_id)
:demuxer_priv(new(zeromem) demuxer_priv_t),
_info(new(zeromem) Demuxer_Info)
{
@@ -364,8 +364,8 @@
return MPXP_Ok;
}
-Demuxer* Demuxer::open(stream_t *vs,int audio_id,int video_id,int dvdsub_id){
- stream_t *as = NULL,*ss = NULL;
+Demuxer* Demuxer::open(Stream *vs,int audio_id,int video_id,int dvdsub_id){
+ Stream *as = NULL,*ss = NULL;
Demuxer *vd,*ad = NULL,*sd = NULL;
int afmt = 0,sfmt = 0;
libinput_t* libinput=NULL;
@@ -374,16 +374,18 @@
#endif
if(demux_conf.audio_stream) {
- as = open_stream(libinput,demux_conf.audio_stream,&afmt,NULL);
- if(!as) {
+ as = new(zeromem) Stream();
+ if(as->open(libinput,demux_conf.audio_stream,&afmt,NULL)!=MPXP_Ok) {
MSG_ERR("Can't open audio stream: %s\n",demux_conf.audio_stream);
+ delete as;
return NULL;
}
}
if(demux_conf.sub_stream) {
- ss = open_stream(libinput,demux_conf.sub_stream,&sfmt,NULL);
- if(!ss) {
+ ss = new(zeromem) Stream();
+ if(ss->open(libinput,demux_conf.sub_stream,&sfmt,NULL)!=MPXP_Ok) {
MSG_ERR("Can't open subtitles stream: %s\n",demux_conf.sub_stream);
+ delete ss;
return NULL;
}
}
@@ -423,7 +425,7 @@
demuxer_priv_t& dpriv = static_cast<demuxer_priv_t&>(*demuxer_priv);
sh_audio_t *sh_audio=reinterpret_cast<sh_audio_t*>(audio->sh);
- if(!(stream->type()&STREAMTYPE_SEEKABLE))
+ if(!(stream->type()&Stream::Type_Seekable))
{
MSG_WARN("Stream is not seekable\n");
return 0;
Modified: mplayerxp/libmpdemux/demuxer.h
===================================================================
--- mplayerxp/libmpdemux/demuxer.h 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demuxer.h 2012-12-07 17:50:52 UTC (rev 518)
@@ -48,7 +48,7 @@
struct Demuxer : public Opaque {
public:
Demuxer();
- Demuxer(stream_t *stream,int a_id,int v_id,int s_id);
+ Demuxer(Stream *stream,int a_id,int v_id,int s_id);
virtual ~Demuxer();
enum demuxer_type_e {
@@ -101,7 +101,7 @@
Switch_Subs =3
};
- static Demuxer* open(stream_t *stream,int aid,int vid,int sid);
+ static Demuxer* open(Stream* stream,int aid,int vid,int sid);
virtual MPXP_Rc open();
virtual int demux(Demuxer_Stream* ds);
@@ -126,7 +126,7 @@
char antiviral_hole[RND_CHAR3];
unsigned pin; /**< personal identification number */
- stream_t* stream; /**< stream for movie reading */
+ Stream* stream; /**< stream for movie reading */
Demuxer_Stream* audio; /**< audio buffer/demuxer */
Demuxer_Stream* video; /**< video buffer/demuxer */
Demuxer_Stream* sub; /**< DVD's subtitle buffer/demuxer */
@@ -139,7 +139,7 @@
int synced; /**< indicates stream synchronisation. TODO: mpg->priv */
Opaque* priv; /**< private data of demuxer's driver.*/
private:
- void _init(stream_t *_stream,int a_id,int v_id,int s_id);
+ void _init(Stream *_stream,int a_id,int v_id,int s_id);
LocalPtr<Opaque> demuxer_priv;
LocalPtr<Demuxer_Info> _info; /**< human-readable info from stream/movie (like movie name,author,duration)*/
@@ -153,7 +153,7 @@
inline Demuxer::demuxer_flags_e operator^=(Demuxer::demuxer_flags_e a, Demuxer::demuxer_flags_e b) { return (a=static_cast<Demuxer::demuxer_flags_e>(static_cast<unsigned>(a)^static_cast<unsigned>(b))); }
// This is defined here because demux_stream_t ins't defined in stream.h
- stream_t* __FASTCALL__ new_ds_stream(Demuxer_Stream *ds);
+ Stream* __FASTCALL__ new_ds_stream(Demuxer_Stream *ds);
Demuxer* new_demuxers_demuxer(Demuxer* vd, Demuxer* ad, Demuxer* sd);
}// namespace mpxp
#endif
Modified: mplayerxp/libmpdemux/demuxer_stream.cpp
===================================================================
--- mplayerxp/libmpdemux/demuxer_stream.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demuxer_stream.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -77,7 +77,7 @@
dp->length(),dp->pts,(unsigned int)dp->pos,demuxer->audio->_packs,demuxer->video->_packs);
}
-void Demuxer_Stream::read_packet(stream_t *stream,int len,float _pts,off_t _pos,dp_flags_e _flags){
+void Demuxer_Stream::read_packet(Stream *stream,int len,float _pts,off_t _pos,dp_flags_e _flags){
Demuxer_Packet* dp=new(zeromem) Demuxer_Packet(len);
len=stream_read(stream,dp->buffer(),len);
dp->resize(len);
Modified: mplayerxp/libmpdemux/demuxer_stream.h
===================================================================
--- mplayerxp/libmpdemux/demuxer_stream.h 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/demuxer_stream.h 2012-12-07 17:50:52 UTC (rev 518)
@@ -9,14 +9,14 @@
namespace mpxp {
struct Demuxer;
- struct stream_t;
+ struct Stream;
class Demuxer_Stream : public Opaque {
public:
Demuxer_Stream(Demuxer *demuxer,int id);
virtual ~Demuxer_Stream();
void add_packet(Demuxer_Packet* dp);
- void read_packet(stream_t *stream,int len,float pts,off_t pos,dp_flags_e flags);
+ void read_packet(Stream *stream,int len,float pts,off_t pos,dp_flags_e flags);
int read_data(unsigned char* mem,int len);
void free_packs();
void free_packs_until_pts(float pts);
Modified: mplayerxp/libmpdemux/parse_mp4.cpp
===================================================================
--- mplayerxp/libmpdemux/parse_mp4.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/parse_mp4.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -18,7 +18,7 @@
#define freereturn(a,b) delete a; return b
-int mp4_read_descr_len(stream_t *s) {
+int mp4_read_descr_len(Stream *s) {
uint8_t b;
uint8_t numBytes = 0;
uint32_t length = 0;
@@ -35,7 +35,7 @@
/* parse the data part of MP4 esds atoms */
int mp4_parse_esds(unsigned char *data, int datalen, esds_t *esds) {
/* create memory stream from data */
- stream_t *s = new_memory_stream(data, datalen);
+ Stream *s = new_memory_stream(data, datalen);
uint8_t len;
#ifdef MP4_DUMPATOM
{int i;
Modified: mplayerxp/libmpdemux/yuv4mpeg.cpp
===================================================================
--- mplayerxp/libmpdemux/yuv4mpeg.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/yuv4mpeg.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -65,7 +65,7 @@
*************************************************************************/
-ssize_t y4m_read(stream_t *s, char *buf, size_t len)
+ssize_t y4m_read(Stream *s, char *buf, size_t len)
{
ssize_t n;
@@ -458,7 +458,7 @@
*************************************************************************/
-int y4m_read_stream_header(stream_t *s, y4m_stream_info_t *i)
+int y4m_read_stream_header(Stream *s, y4m_stream_info_t *i)
{
char line[Y4M_LINE_MAX];
char *p;
@@ -523,7 +523,7 @@
*
*************************************************************************/
-int y4m_read_frame_header(stream_t *s, y4m_frame_info_t *i)
+int y4m_read_frame_header(Stream *s, y4m_frame_info_t *i)
{
char line[Y4M_LINE_MAX];
char *p;
@@ -592,7 +592,7 @@
*
*************************************************************************/
-int y4m_read_frame(stream_t *s, y4m_stream_info_t *si,
+int y4m_read_frame(Stream *s, y4m_stream_info_t *si,
y4m_frame_info_t *fi, unsigned char *yuv[3])
{
int err;
Modified: mplayerxp/libmpdemux/yuv4mpeg.h
===================================================================
--- mplayerxp/libmpdemux/yuv4mpeg.h 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpdemux/yuv4mpeg.h 2012-12-07 17:50:52 UTC (rev 518)
@@ -270,7 +270,7 @@
************************************************************************/
/* read len bytes from fd into buf */
-ssize_t y4m_read(stream_t *s, char *buf, size_t len);
+ssize_t y4m_read(Stream *s, char *buf, size_t len);
#if 0
/* write len bytes from fd into buf */
@@ -291,7 +291,7 @@
int y4m_parse_stream_tags(char *s, y4m_stream_info_t *i);
/* read a stream header from file descriptor fd */
-int y4m_read_stream_header(stream_t *s, y4m_stream_info_t *i);
+int y4m_read_stream_header(Stream *s, y4m_stream_info_t *i);
#if 0
/* write a stream header to file descriptor fd */
@@ -309,7 +309,7 @@
************************************************************************/
/* read a frame header from file descriptor fd */
-int y4m_read_frame_header(stream_t *s, y4m_frame_info_t *i);
+int y4m_read_frame_header(Stream *s, y4m_frame_info_t *i);
#if 0
/* write a frame header to file descriptor fd */
@@ -318,7 +318,7 @@
/* read a complete frame (header + data)
o yuv[3] points to three buffers, one each for Y, U, V planes */
-int y4m_read_frame(stream_t *s, y4m_stream_info_t *si,
+int y4m_read_frame(Stream *s, y4m_stream_info_t *si,
y4m_frame_info_t *fi, unsigned char *yuv[3]);
#if 0
Modified: mplayerxp/libmpstream/cache2.cpp
===================================================================
--- mplayerxp/libmpstream/cache2.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/cache2.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -52,7 +52,7 @@
int eof;
/* reader's pointers: */
off_t read_filepos;
- stream_t* stream; /* parent stream */
+ Stream* stream; /* parent stream */
/* thread related stuff */
int in_fill;
pthread_mutex_t mutex;
@@ -107,11 +107,11 @@
new_start = readpos - c->back_size;
if(new_start<c->stream->start_pos()) new_start=c->stream->start_pos();
seek_eof=0;
- if(!in_cache && c->stream->type()&STREAMTYPE_SEEKABLE) {
+ if(!in_cache && c->stream->type()&Stream::Type_Seekable) {
/* seeking... */
MSG_DBG2("Out of boundaries... seeking to %lli {in_cache(%i) %lli<%lli>%lli} \n"
,new_start,in_cache,START_FILEPOS(c),readpos,END_FILEPOS(c));
- if(c->stream->eof || c->eof) nc_stream_reset(c->stream);
+ if(c->stream->eof() || c->eof) c->stream->reset();
c->stream->driver->seek(new_start);
if(errno) { MSG_WARN("c2_seek(drv:%s) error: %s\n",c->stream->driver_info->mrl,strerror(errno)); errno=0; }
if((c->packets[c->first].filepos=c->stream->driver->tell())<0) seek_eof=1;
@@ -267,11 +267,11 @@
return arg;
}
-int stream_enable_cache(stream_t *stream,libinput_t* libinput,int size,int _min,int prefill){
+int stream_enable_cache(Stream *stream,libinput_t* libinput,int size,int _min,int prefill){
int ss=stream->sector_size()>1?stream->sector_size():STREAM_BUFFER_SIZE;
cache_vars_t* c;
- if (!(stream->type()&STREAMTYPE_SEEKABLE)) {
+ if (!(stream->type()&Stream::Type_Seekable)) {
// The stream has no 'fd' behind it, so is non-cacheable
MSG_WARN("\rThis stream is non-cacheable\n");
return 1;
@@ -293,7 +293,7 @@
START_FILEPOS(c),c->read_filepos,END_FILEPOS(c),_min,c->eof,ss);
while((c->read_filepos<START_FILEPOS(c) || END_FILEPOS(c)-c->read_filepos<_min)
&& !c->eof && CP_NEXT(c,c->last)!=c->first){
- if(!(stream->type()&STREAMTYPE_SEEKABLE))
+ if(!(stream->type()&Stream::Type_Seekable))
MSG_STATUS("\rCache fill: %5.2f%% (%d bytes) ",
100.0*(float)(END_FILEPOS(c)-c->read_filepos)/(float)(c->buffer_size),
END_FILEPOS(c)-c->read_filepos);
@@ -309,7 +309,7 @@
return 1; // parent exits
}
-void stream_disable_cache(stream_t *st)
+void stream_disable_cache(Stream *st)
{
cache_vars_t* c;
c=st->cache_data;
@@ -343,7 +343,7 @@
unsigned cidx;
int was_eof;
MSG_DBG2("c2_stream_reset\n");
- nc_stream_reset(c->stream);
+ c->stream->reset();
cidx=c->first;
was_eof=0;
do{ was_eof |= (c->packets[cidx].state&CPF_EOF); c->packets[cidx].state&=~CPF_EOF; cidx=CP_NEXT(c,cidx); }while(cidx!=c->first);
@@ -567,30 +567,30 @@
/*
main interface here!
*/
-int __FASTCALL__ stream_read(stream_t *s,any_t* _mem,int total)
+int __FASTCALL__ stream_read(Stream *s,any_t* _mem,int total)
{
char *mem = reinterpret_cast<char*>(_mem);
if(s->cache_data) return c2_stream_read(s->cache_data,mem,total);
else return nc_stream_read(s,mem,total);
}
-int __FASTCALL__ stream_eof(stream_t *s)
+int __FASTCALL__ stream_eof(Stream *s)
{
if(s->cache_data) return c2_stream_eof(s->cache_data);
- else return s->eof;
+ else return s->eof();
}
-void __FASTCALL__ stream_set_eof(stream_t *s,int eof)
+void __FASTCALL__ stream_set_eof(Stream *s,int eof)
{
if(!eof) stream_reset(s);
else
{
if(s->cache_data) c2_stream_set_eof(s->cache_data,eof);
- else s->eof=eof;
+ else s->eof(eof);
}
}
-int __FASTCALL__ stream_read_char(stream_t *s)
+int __FASTCALL__ stream_read_char(Stream *s)
{
if(s->cache_data)
{
@@ -601,72 +601,72 @@
else return nc_stream_read_char(s);
}
-off_t __FASTCALL__ stream_tell(stream_t *s)
+off_t __FASTCALL__ stream_tell(Stream *s)
{
if(s->cache_data) return c2_stream_tell(s->cache_data);
else return nc_stream_tell(s);
}
-int __FASTCALL__ stream_seek(stream_t *s,off_t pos)
+int __FASTCALL__ stream_seek(Stream *s,off_t pos)
{
if(s->cache_data) return c2_stream_seek(s->cache_data,pos);
else return nc_stream_seek(s,pos);
}
-int __FASTCALL__ stream_skip(stream_t *s,off_t len)
+int __FASTCALL__ stream_skip(Stream *s,off_t len)
{
if(s->cache_data) return c2_stream_skip(s->cache_data,len);
else return nc_stream_skip(s,len);
}
-MPXP_Rc __FASTCALL__ stream_control(const stream_t *s,unsigned cmd,any_t*param)
+MPXP_Rc __FASTCALL__ stream_control(const Stream *s,unsigned cmd,any_t*param)
{
return nc_stream_control(s,cmd,param);
}
-void __FASTCALL__ stream_reset(stream_t *s)
+void __FASTCALL__ stream_reset(Stream *s)
{
if(s->cache_data) c2_stream_reset(s->cache_data);
- else nc_stream_reset(s);
+ else s->reset();
}
-unsigned int __FASTCALL__ stream_read_word(stream_t *s){
+unsigned int __FASTCALL__ stream_read_word(Stream *s){
unsigned short retval;
stream_read(s,(char *)&retval,2);
return me2be_16(retval);
}
-unsigned int __FASTCALL__ stream_read_dword(stream_t *s){
+unsigned int __FASTCALL__ stream_read_dword(Stream *s){
unsigned int retval;
stream_read(s,(char *)&retval,4);
return me2be_32(retval);
}
-uint64_t __FASTCALL__ stream_read_qword(stream_t *s){
+uint64_t __FASTCALL__ stream_read_qword(Stream *s){
uint64_t retval;
stream_read(s,(char *)&retval,8);
return me2be_64(retval);
}
-unsigned int __FASTCALL__ stream_read_word_le(stream_t *s){
+unsigned int __FASTCALL__ stream_read_word_le(Stream *s){
unsigned short retval;
stream_read(s,(char *)&retval,2);
return me2le_16(retval);
}
-unsigned int __FASTCALL__ stream_read_dword_le(stream_t *s){
+unsigned int __FASTCALL__ stream_read_dword_le(Stream *s){
unsigned int retval;
stream_read(s,(char *)&retval,4);
return me2le_32(retval);
}
-uint64_t __FASTCALL__ stream_read_qword_le(stream_t *s){
+uint64_t __FASTCALL__ stream_read_qword_le(Stream *s){
uint64_t retval;
stream_read(s,(char *)&retval,8);
return me2le_64(retval);
}
-unsigned int __FASTCALL__ stream_read_int24(stream_t *s){
+unsigned int __FASTCALL__ stream_read_int24(Stream *s){
unsigned int y;
y = stream_read_char(s);
y=(y<<8)|stream_read_char(s);
Modified: mplayerxp/libmpstream/cddb.cpp
===================================================================
--- mplayerxp/libmpstream/cddb.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/cddb.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -494,7 +494,7 @@
}
user_name = getenv("LOGNAME");
}
- sprintf( cddb_data->cddb_hello, "&hello=%s+%s+%s+%s", user_name, host_name, "MPlayerXP", VERSION );
+ sprintf( cddb_data->cddb_hello, "&hello=%s+%s+%s", user_name, host_name, "MPlayerXP");
}
int __FASTCALL__ cddb_retrieve(cddb_data_t *cddb_data) {
Modified: mplayerxp/libmpstream/network.h
===================================================================
--- mplayerxp/libmpstream/network.h 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/network.h 2012-12-07 17:50:52 UTC (rev 518)
@@ -26,7 +26,7 @@
#define BUFFER_SIZE 2048
namespace mpxp {
- struct stream_t;
+ struct Stream;
struct libinput_t;
class Tcp;
}
Modified: mplayerxp/libmpstream/s_cdd.cpp
===================================================================
--- mplayerxp/libmpstream/s_cdd.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/s_cdd.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -29,7 +29,7 @@
virtual off_t tell() const;
virtual void close();
virtual MPXP_Rc ctrl(unsigned cmd,any_t* param);
- virtual stream_type_e type() const;
+ virtual Stream::type_e type() const;
virtual off_t start_pos() const;
virtual off_t size() const;
virtual off_t sector_size() const;
@@ -58,7 +58,7 @@
return priv?MPXP_Ok:MPXP_False;
}
-stream_type_e Cdda_Stream_Interface::type() const { return STREAMTYPE_RAWAUDIO|STREAMTYPE_SEEKABLE; }
+Stream::type_e Cdda_Stream_Interface::type() const { return Stream::Type_RawAudio|Stream::Type_Seekable; }
off_t Cdda_Stream_Interface::start_pos() const { return cdda_start(priv); }
off_t Cdda_Stream_Interface::size() const { return cdda_size(priv); }
off_t Cdda_Stream_Interface::sector_size() const { return CD_FRAMESIZE_RAW; }
Modified: mplayerxp/libmpstream/s_dvdnav.cpp
===================================================================
--- mplayerxp/libmpstream/s_dvdnav.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/s_dvdnav.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -59,7 +59,7 @@
virtual off_t tell() const;
virtual void close();
virtual MPXP_Rc ctrl(unsigned cmd,any_t* param);
- virtual stream_type_e type() const;
+ virtual Stream::type_e type() const;
virtual off_t start_pos() const;
virtual off_t size() const;
virtual off_t sector_size() const;
@@ -228,11 +228,11 @@
}
return MPXP_Ok;
}
-stream_type_e DvdNav_Stream_Interface::type() const {
+Stream::type_e DvdNav_Stream_Interface::type() const {
if( dvdnav_is_domain_vmgm(dvdnav) ||
dvdnav_is_domain_vtsm(dvdnav) || menu_mode )
- return STREAMTYPE_MENU|STREAMTYPE_SEEKABLE;
- return STREAMTYPE_SEEKABLE|STREAMTYPE_PROGRAM;
+ return Stream::Type_Menu|Stream::Type_Seekable;
+ return Stream::Type_Seekable|Stream::Type_Program;
}
off_t DvdNav_Stream_Interface::start_pos() const { return cpos; }
off_t DvdNav_Stream_Interface::size() const { return -1; }
Modified: mplayerxp/libmpstream/s_dvdread.cpp
===================================================================
--- mplayerxp/libmpstream/s_dvdread.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/s_dvdread.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -60,7 +60,7 @@
virtual off_t tell() const;
virtual void close();
virtual MPXP_Rc ctrl(unsigned cmd,any_t* param);
- virtual stream_type_e type() const;
+ virtual Stream::type_e type() const;
virtual off_t start_pos() const;
virtual off_t size() const;
virtual off_t sector_size() const;
@@ -712,7 +712,7 @@
spos=0;
return MPXP_Ok;
}
-stream_type_e DvdRead_Stream_Interface::type() const { return STREAMTYPE_SEEKABLE|STREAMTYPE_PROGRAM; }
+Stream::type_e DvdRead_Stream_Interface::type() const { return Stream::Type_Seekable|Stream::Type_Program; }
off_t DvdRead_Stream_Interface::start_pos() const { return (off_t)cur_pack*2048; }
off_t DvdRead_Stream_Interface::size() const { return _end_pos; }
off_t DvdRead_Stream_Interface::sector_size() const { return 2048; }
Modified: mplayerxp/libmpstream/s_file.cpp
===================================================================
--- mplayerxp/libmpstream/s_file.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/s_file.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -31,7 +31,7 @@
virtual off_t tell() const;
virtual void close();
virtual MPXP_Rc ctrl(unsigned cmd,any_t* param);
- virtual stream_type_e type() const;
+ virtual Stream::type_e type() const;
virtual off_t size() const;
virtual off_t sector_size() const;
private:
@@ -64,7 +64,7 @@
return MPXP_Ok;
}
-stream_type_e File_Stream_Interface::type() const { return (end_pos==-1)?STREAMTYPE_STREAM:STREAMTYPE_SEEKABLE; }
+Stream::type_e File_Stream_Interface::type() const { return (end_pos==-1)?Stream::Type_Stream:Stream::Type_Seekable; }
off_t File_Stream_Interface::size() const { return end_pos; }
off_t File_Stream_Interface::sector_size() const { return STREAM_BUFFER_SIZE; }
Modified: mplayerxp/libmpstream/s_ftp.cpp
===================================================================
--- mplayerxp/libmpstream/s_ftp.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/s_ftp.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -36,7 +36,7 @@
virtual off_t tell() const;
virtual void close();
virtual MPXP_Rc ctrl(unsigned cmd,any_t* param);
- virtual stream_type_e type() const;
+ virtual Stream::type_e type() const;
virtual off_t size() const;
virtual off_t sector_size() const;
private:
@@ -418,7 +418,7 @@
url_free(url);
return MPXP_Ok;
}
-stream_type_e Ftp_Stream_Interface::type() const { return file_len?STREAMTYPE_SEEKABLE:STREAMTYPE_STREAM; }
+Stream::type_e Ftp_Stream_Interface::type() const { return file_len?Stream::Type_Seekable:Stream::Type_Stream; }
off_t Ftp_Stream_Interface::size() const { return file_len; }
off_t Ftp_Stream_Interface::sector_size() const { return BUFSIZE; }
Modified: mplayerxp/libmpstream/s_lavc.cpp
===================================================================
--- mplayerxp/libmpstream/s_lavc.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/s_lavc.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -22,7 +22,7 @@
virtual off_t tell() const;
virtual void close();
virtual MPXP_Rc ctrl(unsigned cmd,any_t* param);
- virtual stream_type_e type() const;
+ virtual Stream::type_e type() const;
virtual off_t size() const;
virtual off_t sector_size() const;
private:
@@ -80,7 +80,7 @@
return MPXP_Ok;
}
-stream_type_e Lavs_Stream_Interface::type() const { return (ctx->is_streamed)?STREAMTYPE_STREAM:STREAMTYPE_SEEKABLE; }
+Stream::type_e Lavs_Stream_Interface::type() const { return (ctx->is_streamed)?Stream::Type_Stream:Stream::Type_Seekable; }
off_t Lavs_Stream_Interface::size() const { return end_pos; }
off_t Lavs_Stream_Interface::sector_size() const { return STREAM_BUFFER_SIZE; }
Modified: mplayerxp/libmpstream/s_network.cpp
===================================================================
--- mplayerxp/libmpstream/s_network.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/s_network.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -32,7 +32,7 @@
virtual off_t tell() const;
virtual void close();
virtual MPXP_Rc ctrl(unsigned cmd,any_t* param);
- virtual stream_type_e type() const;
+ virtual Stream::type_e type() const;
virtual off_t size() const;
virtual off_t sector_size() const;
private:
@@ -70,7 +70,7 @@
}
return MPXP_False;
}
-stream_type_e Network_Stream_Interface::type() const { return STREAMTYPE_STREAM; }
+Stream::type_e Network_Stream_Interface::type() const { return Stream::Type_Stream; }
off_t Network_Stream_Interface::size() const { return 0; }
off_t Network_Stream_Interface::sector_size() const { return 1; }
Modified: mplayerxp/libmpstream/s_null.cpp
===================================================================
--- mplayerxp/libmpstream/s_null.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/s_null.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -19,7 +19,7 @@
virtual off_t tell() const;
virtual void close();
virtual MPXP_Rc ctrl(unsigned cmd,any_t* param);
- virtual stream_type_e type() const;
+ virtual Stream::type_e type() const;
virtual off_t size() const;
virtual off_t sector_size() const;
};
@@ -43,7 +43,7 @@
UNUSED(args);
return MPXP_Unknown;
}
-stream_type_e Null_Stream_Interface::type() const { return STREAMTYPE_STREAM; }
+Stream::type_e Null_Stream_Interface::type() const { return Stream::Type_Stream; }
off_t Null_Stream_Interface::size() const { return 0; }
off_t Null_Stream_Interface::sector_size() const { return 0; }
Modified: mplayerxp/libmpstream/s_oss.cpp
===================================================================
--- mplayerxp/libmpstream/s_oss.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/s_oss.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -39,7 +39,7 @@
virtual off_t tell() const;
virtual void close();
virtual MPXP_Rc ctrl(unsigned cmd,any_t* param);
- virtual stream_type_e type() const;
+ virtual Stream::type_e type() const;
virtual off_t size() const;
virtual off_t sector_size() const;
private:
@@ -137,7 +137,7 @@
delete args;
return MPXP_Ok;
}
-stream_type_e Oss_Stream_Interface::type() const { return STREAMTYPE_STREAM|STREAMTYPE_RAWAUDIO; }
+Stream::type_e Oss_Stream_Interface::type() const { return Stream::Type_Stream|Stream::Type_RawAudio; }
off_t Oss_Stream_Interface::size() const { return -1; }
off_t Oss_Stream_Interface::sector_size() const { return _sector_size; }
Modified: mplayerxp/libmpstream/s_rtsp.cpp
===================================================================
--- mplayerxp/libmpstream/s_rtsp.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/s_rtsp.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -38,7 +38,7 @@
virtual off_t tell() const;
virtual void close();
virtual MPXP_Rc ctrl(unsigned cmd,any_t* param);
- virtual stream_type_e type() const;
+ virtual Stream::type_e type() const;
virtual off_t size() const;
virtual off_t sector_size() const;
private:
@@ -162,7 +162,7 @@
fixup_network_stream_cache (networking);
return MPXP_Ok;
}
-stream_type_e Rtsp_Stream_Interface::type() const { return STREAMTYPE_STREAM; }
+Stream::type_e Rtsp_Stream_Interface::type() const { return Stream::Type_Stream; }
off_t Rtsp_Stream_Interface::size() const { return 0; }
off_t Rtsp_Stream_Interface::sector_size() const { return 1; }
Modified: mplayerxp/libmpstream/s_tv.cpp
===================================================================
--- mplayerxp/libmpstream/s_tv.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/s_tv.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -590,7 +590,7 @@
virtual off_t tell() const;
virtual void close();
virtual MPXP_Rc ctrl(unsigned cmd,any_t* param);
- virtual stream_type_e type() const;
+ virtual Stream::type_e type() const;
virtual off_t size() const;
virtual off_t sector_size() const;
private:
@@ -661,7 +661,7 @@
return MPXP_Unknown;
}
-stream_type_e Tv_Stream_Interface::type() const { return STREAMTYPE_STREAM; }
+Stream::type_e Tv_Stream_Interface::type() const { return Stream::Type_Stream; }
off_t Tv_Stream_Interface::size() const { return -1; }
off_t Tv_Stream_Interface::sector_size() const { return 0; }
Modified: mplayerxp/libmpstream/s_udp.cpp
===================================================================
--- mplayerxp/libmpstream/s_udp.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/s_udp.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -37,7 +37,7 @@
virtual off_t tell() const;
virtual void close();
virtual MPXP_Rc ctrl(unsigned cmd,any_t* param);
- virtual stream_type_e type() const;
+ virtual Stream::type_e type() const;
virtual off_t size() const;
virtual off_t sector_size() const;
private:
@@ -115,7 +115,7 @@
fixup_network_stream_cache (networking);
return MPXP_Ok;
}
-stream_type_e Udp_Stream_Interface::type() const { return STREAMTYPE_STREAM; }
+Stream::type_e Udp_Stream_Interface::type() const { return Stream::Type_Stream; }
off_t Udp_Stream_Interface::size() const { return 0; }
off_t Udp_Stream_Interface::sector_size() const { return 1; }
Modified: mplayerxp/libmpstream/s_vcdnav.cpp
===================================================================
--- mplayerxp/libmpstream/s_vcdnav.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/s_vcdnav.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -40,7 +40,7 @@
virtual off_t tell() const;
virtual void close();
virtual MPXP_Rc ctrl(unsigned cmd,any_t* param);
- virtual stream_type_e type() const;
+ virtual Stream::type_e type() const;
virtual off_t start_pos() const;
virtual off_t size() const;
virtual off_t sector_size() const;
@@ -158,7 +158,7 @@
MSG_DBG2("vcdnav_open start=%i end=%i\n",lsn,total);
return MPXP_Ok;
}
-stream_type_e VcdNav_Stream_Interface::type() const { return STREAMTYPE_SEEKABLE|STREAMTYPE_PROGRAM; }
+Stream::type_e VcdNav_Stream_Interface::type() const { return Stream::Type_Seekable|Stream::Type_Program; }
off_t VcdNav_Stream_Interface::start_pos() const { return start*sizeof(vcdsector_t); }
off_t VcdNav_Stream_Interface::size() const { return (start+total)*sizeof(vcdsector_t); }
off_t VcdNav_Stream_Interface::sector_size() const { return sizeof(vcdsector_t); }
Modified: mplayerxp/libmpstream/stream.cpp
===================================================================
--- mplayerxp/libmpstream/stream.cpp 2012-12-07 16:03:55 UTC (rev 517)
+++ mplayerxp/libmpstream/stream.cpp 2012-12-07 17:50:52 UTC (rev 518)
@@ -88,24 ...
[truncated message content] |
