Map gstreamer over dbus tags into xmpp tune tags.

[cascardo/pubsub-bot.git] / status.c

diff --git a/status.c b/status.c
index afb71bd..2c78898 100644 (file)
--- a/status.c
+++ b/status.c
@@ -32,7 +32,7 @@ static char * password = "pubsub";
 static char * pbservice = "pubsub.vespa.holoscopio.com";
 static char * authed_jid = "vespa";
 
-iks *
+static iks *
 createiq (char *type, char *to, char *qnam, char *xmlns, iks **query)
 {
   static int id = 0;
@@ -48,7 +48,7 @@ createiq (char *type, char *to, char *qnam, char *xmlns, iks **query)
   return iq;
 }
 
-void
+static void
 catnode (iksparser *parser, char *node)
 {
   iks *iq;
@@ -61,7 +61,7 @@ catnode (iksparser *parser, char *node)
   iks_delete (iq);
 }
 
-void
+static void
 listnode (iksparser *parser, char *node)
 {
   iks *iq;
@@ -74,7 +74,7 @@ listnode (iksparser *parser, char *node)
   iks_delete (iq);
 }
 
-void
+static void
 createnode (iksparser *parser, char *node)
 {
   iks *iq;
@@ -86,7 +86,7 @@ createnode (iksparser *parser, char *node)
   iks_delete (iq);
 }
 
-void
+static void
 getnode (iksparser *parser, char *node)
 {
   iks *iq;
@@ -98,7 +98,7 @@ getnode (iksparser *parser, char *node)
   iks_delete (iq);
 }
 
-void
+static void
 vcard (iksparser *parser)
 {
   iks *iq;
@@ -108,7 +108,7 @@ vcard (iksparser *parser)
   iks_delete (iq);
 }
 
-iks *
+static iks *
 createmood (char *line)
 {
   iks *mood;
@@ -118,7 +118,7 @@ createmood (char *line)
   return mood;
 }
 
-void
+static void
 pushmood (iksparser *parser, char *node, char *line)
 {
   iks *iq;
@@ -137,7 +137,7 @@ pushmood (iksparser *parser, char *node, char *line)
   iks_delete (iq);
 }
 
-iks *
+static iks *
 createtune (char *line)
 {
   iks *tune;
@@ -147,7 +147,7 @@ createtune (char *line)
   return tune;
 }
 
-void
+static void
 pushtune (iksparser *parser, char *node, iks *tune)
 {
   iks *iq;
@@ -166,7 +166,7 @@ pushtune (iksparser *parser, char *node, iks *tune)
 }
 
 
-void
+static void
 process_mood (iksparser *parser, char *cmdline)
 {
   char *cmd;
@@ -200,7 +200,7 @@ process_mood (iksparser *parser, char *cmdline)
   free (orig_cmdline);
 }
 
-int
+static int
 xmpp_session_hook (iksparser *parser, iks *node)
 {
   iks *iq;
@@ -214,7 +214,7 @@ xmpp_session_hook (iksparser *parser, iks *node)
   return 0;
 }
 
-int
+static int
 xmpp_initial_presence_hook (iksparser *parser, iks *node)
 {
   iks *pres;
@@ -224,7 +224,7 @@ xmpp_initial_presence_hook (iksparser *parser, iks *node)
   return 0;
 }
 
-int
+static int
 xmpp_id_hook (iksparser *parser, iks *node, char *id)
 {
   if (!iks_strcmp (id, "bind1"))
@@ -244,13 +244,13 @@ xmpp_id_hook (iksparser *parser, iks *node, char *id)
   return 1;
 }
 
-int
+static int
 xmpp_ns_hook (iksparser *parser, iks *node, char *ns)
 {
   return 1;
 }
 
-int
+static int
 xmpp_iq_error (iksparser *parser, iks *node)
 {
   iks *enode;
@@ -277,21 +277,21 @@ xmpp_iq_error (iksparser *parser, iks *node)
   return 0;
 }
 
-int
+static int
 xmpp_tls_hook (iksparser *parser, iks *node)
 {
   iks_start_tls (parser);
   return 0;
 }
 
-int
+static int
 xmpp_sasl_hook (iksparser *parser, iks* node)
 {
   iks_start_sasl (parser, IKS_SASL_DIGEST_MD5, username, password);
   return 0;
 }
 
-int
+static int
 xmpp_bind_hook (iksparser *parser, iks *node)
 {
   iks *iq;
@@ -305,7 +305,7 @@ xmpp_bind_hook (iksparser *parser, iks *node)
   return 0;
 }
 
-int
+static int
 xmpp_features_hook (iksparser *parser, iks *node)
 {
   iks *feat;
@@ -332,7 +332,7 @@ xmpp_features_hook (iksparser *parser, iks *node)
   return 1;
 }
 
-int
+static int
 xmpp_other_hook (iksparser *parser, iks *node, char *ns)
 {
   if (!iks_strcmp (ns, "urn:ietf:params:xml:ns:xmpp-sasl"))
@@ -409,7 +409,7 @@ hook (void *data, int type, iks *node)
   return IKS_OK;
 }
 
-gboolean
+static gboolean
 handler (GIOChannel *channel, GIOCondition cond, gpointer data)
 {
   iksparser *parser = data;
@@ -417,7 +417,29 @@ handler (GIOChannel *channel, GIOCondition cond, gpointer data)
   return TRUE;
 }
 
-void
+struct
+  { char * key; char * val; } keymaps[] =
+{
+  { "artist", "artist" },
+  { "duration", "length" },
+  { "album", "source" },
+  { "title", "title" },
+  { "track-number", "track" },
+  { "location", "uri" },
+  { NULL, NULL }
+};
+
+static char *
+map_key (char *orig)
+{
+  int i;
+  for (i = 0; keymaps[i].key != NULL; i++)
+    if (strcmp (orig, keymaps[i].key) == 0)
+      return keymaps[i].val;
+  return NULL;
+}
+
+static void
 tune_add_dbus_arg (iks *tune, DBusMessageIter *args)
 {
   DBusMessageIter entry;
@@ -440,13 +462,14 @@ tune_add_dbus_arg (iks *tune, DBusMessageIter *args)
     }
   else
     printf ("%c\n", dbus_message_iter_get_arg_type (&entry));
+  strkey = map_key (strkey);
   if (strkey && strval)
     {
       iks_insert_cdata (iks_insert (tune, strkey), strval, 0);
     }
 }
 
-iks *
+static iks *
 tune_from_dbus (DBusMessage *msg)
 {
   DBusMessageIter args;
@@ -468,7 +491,7 @@ tune_from_dbus (DBusMessage *msg)
   return tune;
 }
 
-DBusHandlerResult
+static DBusHandlerResult
 gettune (DBusConnection *conn, DBusMessage *msg, void *data)
 {
   iks *tune;
@@ -495,7 +518,7 @@ prepare_dbus (gpointer parser)
   dbus_connection_add_filter (conn, gettune, parser, NULL);
 }
 
-void
+static void
 loop (iksparser *parser)
 {
   GIOChannel *channel;