[Gnash-commit] /srv/bzr/gnash/trunk r11496: merge from branch. Send the proper result message to createStream() now that the system messages for buffer adjustment are handled correctly.

[Rob Savoye]

------------------------------------------------------------
revno: 11496 [merge]
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Tue 2009-09-08 22:30:16 -0600
message:
  merge from branch. Send the proper result message to createStream() now that 
the system messages for buffer adjustment are handled correctly.
modified:
  cygnal/rtmp_server.cpp
  libnet/rtmp.cpp

=== modified file 'cygnal/rtmp_server.cpp'
--- a/cygnal/rtmp_server.cpp    2009-09-09 03:00:53 +0000
+++ b/cygnal/rtmp_server.cpp    2009-09-09 04:29:26 +0000
@@ -644,7 +644,7 @@
 
     Element *number = new Element;
     // add The server ID
-    number->makeNumber(streamid);      // FIXME: needs a real value, which 
should increment
+    number->makeNumber(streamid);
 
     Element top;
 //    top.makeObject("application");
@@ -1453,6 +1453,14 @@
                          // server instead of any cgi-bin plugins.
                          if (body->getMethodName() == "createStream") {
                              /* int streamid = */ hand->createStream();
+                             double streamid  = body->getStreamID();
+                             log_network("StreamID is: %g", streamid);
+                             response = 
rtmp->encodeResult(RTMPMsg::NS_CREATE_STREAM, streamid);
+                             if (rtmp->sendMsg(args->netfd, qhead->channel,
+                                               RTMP::HEADER_8, 
response->allocated(),
+                                               RTMP::INVOKE, 
RTMPMsg::FROM_SERVER,
+                                               *response)) {
+                                 }
                          } else if (body->getMethodName() == "play") {
                              hand->playStream();
                          } else if (body->getMethodName() == "seek") {

=== modified file 'libnet/rtmp.cpp'
--- a/libnet/rtmp.cpp   2009-09-09 03:00:53 +0000
+++ b/libnet/rtmp.cpp   2009-09-09 04:29:26 +0000
@@ -635,17 +635,12 @@
     
     // All events have only 4 bytes of data, except Set Buffer, which
     // uses 8 bytes. The 4 bytes is usually the Stream ID except for
-    // Ping and Pong events, which carry a time stamp instead.
+    // Ping and Pong events, which carry a time stamp instead. We
+    // don't actually do anything here, we just parse the data.
     switch (eventid) {
       case STREAM_START:
-         log_unimpl("Stream Start");
-         break;
       case STREAM_EOF:
-         log_unimpl("Stream EOF");
-         break;
       case STREAM_NODATA:
-         log_unimpl("Stream No Data");
-         break;
       case STREAM_BUFFER:
       {
          boost::uint32_t param2 = ntohl(*reinterpret_cast<boost::uint32_t 
*>(ptr));
@@ -654,13 +649,8 @@
          break;
       }
       case STREAM_LIVE:
-         log_unimpl("Stream Live");
-         break;
       case STREAM_PING:
-         log_unimpl("Stream Ping");
-         break;
       case STREAM_PONG:
-         log_unimpl("Stream Pong");
          break;
       default:
          log_unimpl("Unknown User Control message %d!", 1);