[Gnash-commit] /srv/bzr/gnash/rtmp r9925: don't name the object 'application', add the code property before descritption.

[rob]

------------------------------------------------------------
revno: 9925
committer: address@hidden
branch nick: rtmp
timestamp: Sun 2008-12-28 15:37:53 -0700
message:
  don't name the object 'application', add the code property before 
descritption.
modified:
  libnet/rtmp_server.cpp

=== modified file 'libnet/rtmp_server.cpp'
--- a/libnet/rtmp_server.cpp    2008-12-28 21:42:55 +0000
+++ b/libnet/rtmp_server.cpp    2008-12-28 22:37:53 +0000
@@ -384,7 +384,8 @@
     number->makeNumber(1);     // FIXME: needs a real value, which should 
increment
 
     Element top;
-    top.makeObject("application");
+//    top.makeObject("application");
+    top.makeObject();
     
     switch (status) {
       case RTMPMsg::APP_GC:
@@ -437,14 +438,14 @@
          boost::shared_ptr<amf::Element> level(new Element);
          level->makeString("level", "status");
          top.addProperty(level);
+         
+         boost::shared_ptr<amf::Element> code(new Element);
+         code->makeString("code", "NetConnection.Connect.Success");
+         top.addProperty(code);
 
          boost::shared_ptr<amf::Element> description(new Element);
          description->makeString("description", "Connection succeeded.");
          top.addProperty(description);
-         
-         boost::shared_ptr<amf::Element> code(new Element);
-         code->makeString("code", "NetConnection.Connect.Success");
-         top.addProperty(code);
       }
       break;
       case RTMPMsg::NS_CLEAR_FAILED:
@@ -585,7 +586,7 @@
     bool what1 = rtmp->sendMsg(args->netfd, RTMP_SYSTEM_CHANNEL, 
RTMP::HEADER_12,
                               ping_reset->size(), RTMP::PING, 
RTMPMsg::FROM_SERVER, *ping_reset);
     
-    // send a response
+    // send a response to the NetConnection::connect() request
     boost::shared_ptr<amf::Buffer> response = 
rtmp->encodeResult(RTMPMsg::NC_CONNECT_SUCCESS);
     bool what = rtmp->sendMsg(args->netfd, head->channel, RTMP::HEADER_12,
                              response->allocated(), RTMP::INVOKE,