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

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

Revision: 556
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=556&view=rev
Author:   nickols_k
Date:     2012-12-13 10:49:20 +0000 (Thu, 13 Dec 2012)
Log Message:
-----------
anti-illegal patch cleanups: project compiled with -g3 lost >1MB of size. 119760K -> 118266K

Modified Paths:
--------------
    mplayerxp/libmpstream2/s_rtsp.cpp
    mplayerxp/libmpstream2/s_udp.cpp
    mplayerxp/libmpstream2/stream.h
    mplayerxp/mplayerxp.cpp

Modified: mplayerxp/libmpstream2/s_rtsp.cpp
===================================================================
--- mplayerxp/libmpstream2/s_rtsp.cpp	2012-12-13 09:34:32 UTC (rev 555)
+++ mplayerxp/libmpstream2/s_rtsp.cpp	2012-12-13 10:49:20 UTC (rev 556)
@@ -22,6 +22,7 @@
 #include "help_mp.h"
 #include "url.h"
 #include "tcp.h"
+#include "network.h"
 #include "librtsp/rtsp.h"
 #include "librtsp/rtsp_session.h"
 #include "stream_msg.h"

Modified: mplayerxp/libmpstream2/s_udp.cpp
===================================================================
--- mplayerxp/libmpstream2/s_udp.cpp	2012-12-13 09:34:32 UTC (rev 555)
+++ mplayerxp/libmpstream2/s_udp.cpp	2012-12-13 10:49:20 UTC (rev 556)
@@ -21,6 +21,7 @@
 #include "stream_internal.h"
 #include "help_mp.h"
 #include "tcp.h"
+#include "network.h"
 #include "udp.h"
 #include "url.h"
 #include "stream_msg.h"

Modified: mplayerxp/libmpstream2/stream.h
===================================================================
--- mplayerxp/libmpstream2/stream.h	2012-12-13 09:34:32 UTC (rev 555)
+++ mplayerxp/libmpstream2/stream.h	2012-12-13 10:49:20 UTC (rev 556)
@@ -10,9 +10,6 @@
 #include <string.h>
 
 #include "xmpcore/xmp_enums.h"
-#ifdef HAVE_STREAMING
-#include "network.h"
-#endif
 
 struct networking_t;
 namespace mpxp {
@@ -59,11 +56,12 @@
 	    static void		print_drivers();
 
 	    virtual MPXP_Rc	open(libinput_t&libinput,const std::string& filename,int* file_format);
+	    virtual void	close();
+
 	    virtual int		read(any_t* mem,int total);
 	    virtual off_t	seek(off_t off);
 	    virtual int		skip(off_t len);
 	    virtual off_t	tell() const;
-	    virtual void	close();
 	    virtual MPXP_Rc	ctrl(unsigned cmd,any_t* param);
 
 	    virtual void	reset();

Modified: mplayerxp/mplayerxp.cpp
===================================================================
--- mplayerxp/mplayerxp.cpp	2012-12-13 09:34:32 UTC (rev 555)
+++ mplayerxp/mplayerxp.cpp	2012-12-13 10:49:20 UTC (rev 556)
@@ -35,6 +35,7 @@
 #include "help_mp.h"
 
 #include "libmpstream2/stream.h"
+#include "libmpstream2/network.h"
 #include "libmpdemux/demuxer.h"
 
 #include "libmpconf/cfgparser.h"

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