From b126a1f08592c59b185a89325c55031ff939cae1 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 14 Feb 2009 23:56:36 -0700
Subject: Removed useless music pause button

---
 linden/indra/newview/llmediaremotectrl.cpp         |  20 +--
 .../default/xui/en-us/panel_media_controls.xml     | 188 ++++++++++-----------
 2 files changed, 98 insertions(+), 110 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llmediaremotectrl.cpp b/linden/indra/newview/llmediaremotectrl.cpp
index 1b337ab..06978d7 100644
--- a/linden/indra/newview/llmediaremotectrl.cpp
+++ b/linden/indra/newview/llmediaremotectrl.cpp
@@ -85,7 +85,6 @@ BOOL LLMediaRemoteCtrl::postBuild()
 	childSetAction("media_stop",LLOverlayBar::mediaStop,this);
 	childSetAction("music_stop",LLOverlayBar::toggleMusicPlay,this);
 	childSetAction("media_pause",LLOverlayBar::toggleMediaPlay,this);
-	childSetAction("music_pause",LLOverlayBar::toggleMusicPlay,this);
 
 	childSetAction("expand", onClickExpandBtn, this);	
 	return TRUE;
@@ -150,7 +149,6 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 	bool stop_media_enabled = false;
 	bool play_music_enabled = false;
 	bool stop_music_enabled = false;
-	bool music_show_pause = false;
 	bool media_show_pause = false;
 	LLColor4 music_icon_color = LLUI::sColorsGroup->getColor( "IconDisabledColor" );
 	LLColor4 media_icon_color = LLUI::sColorsGroup->getColor( "IconDisabledColor" );
@@ -203,17 +201,16 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 	
 		if ( parcel && parcel->getMusicURL()[0])
 		{
-			play_music_enabled = true;
 			music_icon_color = LLUI::sColorsGroup->getColor( "IconEnabledColor" );
 
 			if (gOverlayBar->musicPlaying())
 			{
-				music_show_pause = true;
+				play_music_enabled = false;
 				stop_music_enabled = true;
 			}
 			else
 			{
-				music_show_pause = false;
+				play_music_enabled = true;
 				stop_music_enabled = false;
 			}
 		}
@@ -226,20 +223,19 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 		}
 	}
 	const std::string media_icon_name = LLMIMETypes::findIcon(media_type);
+
 	LLButton* music_play_btn = getChild<LLButton>("music_play");
 	LLButton* music_stop_btn = getChild<LLButton>("music_stop");
-	LLButton* music_pause_btn = getChild<LLButton>("music_pause");
+
+	music_play_btn->setEnabled(play_music_enabled);
+	music_stop_btn->setEnabled(stop_music_enabled);
+	childSetColor("music_icon", music_icon_color);
+
 	LLButton* media_play_btn = getChild<LLButton>("media_play");
 	LLButton* media_stop_btn = getChild<LLButton>("media_stop");
 	LLButton* media_pause_btn = getChild<LLButton>("media_pause");
 	LLIconCtrl* media_icon = getChild<LLIconCtrl>("media_icon");
 
