From 96741727e0d1dbb743fe9dcfff68d52b12617136 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 15 Jun 2009 03:00:48 -0700
Subject: Applied Dale Glass' patch for VWR-12655: Add support for displaying
 the title of the song

---
 linden/indra/newview/app_settings/settings.xml     | 11 +++++
 linden/indra/newview/lloverlaybar.cpp              | 49 ++++++++++++++++++++++
 .../default/xui/en-us/panel_preferences_audio.xml  |  6 ++-
 3 files changed, 65 insertions(+), 1 deletion(-)

(limited to 'linden/indra/newview')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 5c76185..7ab215a 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -7337,6 +7337,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 91a7375..e1aeeca 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"
@@ -72,6 +73,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
 //
@@ -406,6 +454,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)"
-- 
cgit v1.1