[Gnash-commit] gnash ChangeLog server/asobj/NetStreamGst.cpp t...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     08/01/21 18:16:16

Modified files:
        .              : ChangeLog 
        server/asobj   : NetStreamGst.cpp 
        testsuite/actionscript.all: NetConnection.as NetStream.as 

Log message:
                * server/asobj/NetStreamGst.cpp: Disable parsing code for 
                buffering messages, as the same is achived through signal 
                handlers and older gstreamer doesn't have this function. Emit 
                the playStop message when the end of the stream has been 
                reached (allows NetStream-SquareTest to run).
                * testsuite/actionscript.all/NetConnection.as: We currently 
don't
                implement the isConnected property, so xcheck it for now.
                * testsuite/actionscript.all/NetStream.as: We now implement
                currentFPS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5447&r2=1.5448
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/NetConnection.as?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/NetStream.as?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5447
retrieving revision 1.5448
diff -u -b -r1.5447 -r1.5448
--- ChangeLog   21 Jan 2008 17:34:27 -0000      1.5447
+++ ChangeLog   21 Jan 2008 18:16:15 -0000      1.5448
@@ -1,3 +1,15 @@
+2008-01-21 Bastiaan Jacques <address@hidden>
+
+       * server/asobj/NetStreamGst.cpp: Disable parsing code for
+       buffering messages, as the same is achived through signal 
+       handlers and older gstreamer doesn't have this function. Emit
+       the playStop message when the end of the stream has been
+       reached (allows NetStream-SquareTest to run).
+       * testsuite/actionscript.all/NetConnection.as: We currently don't
+       implement the isConnected property, so xcheck it for now.
+       * testsuite/actionscript.all/NetStream.as: We now implement
+       currentFPS.
+
 2008-01-21 Sandro Santilli <address@hidden>
 
        * server/swf/tag_loaders.cpp: warn only once about different

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- server/asobj/NetStreamGst.cpp       21 Jan 2008 07:07:28 -0000      1.65
+++ server/asobj/NetStreamGst.cpp       21 Jan 2008 18:16:15 -0000      1.66
@@ -181,7 +181,9 @@
 NetStreamGst::play(const std::string& url)
 {
   std::string valid_url = _netCon->validateURL(url);
-  
+#if 0
+  log_msg("%s: connecting to %s\n", __FUNCTION__, valid_url);
+#endif
   if (valid_url.empty()) {
     // error; TODO: nofiy user
     return;
@@ -419,6 +421,7 @@
     }
     case GST_MESSAGE_EOS:
       log_msg(_("NetStream has reached the end of the stream."));
+      setStatus(playStop);
       break;
     case GST_MESSAGE_TAG:
     {
@@ -437,12 +440,16 @@
     }    
     case GST_MESSAGE_BUFFERING:
     {
+#if 0
+      // This is most likely not necessary since we have a signal handler
+      // that achieves the same functionality.
       gint percent_buffered;
       gst_message_parse_buffering(message, &percent_buffered);
       
       if (percent_buffered == 100) {
         setStatus(bufferFull);      
       }
+#endif
       break;
     }
     case GST_MESSAGE_STATE_CHANGED:
@@ -528,7 +535,6 @@
   gst_caps_unref (caps);
 
   if (g_strrstr (structure_name, "audio")) {
-
     if (GST_PAD_IS_LINKED (ns->_audiopad)) {
       return;
     }

Index: testsuite/actionscript.all/NetConnection.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/NetConnection.as,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- testsuite/actionscript.all/NetConnection.as 5 Jan 2008 10:01:42 -0000       
1.15
+++ testsuite/actionscript.all/NetConnection.as 21 Jan 2008 18:16:16 -0000      
1.16
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: NetConnection.as,v 1.15 2008/01/05 10:01:42 strk Exp $";
+rcsid="$Id: NetConnection.as,v 1.16 2008/01/21 18:16:16 bjacques Exp $";
 
 #include "check.as"
 
@@ -41,8 +41,8 @@
 check_equals(typeof(tmp), 'object');
 check_equals(tmp.__proto__, NetConnection.prototype);
 check(tmp instanceof NetConnection);
-check_equals(typeof(tmp.isConnected), 'boolean');
-check_equals(tmp.isConnected, false);
+xcheck_equals(typeof(tmp.isConnected), 'boolean');
+xcheck_equals(tmp.isConnected, false);
 // TODO: add tests for all properties
 
 // test the NetConnection::connect method

Index: testsuite/actionscript.all/NetStream.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/NetStream.as,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- testsuite/actionscript.all/NetStream.as     23 Nov 2007 17:00:25 -0000      
1.16
+++ testsuite/actionscript.all/NetStream.as     21 Jan 2008 18:16:16 -0000      
1.17
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: NetStream.as,v 1.16 2007/11/23 17:00:25 strk Exp $";
+rcsid="$Id: NetStream.as,v 1.17 2008/01/21 18:16:16 bjacques Exp $";
 
 #include "check.as"
 
@@ -150,7 +150,7 @@
 /* Properties */
 
 // currentFps (read-only)
-check_equals ( typeof(netstreamObj.currentFps), 'undefined' );
+check_equals ( typeof(netstreamObj.currentFps), 'number' );
 netstreamObj.currentFps = 'string';
 xcheck_equals ( typeof(netstreamObj.currentFps), 'string' );
 netstreamObj.currentFps = false;