From 6ea5a07027eca2fbb9cdbc0ad9e6c679ad774db4 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 14 Feb 2009 06:29:26 -0700 Subject: Added artist/title tag info support --- ChangeLog.txt | 5 +++++ linden/indra/llmedia/llmediaimplgstreamer.cpp | 9 ++------- linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc | 4 ++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 5a00286..3064da1 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -31,6 +31,11 @@ * linden/indra/llui/lltexteditor.cpp: Fixed crash in LLTextEditor::findHTML + * linden/indra/llmedia/llmediaimplgstreamer.cpp: + Added artist/title tag info support. + * linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc: + Ditto. + 2009-02-04 McCabe Maxsted diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp index b90d6e8..bae8ad9 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp @@ -188,9 +188,6 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data) // Init our custom plugins - only really need do this once. gst_slvideo_init_class(); -#if 0 - gst_slsound_init_class(); -#endif done_init = true; } @@ -338,7 +335,6 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp } case GST_MESSAGE_TAG: { -#if 0 GstTagList *tag_list; gchar *title; gchar *artist; @@ -348,10 +344,9 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp gboolean hazArtist = llgst_tag_list_get_string(tag_list, GST_TAG_ARTIST, &artist); if(hazTitle) - LL_INFOS("MediaInfo") << "Title is " << title << LL_ENDL; + LL_INFOS("MediaInfo") << "Title: " << title << LL_ENDL; if(hazArtist) - LL_INFOS("MediaInfo") << "Artist is " << artist << LL_ENDL; -#endif + LL_INFOS("MediaInfo") << "Artist: " << artist << LL_ENDL; break; } case GST_MESSAGE_EOS: diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc index 08ba6df..e17a7a0 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc +++ b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc @@ -40,3 +40,7 @@ LL_GST_SYM(true, gst_element_seek, bool, GstElement *, gdouble, GstFormat, GstSe LL_GST_SYM(false, gst_segtrap_set_enabled, void, gboolean enabled); LL_GST_SYM(false, gst_message_parse_buffering, void, GstMessage *message, gint *percent); LL_GST_SYM(false, gst_message_parse_info, void, GstMessage *message, GError **gerror, gchar **debug); + +//aw tag infos (Artist, Title, ...tbc...) +LL_GST_SYM(true, gst_message_parse_tag, void, GstMessage *message, GstTagList **tag_list); +LL_GST_SYM(true, gst_tag_list_get_string, gboolean, const GstTagList *list, const gchar *tag, gchar **value); -- cgit v1.1