[Swfdec-commits] Branch 'rtmp' - 2 commits - swfdec/swfdec_as_strings.c swfdec/swfdec_net_stream.c swfdec/swfdec_net_stream_video.c

[Benjamin Otte]

 swfdec/swfdec_as_strings.c       |    3 +++
 swfdec/swfdec_net_stream.c       |   25 ++++++++++++++++++++++---
 swfdec/swfdec_net_stream_video.c |    2 +-
 3 files changed, 26 insertions(+), 4 deletions(-)

New commits:
commit 966e67e6627bd65e5c05ad3db15573bb9e0f4b8e
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri Dec 19 16:38:11 2008 +0100

    wrong variable name (oops)

diff --git a/swfdec/swfdec_net_stream_video.c b/swfdec/swfdec_net_stream_video.c
index f7fe381..6135f95 100644
--- a/swfdec/swfdec_net_stream_video.c
+++ b/swfdec/swfdec_net_stream_video.c
@@ -295,7 +295,7 @@ swfdec_net_stream_video_start (SwfdecNetStreamVideo *video)
   g_assert (!video->playing);
 
   video->time = 0;
-  video->next->length += packet->header.timestamp;
+  video->next_length += packet->header.timestamp;
   video->playing = TRUE;
   video->timeout.timestamp = SWFDEC_PLAYER (swfdec_gc_object_get_context (video))->priv->time;
   video->timeout.timestamp -= SWFDEC_TICKS_PER_SECOND * packet->header.timestamp / 1000;
commit 771c07e893a846e0a12dc26e605b0d2a692a0398
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri Dec 19 11:01:44 2008 +0100

    special case all special NetStream functions

diff --git a/swfdec/swfdec_as_strings.c b/swfdec/swfdec_as_strings.c
index a03ce40..dd25db4 100644
--- a/swfdec/swfdec_as_strings.c
+++ b/swfdec/swfdec_as_strings.c
@@ -549,6 +549,9 @@ const SwfdecAsConstantStringValue swfdec_as_strings[] = {
   SWFDEC_AS_CONSTANT_STRING ("videoFunction")
   SWFDEC_AS_CONSTANT_STRING ("isConnected")
   SWFDEC_AS_CONSTANT_STRING ("uri")
+  SWFDEC_AS_CONSTANT_STRING ("publish")
+  SWFDEC_AS_CONSTANT_STRING ("receiveAudio")
+  SWFDEC_AS_CONSTANT_STRING ("receiveVideo")
   /* add more here */
   { 0, 0, "" }
 };
diff --git a/swfdec/swfdec_net_stream.c b/swfdec/swfdec_net_stream.c
index 85c9d9c..0dba659 100644
--- a/swfdec/swfdec_net_stream.c
+++ b/swfdec/swfdec_net_stream.c
@@ -526,15 +526,34 @@ swfdec_net_stream_send_connection (SwfdecAsContext *cx, SwfdecAsObject *object,
 {
   SwfdecNetStream *stream;
   SwfdecAsObject *o, *ret_cb = NULL;
-  SwfdecAsValue name;
+  SwfdecAsValue name_value;
+  const char *name;
 
-  SWFDEC_AS_CHECK (0, NULL, "ov|O", &o, &name, &ret_cb);
+  SWFDEC_AS_CHECK (0, NULL, "ov|O", &o, &name_value, &ret_cb);
 
   if (!SWFDEC_IS_NET_STREAM (o->relay))
     return;
   stream = SWFDEC_NET_STREAM (o->relay);
 
-  swfdec_rtmp_rpc_send (stream->rpc, name, ret_cb, MAX (3, argc) - 3, argv + 3);
+  if (SWFDEC_AS_VALUE_IS_STRING (name_value)) {
+    name = SWFDEC_AS_VALUE_GET_STRING (name_value);
+    if (name == SWFDEC_AS_STR_pause) {
+      SWFDEC_STUB ("NetStream.pause");
+    } else if (name == SWFDEC_AS_STR_play) {
+      SWFDEC_STUB ("NetStream.play");
+    } else if (name == SWFDEC_AS_STR_publish) {
+      SWFDEC_STUB ("NetStream.publish");
+    } else if (name == SWFDEC_AS_STR_seek) {
+      SWFDEC_STUB ("NetStream.seek");
+    } else if (name == SWFDEC_AS_STR_receiveAudio) {
+      SWFDEC_STUB ("NetStream.receiveAudio");
+    } else if (name == SWFDEC_AS_STR_receiveVideo) {
+      SWFDEC_STUB ("NetStream.receiveVideo");
+    } else {
+      SWFDEC_WARNING ("NetStream.%s does not exist.", name);
+    }
+  }
+  swfdec_rtmp_rpc_send (stream->rpc, name_value, ret_cb, MAX (3, argc) - 3, argv + 3);
   /* FIXME: This should be done by some smart API */
   if (stream->stream) {
     SwfdecRtmpPacket *packet = swfdec_rtmp_rpc_pop (stream->rpc, FALSE);