-	music_play_btn->setEnabled(play_music_enabled);
-	music_stop_btn->setEnabled(stop_music_enabled);
-	music_pause_btn->setEnabled(music_show_pause);
-	music_pause_btn->setVisible(music_show_pause);
-	music_play_btn->setVisible(! music_show_pause);
-	childSetColor("music_icon", music_icon_color);
 	if(!media_icon_name.empty())
 	{
 		media_icon->setImage(media_icon_name);
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml
index 1fead04..7e4f12a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml
@@ -1,98 +1,90 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="1"
-     enabled="true" follows="right|bottom" height="20" left="0"
-     name="media_controls" width="262">
-	<icon bottom="-22" enabled="true" follows="left|top" height="22"
-	     image_name="icn_label_music.tga" label="" left_delta="2" mouse_opaque="true"
-	     name="music_icon" scale_image="true" tool_tip="Play/pause streaming music"
-	     width="20" />
-	<button bottom="-21" enabled="true" follows="left|top" height="20"
-          image_overlay="icn_play.tga"
-          image_unselected="flyout_btn_left.tga"
-             image_selected="flyout_btn_left_selected.tga"
-             image_disabled="flyout_btn_left_disabled.tga"
-	      label="" left_delta="20"
-	     mouse_opaque="true" name="music_play" scale_image="true" toggle="false"
-	     tool_tip="Play/pause streaming music" width="20" />
-  <button bottom="-21" enabled="false" follows="left|top" height="20"
-	     image_overlay="icn_pause.tga"
-             image_unselected="flyout_btn_left.tga"
-             image_selected="flyout_btn_left_selected.tga"
-             image_disabled="flyout_btn_left_disabled.tga"
-	     label="" left_delta="0"
-	     mouse_opaque="true" name="music_pause" scale_image="true" toggle="false"
-	     tool_tip="Pause streaming music" width="20" />
-  <button bottom="-21" enabled="true" follows="left|top" height="20"
-	     image_overlay="icn_stop.tga"
-             image_unselected="flyout_btn_right.tga"
-             image_selected="flyout_btn_right_selected.tga"
-             image_disabled="flyout_btn_right_disabled.tga"
-	     label="" left_delta="20"
-	     mouse_opaque="true" name="music_stop" scale_image="true" toggle="false"
-	     tool_tip="Stop streaming music" width="20" />
-  <icon bottom="-22" enabled="true" follows="left|top" height="22"
-	     image_name="icn_label_media.tga"
-             label="" left_delta="23" mouse_opaque="true"
-	     name="media_icon" scale_image="true" tool_tip="Play/pause streaming music"
-	     width="20" />
-  <button bottom="-21" enabled="true" follows="left|top" height="20"
-	     image_overlay="icn_play.tga"
-             image_unselected="flyout_btn_left.tga"
-             image_selected="flyout_btn_left_selected.tga"
-             image_disabled="flyout_btn_left_disabled.tga"
-	     label="" left_delta="21"
-	     mouse_opaque="true" name="media_play" scale_image="true" toggle="false"
-	     tool_tip="Play/pause streaming music" width="20" />
-  <button bottom="-21" enabled="false" follows="left|top" height="20"
-	     image_overlay="icn_pause.tga"
-                          image_unselected="flyout_btn_left.tga"
-             image_selected="flyout_btn_left_selected.tga"
-             image_disabled="flyout_btn_left_disabled.tga"
-	     label="" left_delta="0"
-	     mouse_opaque="true" name="media_pause" scale_image="true" toggle="false"
-	     tool_tip="Pause streaming media" width="20" />
-	<button bottom="-21" enabled="true" follows="left|top" height="20"
-	     image_overlay="icn_stop.tga"
-                          image_unselected="flyout_btn_right.tga"
-             image_selected="flyout_btn_right_selected.tga"
-             image_disabled="flyout_btn_right_disabled.tga"
-	     label="" left_delta="20"
-	     mouse_opaque="true" name="media_stop" scale_image="true" toggle="false"
-	     tool_tip="Stop streaming media" width="20" />
-	<volume_slider bottom="-23" control_name="AudioLevelMaster" height="22" increment="0.05"
-	     initial_val="0.5" left_delta="15" max_val="1" min_val="0"
-	     mouse_opaque="true" name="volume_slider" tool_tip="Master Volume"
-	     width="56" />
-	<button bottom="-19" control_name="MuteAudio" height="20"
-	     image_selected="icn_speaker-muted_dark.tga"
-	     image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
-	     name="mute_master" toggle="true" tool_tip="Master Mute" width="24" />
-	<button bottom="-22" control_name="ShowVolumeSettingsPopup" height="22" label=""
-	     left_delta="19" name="expand" scale_image="true" toggle="true"
-	     tool_tip="Adjust individual volume levels" width="22" />
-        
-	<string name="play_label">
-		Play
-	</string>
-	<string name="stop_label">
-		Stop
-	</string>
-	<string name="pause_label">
-		Pause
-	</string>
-	<string name="default_tooltip_label">
-		No Media Specified
-	</string>
-	<string name="media_hidden_label">
-		(URL hidden by parcel owner)
-	</string>
-	<string name="media_icon_tooltip_web">
-		This location displays content from the World Wide Web. Click the Play button to display Web content.
-	</string>
-	<string name="media_icon_tooltip_movie">
-		This location displays Video content. Click the Play button to play the video.
-	</string>
-	<string name="media_play_tooltip">
-		Display Web content at this location.
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="1"
+     enabled="true" follows="right|bottom" height="20" left="0"
+     name="media_controls" width="262">
+	<icon bottom="-22" enabled="true" follows="left|top" height="22"
+	     image_name="icn_label_music.tga" label="" left_delta="2" mouse_opaque="true"
+	     name="music_icon" scale_image="true" tool_tip="Play streaming music"
+	     width="20" />
+	<button bottom="-21" enabled="true" follows="left|top" height="20"
+          image_overlay="icn_play.tga"
+          image_unselected="flyout_btn_left.tga"
+             image_selected="flyout_btn_left_selected.tga"
+             image_disabled="flyout_btn_left_disabled.tga"
+	      label="" left_delta="20"
+	     mouse_opaque="true" name="music_play" scale_image="true" toggle="false"
+	     tool_tip="Play streaming music" width="20" />
+  <button bottom="-21" enabled="true" follows="left|top" height="20"
+	     image_overlay="icn_stop.tga"
+             image_unselected="flyout_btn_right.tga"
+             image_selected="flyout_btn_right_selected.tga"
+             image_disabled="flyout_btn_right_disabled.tga"
+	     label="" left_delta="20"
+	     mouse_opaque="true" name="music_stop" scale_image="true" toggle="false"
+	     tool_tip="Stop streaming music" width="20" />
+  <icon bottom="-22" enabled="true" follows="left|top" height="22"
+	     image_name="icn_label_media.tga"
+             label="" left_delta="23" mouse_opaque="true"
+	     name="media_icon" scale_image="true" tool_tip="Play/pause streaming media"
+	     width="20" />
+  <button bottom="-21" enabled="true" follows="left|top" height="20"
+	     image_overlay="icn_play.tga"
+             image_unselected="flyout_btn_left.tga"
+             image_selected="flyout_btn_left_selected.tga"
+             image_disabled="flyout_btn_left_disabled.tga"
+	     label="" left_delta="21"
+	     mouse_opaque="true" name="media_play" scale_image="true" toggle="false"
+	     tool_tip="Play/pause streaming music" width="20" />
+  <button bottom="-21" enabled="false" follows="left|top" height="20"
+	     image_overlay="icn_pause.tga"
+                          image_unselected="flyout_btn_left.tga"
+             image_selected="flyout_btn_left_selected.tga"
+             image_disabled="flyout_btn_left_disabled.tga"
+	     label="" left_delta="0"
+	     mouse_opaque="true" name="media_pause" scale_image="true" toggle="false"
+	     tool_tip="Pause streaming media" width="20" />
+	<button bottom="-21" enabled="true" follows="left|top" height="20"
+	     image_overlay="icn_stop.tga"
+                          image_unselected="flyout_btn_right.tga"
+             image_selected="flyout_btn_right_selected.tga"
+             image_disabled="flyout_btn_right_disabled.tga"
+	     label="" left_delta="20"
+	     mouse_opaque="true" name="media_stop" scale_image="true" toggle="false"
+	     tool_tip="Stop streaming media" width="20" />
+	<volume_slider bottom="-23" control_name="AudioLevelMaster" height="22" increment="0.05"
+	     initial_val="0.5" left_delta="15" max_val="1" min_val="0"
+	     mouse_opaque="true" name="volume_slider" tool_tip="Master Volume"
+	     width="56" />
+	<button bottom="-19" control_name="MuteAudio" height="20"
+	     image_selected="icn_speaker-muted_dark.tga"
+	     image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
+	     name="mute_master" toggle="true" tool_tip="Master Mute" width="24" />
+	<button bottom="-22" control_name="ShowVolumeSettingsPopup" height="22" label=""
+	     left_delta="19" name="expand" scale_image="true" toggle="true"
+	     tool_tip="Adjust individual volume levels" width="22" />
+        
+	<string name="play_label">
+		Play
+	</string>
+	<string name="stop_label">
+		Stop
+	</string>
+	<string name="pause_label">
+		Pause
+	</string>
+	<string name="default_tooltip_label">
+		No Media Specified
+	</string>
+	<string name="media_hidden_label">
+		(URL hidden by parcel owner)
+	</string>
+	<string name="media_icon_tooltip_web">
+		This location displays content from the World Wide Web. Click the Play button to display Web content.
+	</string>
+	<string name="media_icon_tooltip_movie">
+		This location displays Video content. Click the Play button to play the video.
+	</string>
+	<string name="media_play_tooltip">
+		Display Web content at this location.
+	</string>
+</panel>
-- 
cgit v1.1