[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[515] mplayerxp/libmpstream

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

Revision: 515
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=515&view=rev
Author:   nickols_k
Date:     2012-12-06 16:46:40 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
fixes: now mplayerxp can establish connection with servers...

Modified Paths:
--------------
    mplayerxp/libmpstream/s_network.cpp
    mplayerxp/libmpstream/s_rtsp.cpp
    mplayerxp/libmpstream/s_udp.cpp
    mplayerxp/libmpstream/stream.cpp

Modified: mplayerxp/libmpstream/s_network.cpp
===================================================================
--- mplayerxp/libmpstream/s_network.cpp	2012-12-06 16:03:44 UTC (rev 514)
+++ mplayerxp/libmpstream/s_network.cpp	2012-12-06 16:46:40 UTC (rev 515)
@@ -43,8 +43,10 @@
 
 Network_Stream_Interface::Network_Stream_Interface() {}
 Network_Stream_Interface::~Network_Stream_Interface() {
-    url_free(url);
-    delete url;
+    if(url) {
+	url_free(url);
+	delete url;
+    }
 }
 
 MPXP_Rc Network_Stream_Interface::open(libinput_t* libinput,const char *filename,unsigned flags)
@@ -56,7 +58,9 @@
 	if(networking_start(&fd,networking,url)<0){
 	    MSG_ERR(MSGTR_UnableOpenURL, filename);
 	    url_free(url);
+	    url=NULL;
 	    free_networking(networking);
+	    networking=NULL;
 	    return MPXP_False;
 	}
 	MSG_INFO(MSGTR_ConnToServer, url->hostname);
@@ -66,8 +70,8 @@
     return MPXP_False;
 }
 stream_type_e Network_Stream_Interface::type() const { return STREAMTYPE_STREAM; }
-off_t	Network_Stream_Interface::size() const { return STREAM_BUFFER_SIZE; }
-off_t	Network_Stream_Interface::sector_size() const { return -1; }
+off_t	Network_Stream_Interface::size() const { return 0; }
+off_t	Network_Stream_Interface::sector_size() const { return 1; }
 
 int Network_Stream_Interface::read(stream_packet_t*sp)
 {
@@ -112,7 +116,7 @@
 
 extern const stream_interface_info_t network_stream =
 {
-    "inet:",
+    "*://",
     "reads multimedia stream from any known network protocol. Example: inet:http://myserver.com",
     query_interface
 };

Modified: mplayerxp/libmpstream/s_rtsp.cpp
===================================================================
--- mplayerxp/libmpstream/s_rtsp.cpp	2012-12-06 16:03:44 UTC (rev 514)
+++ mplayerxp/libmpstream/s_rtsp.cpp	2012-12-06 16:46:40 UTC (rev 515)
@@ -162,7 +162,7 @@
     return MPXP_Ok;
 }
 stream_type_e Rtsp_Stream_Interface::type() const { return STREAMTYPE_STREAM; }
-off_t	Rtsp_Stream_Interface::size() const { return -1; }
+off_t	Rtsp_Stream_Interface::size() const { return 0; }
 off_t	Rtsp_Stream_Interface::sector_size() const { return 1; }
 
 static Stream_Interface* query_interface() { return new(zeromem) Rtsp_Stream_Interface; }

Modified: mplayerxp/libmpstream/s_udp.cpp
===================================================================
--- mplayerxp/libmpstream/s_udp.cpp	2012-12-06 16:03:44 UTC (rev 514)
+++ mplayerxp/libmpstream/s_udp.cpp	2012-12-06 16:46:40 UTC (rev 515)
@@ -112,7 +112,7 @@
     return MPXP_Ok;
 }
 stream_type_e Udp_Stream_Interface::type() const { return STREAMTYPE_STREAM; }
-off_t	Udp_Stream_Interface::size() const { return -1; }
+off_t	Udp_Stream_Interface::size() const { return 0; }
 off_t	Udp_Stream_Interface::sector_size() const { return 1; }
 
 static Stream_Interface* query_interface() { return new(zeromem) Udp_Stream_Interface; }

Modified: mplayerxp/libmpstream/stream.cpp
===================================================================
--- mplayerxp/libmpstream/stream.cpp	2012-12-06 16:03:44 UTC (rev 514)
+++ mplayerxp/libmpstream/stream.cpp	2012-12-06 16:46:40 UTC (rev 515)
@@ -109,9 +109,10 @@
     done=0;
     for(i=0;sdrivers[i]!=&null_stream;i++) {
 	mrl_len=strlen(sdrivers[i]->mrl);
-	if(strncmp(filename,sdrivers[i]->mrl,mrl_len)==0) {
+	if(strncmp(filename,sdrivers[i]->mrl,mrl_len)==0||sdrivers[i]->mrl[0]=='*') {
 	    MSG_V("Opening %s ... ",sdrivers[i]->mrl);
 	    Stream_Interface* drv = sdrivers[i]->query_interface();
+	    if(sdrivers[i]->mrl[0]=='*') mrl_len=0;
 	    if(drv->open(libinput,&filename[mrl_len],0)==MPXP_Ok) {
 		MSG_V("OK\n");
 		*file_format = stream->file_format;

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