diff options
author | McCabe Maxsted | 2009-06-15 05:25:55 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-15 05:25:55 -0700 |
commit | e1548771733011700efddb05ff59112a71966b6d (patch) | |
tree | e3f8daa8dc81596abd50611a0d280ff41cbec3df /linden/indra | |
parent | Applied Dale Glass' patch for VWR-12655: Add support for displaying the title... (diff) | |
download | meta-impy-e1548771733011700efddb05ff59112a71966b6d.zip meta-impy-e1548771733011700efddb05ff59112a71966b6d.tar.gz meta-impy-e1548771733011700efddb05ff59112a71966b6d.tar.bz2 meta-impy-e1548771733011700efddb05ff59112a71966b6d.tar.xz |
Fixed stream info not updating
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/llmedia/llmediaimplgstreamer.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp index c0c2070..a9e0004 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp | |||
@@ -471,7 +471,7 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp | |||
471 | case GST_STATE_PAUSED: | 471 | case GST_STATE_PAUSED: |
472 | break; | 472 | break; |
473 | case GST_STATE_PLAYING: | 473 | case GST_STATE_PLAYING: |
474 | impl->mLastTitle = ""; | 474 | //impl->mLastTitle = ""; |
475 | 475 | ||
476 | LLMediaEvent event( impl, 100 ); | 476 | LLMediaEvent event( impl, 100 ); |
477 | impl->getEventEmitter().update( &LLMediaObserver::onUpdateProgress, event ); | 477 | impl->getEventEmitter().update( &LLMediaObserver::onUpdateProgress, event ); |
@@ -529,12 +529,12 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp | |||
529 | gst_message_parse_tag( message, &new_tags ); | 529 | gst_message_parse_tag( message, &new_tags ); |
530 | 530 | ||
531 | gchar *title; | 531 | gchar *title; |
532 | gchar *artist; | ||
533 | 532 | ||
534 | if ( gst_tag_list_get_string(new_tags, GST_TAG_TITLE, &title) ) | 533 | if ( gst_tag_list_get_string(new_tags, GST_TAG_TITLE, &title) ) |
535 | { | 534 | { |
536 | LL_INFOS("MediaInfo") << "Title: " << title << LL_ENDL; | 535 | LL_INFOS("MediaInfo") << "Title: " << title << LL_ENDL; |
537 | std::string newtitle(title); | 536 | std::string newtitle(title); |
537 | gst_tag_list_free(new_tags); | ||
538 | 538 | ||
539 | if ( newtitle != impl->mLastTitle && newtitle != "" ) | 539 | if ( newtitle != impl->mLastTitle && newtitle != "" ) |
540 | { | 540 | { |
@@ -546,13 +546,6 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp | |||
546 | g_free(title); | 546 | g_free(title); |
547 | } | 547 | } |
548 | 548 | ||
549 | if (gst_tag_list_get_string(new_tags, GST_TAG_ARTIST, &artist)) | ||
550 | { | ||
551 | LL_INFOS("MediaInfo") << "Artist: " << artist << LL_ENDL; | ||
552 | g_free(artist); | ||
553 | } | ||
554 | |||
555 | gst_tag_list_free(new_tags); | ||
556 | break; | 549 | break; |
557 | } | 550 | } |
558 | case GST_MESSAGE_EOS: | 551 | case GST_MESSAGE_EOS: |