Merge branch '1.2.0-streaminfo' into 1.2.0-next

7 files changed, 95 insertions, 14 deletions

diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h
index d289ba5..579f58f 100644
--- a/linden/indra/llaudio/audioengine.h
+++ b/linden/indra/llaudio/audioengine.h
@@ -182,6 +182,8 @@ public:
         static void assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat ext_status);
 
         friend class LLPipeline; // For debugging
+
+        LLMediaBase * getStreamMedia() { return mInternetStreamMedia; }
 public:
         F32 mMaxWindGain; // Hack.  Public to set before fade in?
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index d1bab29..a9e0004 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -89,6 +89,7 @@ LLMediaImplGStreamer () :
         mPump ( NULL ),
         mPlaybin ( NULL ),
         mVideoSink ( NULL ),
+        mLastTitle ( "" ),
         mState( GST_STATE_NULL ),
         mPlayThread ( NULL )
 {
@@ -470,6 +471,8 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                         case GST_STATE_PAUSED:
                                 break;
                         case GST_STATE_PLAYING:
+                                //impl->mLastTitle = "";
+
                                 LLMediaEvent event( impl, 100 );
                                 impl->getEventEmitter().update( &LLMediaObserver::onUpdateProgress, event );
                                 // emit an event to say that a media source was loaded
@@ -521,18 +524,28 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                 }
                 case GST_MESSAGE_TAG: 
                 {
-                GstTagList *tag_list;
-                gchar *title;
-                gchar *artist;
-                gst_message_parse_tag(message, &tag_list);
-                gboolean hazTitle = gst_tag_list_get_string(tag_list,
-                        GST_TAG_TITLE, &title);
-                gboolean hazArtist = gst_tag_list_get_string(tag_list,
-                        GST_TAG_ARTIST, &artist);
-                if(hazTitle) 
-                        LL_INFOS("MediaInfo") << "Title: " << title << LL_ENDL;
-                if(hazArtist) 
-                        LL_INFOS("MediaInfo") << "Artist: " << artist << LL_ENDL;
+                        GstTagList *new_tags;
+
+                        gst_message_parse_tag( message, &new_tags );
+
+                        gchar *title;
+
+                        if ( gst_tag_list_get_string(new_tags, GST_TAG_TITLE, &title) )
+                        {
+                                LL_INFOS("MediaInfo") << "Title: " << title << LL_ENDL;
+                                std::string newtitle(title);
+                                gst_tag_list_free(new_tags);
+
+                                if ( newtitle != impl->mLastTitle && newtitle != "" )
+                                {
+                                        impl->mLastTitle = newtitle;
+                                        LLMediaEvent event( impl, impl->mLastTitle );
+                                        impl->getEventEmitter().update( &LLMediaObserver::onMediaTitleChange, event );
+                                }
+
+                                g_free(title);
+                        }
+
                         break;
                 }
                 case GST_MESSAGE_EOS:
@@ -551,10 +564,10 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                                 impl->addCommand(LLMediaBase::COMMAND_STOP);
                         }
                         break;
+                }
                 default:
                         /* unhandled message */
                         break;
-                }
         }
         /* we want to be notified again the next time there is a message
          * on the bus, so return true (false means we want to stop watching
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index baefdaf..51a8c37 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -127,6 +127,7 @@ class LLMediaImplGStreamer:
                 GMainLoop *mPump; // event pump for this media
                 GstElement *mPlaybin;
                 GstSLVideo *mVideoSink;
+                std::string mLastTitle;
                 GstState mState;
                 GstState getState() const { return mState; }
 
diff --git a/linden/indra/llmedia/llmediaobserver.h b/linden/indra/llmedia/llmediaobserver.h
index e6da4f6..97fed5f 100644
--- a/linden/indra/llmedia/llmediaobserver.h
+++ b/linden/indra/llmedia/llmediaobserver.h
@@ -102,6 +102,7 @@ class LLMediaObserver
                 virtual void onMediaSizeChange( const EventType& event_in ) { }
                 virtual void onMediaContentsChange( const EventType& event_in ) { }
                 virtual void onMediaStatusTextChange( const EventType& event_in ) { }
+                virtual void onMediaTitleChange( const EventType &event_in ) { }
                 virtual void onNavigateBegin( const EventType& event_in ) { }
                 virtual void onNavigateComplete( const EventType& event_in ) { }
                 virtual void onUpdateProgress( const EventType& event_in ) { }
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 6d2f0c5..f92b47f 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -7524,6 +7524,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ShowStreamTitle</key>
+    <map>
+      <key>Comment</key>
+      <string>Show the title of the song playing on the parcel's stream</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>ShowTangentBasis</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 12c001e..c1a2354 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -41,6 +41,7 @@
 #include "llagent.h"
 #include "llbutton.h"
 #include "llchatbar.h"
+#include "llfloaterchat.h"
 #include "llfocusmgr.h"
 #include "llimview.h"
 #include "llmediaremotectrl.h"
@@ -73,6 +74,53 @@ LLOverlayBar *gOverlayBar = NULL;
 
 extern S32 MENU_BAR_HEIGHT;
 
+
+class LLTitleObserver
+        :       public LLMediaObserver
+{
+public:
+        void init(std::string url);
+        /*virtual*/ void onMediaTitleChange(const EventType& event_in);
+private:
+        LLMediaBase* mMediaSource;
+};
+
+static LLTitleObserver sTitleObserver;
+
+static LLRegisterWidget<LLMediaRemoteCtrl> r("media_remote");
+
+void LLTitleObserver::init(std::string url)
+{
+
+        if (!gAudiop)
+        {
+                return;
+        }
+
+        mMediaSource = gAudiop->getStreamMedia(); // LLViewerMedia::getSource();
+
+        if ( mMediaSource )
+        {
+                mMediaSource->addObserver(this);
+        }
+}
+
+//virtual
+void LLTitleObserver::onMediaTitleChange(const EventType& event_in)
+{
+        if ( !gSavedSettings.getBOOL("ShowStreamTitle") )
+        {
+                return;
+        }
+
+        LLChat chat;
+        //TODO: set this in XUI
+        std::string playing_msg = "Playing: " + event_in.getStringValue();
+        chat.mText = playing_msg;
+        LLFloaterChat::addChat(chat, FALSE, FALSE);
+}
+
+
 //
 // Functions
 //
@@ -429,6 +477,7 @@ void LLOverlayBar::toggleMusicPlay(void*)
         //                      if ( gAudiop->isInternetStreamPlaying() == 0 )
                                 {
                                         gAudiop->startInternetStream(parcel->getMusicURL());
+                                        sTitleObserver.init(parcel->getMusicURL());
                                 }
                         }
                 }
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 92978ab..c960d36 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -15,7 +15,7 @@
                 Streaming Preferences:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-280" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-300" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
                 Audio Preferences:
@@ -28,6 +28,10 @@
              label="Play Streaming Music When Available (uses more bandwidth)"
              left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
              width="339" />
+  <check_box bottom_delta="-20" control_name="ShowStreamTitle" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+             label="Show stream info in chat" left="162" mouse_opaque="true"
+       name="show_stream_title" radio_style="false" width="338" />
         <check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Play Streaming Media When Available (uses more bandwidth)"