[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[525] mplayerxp

[<nic...@us...>]

Revision: 525
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=525&view=rev
Author:   nickols_k
Date:     2012-12-08 13:40:58 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
fixes

Modified Paths:
--------------
    mplayerxp/libmpdemux/demux_bmp.cpp
    mplayerxp/libmpstream/stream.cpp
    mplayerxp/libmpstream/stream.h
    mplayerxp/mplayerxp.cpp

Modified: mplayerxp/libmpdemux/demux_bmp.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_bmp.cpp	2012-12-08 13:27:53 UTC (rev 524)
+++ mplayerxp/libmpdemux/demux_bmp.cpp	2012-12-08 13:40:58 UTC (rev 525)
@@ -212,7 +212,7 @@
 // Check if a file is a BMP file depending on whether starts with 'BM'
 static MPXP_Rc bmp_probe(Demuxer *demuxer)
 {
-  if (stream_read_word(demuxer->stream) == (('B' << 8) | 'M'))
+  if (demuxer->stream->read_word() == (('B' << 8) | 'M'))
     return MPXP_Ok;
   else
     return MPXP_False;
@@ -225,8 +225,8 @@
 {
   bmp_image_t *bmp_image = static_cast<bmp_image_t*>(demuxer->priv);
 
-  stream_reset(demuxer->stream);
-  stream_seek(demuxer->stream, bmp_image->image_offset);
+  demuxer->stream->reset();
+  demuxer->stream->seek( bmp_image->image_offset);
   demuxer->video->read_packet(demuxer->stream, bmp_image->image_size,
     0, bmp_image->image_offset, DP_KEYFRAME);
   return 1;
@@ -240,12 +240,12 @@
   bmp_image_t *bmp_image;
 
   // go back to the beginning
-  stream_reset(demuxer->stream);
-  stream_seek(demuxer->stream, demuxer->stream->start_pos+2);
-  filesize = stream_read_dword_le(demuxer->stream);
-  stream_skip(demuxer->stream, 4);
-  data_offset = stream_read_word_le(demuxer->stream);
-  stream_skip(demuxer->stream, 2);
+  demuxer->stream->reset();
+  demuxer->stream->seek( demuxer->stream->start_pos()+2);
+  filesize = demuxer->stream->read_dword_le();
+  demuxer->stream->skip( 4);
+  data_offset = demuxer->stream->read_word_le();
+  demuxer->stream->skip( 2);
 
   // create a new video stream header
   sh_video = demuxer->new_sh_video();
@@ -260,19 +260,19 @@
   // load the BITMAPINFOHEADER
   // allocate size and take the palette table into account
   sh_video->bih = (BITMAPINFOHEADER *)mp_malloc(data_offset - 12);
-  sh_video->bih->biSize = stream_read_dword_le(demuxer->stream);
-  sh_video->bih->biWidth = stream_read_dword_le(demuxer->stream);
-  sh_video->bih->biHeight = stream_read_dword_le(demuxer->stream);
-  sh_video->bih->biPlanes = stream_read_word_le(demuxer->stream);
-  sh_video->bih->biBitCount = stream_read_word_le(demuxer->stream);
-  sh_video->bih->biCompression = stream_read_dword_le(demuxer->stream);
-  sh_video->bih->biSizeImage = stream_read_dword_le(demuxer->stream);
-  sh_video->bih->biXPelsPerMeter = stream_read_dword_le(demuxer->stream);
-  sh_video->bih->biYPelsPerMeter = stream_read_dword_le(demuxer->stream);
-  sh_video->bih->biClrUsed = stream_read_dword_le(demuxer->stream);
-  sh_video->bih->biClrImportant = stream_read_dword_le(demuxer->stream);
+  sh_video->bih->biSize = demuxer->stream->read_dword_le();
+  sh_video->bih->biWidth = demuxer->stream->read_dword_le();
+  sh_video->bih->biHeight = demuxer->stream->read_dword_le();
+  sh_video->bih->biPlanes = demuxer->stream->read_word_le();
+  sh_video->bih->biBitCount = demuxer->stream->read_word_le();
+  sh_video->bih->biCompression = demuxer->stream->read_dword_le();
+  sh_video->bih->biSizeImage = demuxer->stream->read_dword_le();
+  sh_video->bih->biXPelsPerMeter = demuxer->stream->read_dword_le();
+  sh_video->bih->biYPelsPerMeter = demuxer->stream->read_dword_le();
+  sh_video->bih->biClrUsed = demuxer->stream->read_dword_le();
+  sh_video->bih->biClrImportant = demuxer->stream->read_dword_le();
   // fetch the palette
-  stream_read(demuxer->stream, (unsigned char *)(sh_video->bih) + 40,
+  demuxer->stream->read( (unsigned char *)(sh_video->bih) + 40,
     sh_video->bih->biClrUsed * 4);
 
   // load the data

Modified: mplayerxp/libmpstream/stream.cpp
===================================================================
--- mplayerxp/libmpstream/stream.cpp	2012-12-08 13:27:53 UTC (rev 524)
+++ mplayerxp/libmpstream/stream.cpp	2012-12-08 13:40:58 UTC (rev 525)
@@ -225,7 +225,7 @@
   return y;
 }
 
-void print_stream_drivers( void )
+void Stream::print_drivers()
 {
     unsigned i;
     MSG_INFO("Available stream drivers:\n");

Modified: mplayerxp/libmpstream/stream.h
===================================================================
--- mplayerxp/libmpstream/stream.h	2012-12-08 13:27:53 UTC (rev 524)
+++ mplayerxp/libmpstream/stream.h	2012-12-08 13:40:58 UTC (rev 525)
@@ -55,6 +55,8 @@
 	    Stream(type_e type=Stream::Type_Unknown);
 	    virtual ~Stream();
 
+	    static void		print_drivers();
+
 	    virtual MPXP_Rc	open(libinput_t*libinput,const char* filename,int* file_format);
 	    virtual int		read(any_t* mem,int total);
 	    virtual int		read(stream_packet_t * sp);
@@ -238,7 +240,5 @@
 
 	SCTRL_EOF=10000
     };
-
-    void print_stream_drivers(void);
 } // namespace mpxp
 #endif // __STREAM_H

Modified: mplayerxp/mplayerxp.cpp
===================================================================
--- mplayerxp/mplayerxp.cpp	2012-12-08 13:27:53 UTC (rev 524)
+++ mplayerxp/mplayerxp.cpp	2012-12-08 13:40:58 UTC (rev 525)
@@ -634,7 +634,7 @@
 void show_help(void) {
     // no file/vcd/dvd -> show HELP:
     MSG_INFO("%s",help_text);
-    print_stream_drivers();
+    Stream::print_drivers();
     MSG_INFO("\nExample: mplayerxp -ao alsa:hw:0 -vo x11 your.avi\n"
 	     "Use --long-help option for full help\n");
 }
@@ -643,7 +643,7 @@
     MPXPSystem& MPXPSys=*mpxp_context().engine().MPXPSys;
     m_config_show_options(mpxp_context().mconfig);
     mp_input_print_binds(MPXPSys.libinput());
-    print_stream_drivers();
+    Stream::print_drivers();
     mpxp_context().video().output->print_help();
     ao_print_help();
     vf_help();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.