changeset 1438:ce0285d8cede trunk

[svn] - make the remote API actually work
author nenolod
date Fri, 28 Jul 2006 00:33:37 -0700
parents dd2b97f79a20
children bd0b46c8a70e
files ChangeLog libaudacious/beepctrl.c
diffstat 2 files changed, 19 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jul 28 00:16:07 2006 -0700
+++ b/ChangeLog	Fri Jul 28 00:33:37 2006 -0700
@@ -1,3 +1,13 @@
+2006-07-28 07:16:07 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1788]
+  - add audacious_set_session_uri().
+  
+
+  Changes:        Modified:
+  +6 -0           trunk/libaudacious/beepctrl.c  
+  +4 -0           trunk/libaudacious/beepctrl.h  
+
+
 2006-07-28 07:13:02 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1786]
   - add framework for later handling tcp:// connections
--- a/libaudacious/beepctrl.c	Fri Jul 28 00:16:07 2006 -0700
+++ b/libaudacious/beepctrl.c	Fri Jul 28 00:33:37 2006 -0700
@@ -38,7 +38,7 @@
 #include "libaudacious/configdb.h"
 
 /* overrides audacious_get_session_uri(). */
-static gchar *session_uri = NULL;
+gchar *audacious_session_uri = NULL;
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -300,7 +300,7 @@
 void
 audacious_set_session_uri(gchar *uri)
 {
-    session_uri = uri;
+    audacious_session_uri = uri;
 }
 
 gchar *
@@ -311,8 +311,11 @@
 
     db = bmp_cfg_db_open();
 
-    if (session_uri != NULL)
-	return session_uri;
+    if (audacious_session_uri != NULL)
+    {
+        printf("%p\n", audacious_session_uri);
+	return audacious_session_uri;
+    }
 
     bmp_cfg_db_get_string(db, NULL, "session_uri_base", &value);
 
@@ -344,7 +347,7 @@
 void
 audacious_decode_tcp_uri(gint session, gchar *in, gchar **host, gint *port, gchar **key)
 {
-    gchar *workbuf = NULL, *keybuf = NULL;
+    static gchar workbuf[1024], keybuf[1024];
     gint iport;
 
     /* split out the host/port and key */
@@ -370,7 +373,7 @@
 void
 audacious_decode_unix_uri(gint session, gchar *in, gchar **out)
 {
-    gchar *workbuf = NULL, *pathbuf = NULL;
+    static gchar workbuf[1024], pathbuf[1024];
 
     /* retrieve the pathbuf */
     sscanf(in, "unix://%s/%s", workbuf, pathbuf);