aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmedia
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-02-14 06:29:26 -0700
committerMcCabe Maxsted2009-02-14 06:29:26 -0700
commit6ea5a07027eca2fbb9cdbc0ad9e6c679ad774db4 (patch)
tree14169ae61007d5c61a9bd358345de6ed34640c79 /linden/indra/llmedia
parentFixed sound settings not being correctly muted (diff)
downloadmeta-impy-6ea5a07027eca2fbb9cdbc0ad9e6c679ad774db4.zip
meta-impy-6ea5a07027eca2fbb9cdbc0ad9e6c679ad774db4.tar.gz
meta-impy-6ea5a07027eca2fbb9cdbc0ad9e6c679ad774db4.tar.bz2
meta-impy-6ea5a07027eca2fbb9cdbc0ad9e6c679ad774db4.tar.xz
Added artist/title tag info support
Diffstat (limited to 'linden/indra/llmedia')
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.cpp9
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc4
2 files changed, 6 insertions, 7 deletions
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)
188 188
189 // Init our custom plugins - only really need do this once. 189 // Init our custom plugins - only really need do this once.
190 gst_slvideo_init_class(); 190 gst_slvideo_init_class();
191#if 0
192 gst_slsound_init_class();
193#endif
194 191
195 done_init = true; 192 done_init = true;
196 } 193 }
@@ -338,7 +335,6 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
338 } 335 }
339 case GST_MESSAGE_TAG: 336 case GST_MESSAGE_TAG:
340 { 337 {
341#if 0
342 GstTagList *tag_list; 338 GstTagList *tag_list;
343 gchar *title; 339 gchar *title;
344 gchar *artist; 340 gchar *artist;
@@ -348,10 +344,9 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
348 gboolean hazArtist = llgst_tag_list_get_string(tag_list, 344 gboolean hazArtist = llgst_tag_list_get_string(tag_list,
349 GST_TAG_ARTIST, &artist); 345 GST_TAG_ARTIST, &artist);
350 if(hazTitle) 346 if(hazTitle)
351 LL_INFOS("MediaInfo") << "Title is " << title << LL_ENDL; 347 LL_INFOS("MediaInfo") << "Title: " << title << LL_ENDL;
352 if(hazArtist) 348 if(hazArtist)
353 LL_INFOS("MediaInfo") << "Artist is " << artist << LL_ENDL; 349 LL_INFOS("MediaInfo") << "Artist: " << artist << LL_ENDL;
354#endif
355 break; 350 break;
356 } 351 }
357 case GST_MESSAGE_EOS: 352 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
40LL_GST_SYM(false, gst_segtrap_set_enabled, void, gboolean enabled); 40LL_GST_SYM(false, gst_segtrap_set_enabled, void, gboolean enabled);
41LL_GST_SYM(false, gst_message_parse_buffering, void, GstMessage *message, gint *percent); 41LL_GST_SYM(false, gst_message_parse_buffering, void, GstMessage *message, gint *percent);
42LL_GST_SYM(false, gst_message_parse_info, void, GstMessage *message, GError **gerror, gchar **debug); 42LL_GST_SYM(false, gst_message_parse_info, void, GstMessage *message, GError **gerror, gchar **debug);
43
44//aw tag infos (Artist, Title, ...tbc...)
45LL_GST_SYM(true, gst_message_parse_tag, void, GstMessage *message, GstTagList **tag_list);
46LL_GST_SYM(true, gst_tag_list_get_string, gboolean, const GstTagList *list, const gchar *tag, gchar **value);