[Swfdec-commits] 2 commits - swfdec-gtk/swfdec_gtk_socket.c vivified/code

[Pekka Lampila]

 swfdec-gtk/swfdec_gtk_socket.c |   33 ++++++++++++++++++---------------
 vivified/code/Makefile.am      |    2 +-
 2 files changed, 19 insertions(+), 16 deletions(-)

New commits:
commit b8c7c427da6b2a52f7d32533c1aad022f874d5ff
Author: Pekka Lampila <pekka.lampila at iki.fi>
Date:   Thu Aug 14 23:43:57 2008 +0300

    Fix few bugs in SwfdecGtkSocket that made it unusable

diff --git a/swfdec-gtk/swfdec_gtk_socket.c b/swfdec-gtk/swfdec_gtk_socket.c
index 275d5c4..13b2272 100644
--- a/swfdec-gtk/swfdec_gtk_socket.c
+++ b/swfdec-gtk/swfdec_gtk_socket.c
@@ -70,16 +70,6 @@ swfdec_gtk_socket_close (SwfdecStream *stream)
 }
 
 static void
-swfdec_gtk_socket_do_connect (SoupSocket *sock, guint status, gpointer gtk)
-{
-  if (SOUP_STATUS_IS_SUCCESSFUL (status))
-    swfdec_stream_open (gtk);
-  else
-    swfdec_stream_error (gtk, "error connecting");
-
-}
-
-static void
 swfdec_gtk_socket_do_disconnect (SoupSocket *sock, SwfdecGtkSocket *gtk)
 {
   swfdec_stream_close (SWFDEC_STREAM (gtk));
@@ -96,8 +86,8 @@ swfdec_gtk_socket_do_read (SoupSocket *sock, SwfdecGtkSocket *gtk)
 
   do {
     buffer = swfdec_buffer_new (SWFDEC_GTK_SOCKET_BLOCK_SIZE);
-    status = soup_socket_read (sock, buffer, SWFDEC_GTK_SOCKET_BLOCK_SIZE, 
-	&len, NULL, &error);
+    status = soup_socket_read (sock, buffer->data,
+	SWFDEC_GTK_SOCKET_BLOCK_SIZE, &len, NULL, &error);
     buffer->length = len;
     switch (status) {
       case SOUP_SOCKET_OK:
@@ -153,6 +143,19 @@ swfdec_gtk_socket_do_write (SoupSocket *sock, SwfdecGtkSocket *gtk)
 }
 
 static void
+swfdec_gtk_socket_do_connect (SoupSocket *sock, guint status, gpointer gtk)
+{
+  if (SOUP_STATUS_IS_SUCCESSFUL (status)) {
+    swfdec_stream_open (gtk);
+    // need to read here, since readable signal will only be launched once the
+    // socket has been read until it's empty once
+    swfdec_gtk_socket_do_read (sock, gtk);
+  } else {
+    swfdec_stream_error (gtk, "error connecting");
+  }
+}
+
+static void
 swfdec_gtk_socket_connect (SwfdecSocket *sock_, SwfdecPlayer *player, 
     const char *hostname, guint port)
 {
@@ -164,11 +167,11 @@ swfdec_gtk_socket_connect (SwfdecSocket *sock_, SwfdecPlayer *player,
       SOUP_SOCKET_FLAG_NONBLOCKING, TRUE,
       SOUP_SOCKET_REMOTE_ADDRESS, addr, NULL);
   g_signal_connect (sock->sock, "disconnected", 
-      G_CALLBACK (swfdec_gtk_socket_do_disconnect), socket);
+      G_CALLBACK (swfdec_gtk_socket_do_disconnect), sock);
   g_signal_connect (sock->sock, "readable", 
-      G_CALLBACK (swfdec_gtk_socket_do_read), socket);
+      G_CALLBACK (swfdec_gtk_socket_do_read), sock);
   g_signal_connect (sock->sock, "writable", 
-      G_CALLBACK (swfdec_gtk_socket_do_write), socket);
+      G_CALLBACK (swfdec_gtk_socket_do_write), sock);
   soup_socket_connect_async (sock->sock, NULL, swfdec_gtk_socket_do_connect, sock);
 }
 
commit 75f6bb215684530d368c2a995da58e93b9fc245b
Author: Pekka Lampila <pekka.lampila at iki.fi>
Date:   Wed Aug 13 15:01:43 2008 +0300

    Add -Wno-inline when compiling lex generated vivi_parser_scanner_lex.c

diff --git a/vivified/code/Makefile.am b/vivified/code/Makefile.am
index d43bc06..6328dff 100644
--- a/vivified/code/Makefile.am
+++ b/vivified/code/Makefile.am
@@ -13,7 +13,7 @@ vivi_parser_scanner_lex.c: vivi_parser_scanner_lex.l
 	$(LEX) vivi_parser_scanner_lex.l
 
 # we create own .la for lex generated code, so we can disable some warnings
-libvivified_parser_lex_la_CFLAGS = $(GLOBAL_CFLAGS) $(SWFDEC_CFLAGS) -Wno-switch-default -Wno-missing-declarations -Wno-missing-prototypes -Wno-sign-compare -Wno-unused-function -Wno-missing-noreturn
+libvivified_parser_lex_la_CFLAGS = $(GLOBAL_CFLAGS) $(SWFDEC_CFLAGS) -Wno-switch-default -Wno-missing-declarations -Wno-missing-prototypes -Wno-sign-compare -Wno-unused-function -Wno-missing-noreturn -Wno-inline
 libvivified_parser_lex_la_LDFLAGS = $(SWFDEC_LIBS)
 
 libvivified_parser_lex_la_SOURCES = \