[G15daemon-commits] SF.net SVN: g15daemon: [33] trunk/g15daemon/g15daemon

[<mla...@us...>]

Revision: 33
Author:   mlampard
Date:     2006-07-30 02:34:18 -0700 (Sun, 30 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/g15daemon/?rev=33&view=rev

Log Message:
-----------
fix g15daemon.h. add support for libg15render buffers.(thanks aneurysm9)

Modified Paths:
--------------
    trunk/g15daemon/g15daemon/g15daemon.h
    trunk/g15daemon/g15daemon/utility_funcs.c
    trunk/g15daemon/libg15daemon_client/g15daemon_client.h
    trunk/g15daemon/libg15daemon_client/g15daemon_net.c
Modified: trunk/g15daemon/g15daemon/g15daemon.h
===================================================================
--- trunk/g15daemon/g15daemon/g15daemon.h	2006-07-30 09:04:11 UTC (rev 32)
+++ trunk/g15daemon/g15daemon/g15daemon.h	2006-07-30 09:34:18 UTC (rev 33)
@@ -115,7 +115,7 @@
 int init_sockserver();
 int g15_clientconnect(lcdlist_t **g15daemon,int listening_socket);
 int g15_send(int sock, char *buf, unsigned int len);
-int g15_recv(int sock, char *buf, unsigned int len);
+int g15_recv(lcdnode_t *lcdnode, int sock, char *buf, unsigned int len);
 
 /* handy function from xine_utils.c */
 void *g15_xmalloc(size_t size);

Modified: trunk/g15daemon/g15daemon/utility_funcs.c
===================================================================
--- trunk/g15daemon/g15daemon/utility_funcs.c	2006-07-30 09:04:11 UTC (rev 32)
+++ trunk/g15daemon/g15daemon/utility_funcs.c	2006-07-30 09:34:18 UTC (rev 33)
@@ -460,6 +460,18 @@
             pthread_mutex_unlock(&lcdlist_mutex);
         }
     }
+ \xA0 \xA0else if (tmpbuf[0]=='R') { /* libg15render buffer */
+ \xA0 \xA0\xA0\xA0\xA0while(!leaving) {
+ \xA0 \xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0retval = g15_recv(g15node, client_sock, (char *)tmpbuf, 1048);
+ \xA0 \xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0if(retval != 1048) {
+ \xA0 \xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0break;
+ \xA0 \xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0}
+ \xA0 \xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0pthread_mutex_lock(&lcdlist_mutex);
+ \xA0 \xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0memcpy(client_lcd->buf,tmpbuf,sizeof(client_lcd->buf));
+ \xA0 \xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0client_lcd->ident = random();
+ \xA0 \xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0pthread_mutex_unlock(&lcdlist_mutex);
+ \xA0 \xA0\xA0\xA0\xA0}
+ \xA0 \xA0}
     else if (tmpbuf[0]=='W'){ /* wbmp buffer - we assume (stupidly) that it's 160 pixels wide */
         while(!leaving) {
             retval = g15_recv(g15node, client_sock,(char*)tmpbuf, 865);

Modified: trunk/g15daemon/libg15daemon_client/g15daemon_client.h
===================================================================
--- trunk/g15daemon/libg15daemon_client/g15daemon_client.h	2006-07-30 09:04:11 UTC (rev 32)
+++ trunk/g15daemon/libg15daemon_client/g15daemon_client.h	2006-07-30 09:34:18 UTC (rev 33)
@@ -31,6 +31,7 @@
 #define G15_PIXELBUF 0
 #define G15_TEXTBUF 1
 #define G15_WBMPBUF 2
+#define G15_G15RBUF 3
 
 const char *g15daemon_version();
 

Modified: trunk/g15daemon/libg15daemon_client/g15daemon_net.c
===================================================================
--- trunk/g15daemon/libg15daemon_client/g15daemon_net.c	2006-07-30 09:04:11 UTC (rev 32)
+++ trunk/g15daemon/libg15daemon_client/g15daemon_net.c	2006-07-30 09:34:18 UTC (rev 33)
@@ -71,6 +71,8 @@
         g15_send(g15screen_fd,"TBUF",4);
     else if(screentype == G15_WBMPBUF) /* wbmp buffer */
         g15_send(g15screen_fd,"WBUF",4);
+ \xA0 \xA0else if(screentype == G15_G15RBUF)
+  \xA0 \xA0\xA0\xA0\xA0g15_send(g15screen_fd,"RBUF",4);
     else 
         g15_send(g15screen_fd,"GBUF",4);
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.