Changeset 114

Timestamp:

09/07/06 16:00:09 (5 years ago)

Author:

ath

Message:

Better tag handling.

Location:

fm_gui/trunk/src

Files:

• fm_cdj.c (modified) (3 diffs)
• fm_cdj.h (modified) (1 diff)
• fm_cdj_gui.c (modified) (2 diffs)
• fm_cdj_gui.h (modified) (1 diff)

fm_gui/trunk/src/fm_cdj.c

@@ -13 +13 @@
 static void fm_cdj_state_changed_cb     (RgcRemoteObject        *obj,
                                          gint                   new_state,
+                                         gpointer               user_data);
+static void
+fm_cdj_found_tag_cb                     (RgcRemoteObject        *obj,
+                                         gchar                  *tag_name,
+                                         gchar                  *tag_value,
                                          gpointer               user_data);
 
@@ -44 +49 @@
         rgc_remote_signal_connect (obj, "ready", rgc_marshal_cb_VOID__STRING,
                                    G_CALLBACK(fm_cdj_gui_ready_cb), cdata);
+        rgc_remote_signal_connect (obj, "found_tag", rgc_marshal_cb_VOID__STRING_STRING,
+                                   G_CALLBACK(fm_cdj_found_tag_cb), cdata);
 
         // FIXME: check if we've already activated
@@ -69 +76 @@
         fm_cdj_gui_state_changed_cb (obj, new_state, gui);
 }
+
+
+static void
+fm_cdj_found_tag_cb                     (RgcRemoteObject        *obj,
+                                         gchar                  *tag_name,
+                                         gchar                  *tag_value,
+                                         gpointer               user_data)
+{
+        FmCDJData *cdata = (FmCDJData *) user_data;
+        FmCDJGui *gui = cdata->gui;
+
+        g_print("Tag \"%s\" = \"%s\"\n", tag_name, tag_value);
+
+        if (strcmp (tag_name, "artist") == 0) {
+                g_free (cdata->artist);
+                cdata->artist = g_strdup (tag_value);
+        } else if (strcmp (tag_name, "title") == 0) {
+                g_free (cdata->title);
+                cdata->title = g_strdup (tag_value);
+        } else
+                g_print ("Ignoring unknown tag \"%s\"\n", tag_name);
+
+        fm_cdj_gui_display_tag (cdata->gui, cdata->artist, cdata->title);
+}

fm_gui/trunk/src/fm_cdj.h

@@ -7 +7 @@
 
         FmCDJGui        *gui;
+
+        gchar           *artist;
+        gchar           *title;
 };
 

fm_gui/trunk/src/fm_cdj_gui.c

@@ -235 +235 @@
         gchar *basename = g_path_get_basename (selected_filename);
         gchar *message = g_strdup_printf ("LOADING %s", basename);
+
+        g_free (cdata->artist);
+        cdata->artist = NULL;
+        g_free (cdata->title);
+        cdata->title = NULL;
+
         write_message(cdata->gui, message);
         g_free(message);
@@ -326 +332 @@
 
         g_print ("Ready for %s\n", filename);
-        gchar *basename = g_path_get_basename (filename);
+        /*gchar *basename = g_path_get_basename (filename);
         gchar *message = g_strdup_printf ("LOADED %s", basename);
         write_message(cdata->gui, message);
         g_free (message);
-        g_free (basename);
+        g_free (basename);*/
+}
+
+
+void
+fm_cdj_gui_display_tag                  (FmCDJGui               *gui,
+                                         gchar                  *artist,
+                                         gchar                  *title)
+{
+        gchar *message = g_strdup_printf ("%s - %s", artist, title);
+        write_message(gui, message);
+        g_free (message);
 }
 

fm_gui/trunk/src/fm_cdj_gui.h

@@ -65 +65 @@
                                          gint                   new_state,
                                          FmCDJGui               *gui);
+
+void
+fm_cdj_gui_display_tag                  (FmCDJGui               *gui,
+                                         gchar                  *artist,
+                                         gchar                  *title);