aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.cpp11
2 files changed, 7 insertions, 9 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1b7e197..92f3550 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -17,6 +17,11 @@
17 17
18 modified: indra/newview/lloverlaybar.cpp 18 modified: indra/newview/lloverlaybar.cpp
19 19
20
21 * Fixed stream info not updating.
22
23 modified: indra/llmedia/llmediaimplgstreamer.cpp
24
20 25
21 Dale Glass <email@unknown.com> 26 Dale Glass <email@unknown.com>
22 27
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: