Removed useless music pause button

8 files changed, 69 insertions, 45 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 9ec5727..7405aad 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -317,7 +317,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>AudioStreamingVideo</key>
     <map>
@@ -328,7 +328,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>AutoAcceptNewInventory</key>
     <map>
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/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 1087fd8..80cac14 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -275,6 +275,7 @@ void LLOverlayBar::refresh()
         {
                 layoutButtons();
         }
+
 }
 
 //-----------------------------------------------------------------------
@@ -360,6 +361,12 @@ void LLOverlayBar::toggleMediaPlay(void*)
 }
 
 //static
+void LLOverlayBar::musicFirstRun()
+{
+        gOverlayBar->mMusicState = PLAYING;
+}
+
+//static
 void LLOverlayBar::toggleMusicPlay(void*)
 {
         if (!gOverlayBar)
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index 5880ff0..73d0a43 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -80,6 +80,9 @@ public:
         static void musicStop(void*);
         static void mediaStop(void*);
 
+        // hack to make sure the music button plays.
+        static void musicFirstRun();
+
         static void toggleAudioVolumeFloater(void*);
 
 protected:      
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index 956ed03..94f6d84 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -384,17 +384,11 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
 
 void callback_play_media(S32 option, void* data)
 {
-        LLParcel* parcel = (LLParcel*)data;
         if (option == 0)
         {
-                gSavedSettings.setBOOL("AudioStreamingVideo", TRUE);
+                LLParcel* parcel = (LLParcel*)data;
                 LLViewerParcelMedia::play(parcel);
         }
-        else
-        {
-                gSavedSettings.setBOOL("AudioStreamingVideo", FALSE);
-        }
         gSavedSettings.setWarning("FirstStreamingVideo", FALSE);
-
 }
 
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index 5ef6f83..2dee2bf 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -1692,7 +1692,12 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 
 void optionally_start_music(const std::string& music_url)
 {
-        if (gSavedSettings.getBOOL("AudioStreamingMusic"))
+        // Check to see if this your first time on a music-enabled parcel.
+        if (gSavedSettings.getWarning("FirstStreamingMusic"))
+        {
+                gViewerWindow->alertXml("ParcelCanPlayMusic", callback_start_music, (void*)&music_url);
+        }
+        else if (gSavedSettings.getBOOL("AudioStreamingMusic"))
         {
                 // Make the user click the start button on the overlay bar. JC
                 //              llinfos << "Starting parcel music " << music_url << llendl;
@@ -1706,6 +1711,21 @@ void optionally_start_music(const std::string& music_url)
         }
 }
 
+
+void callback_start_music(S32 option, void* data)
+{
+        if (option == 0)
+        {
+                // Before the callback, we verified the url was good.
+                // We fetch again to avoid lag while loading.
+                LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();          
+                gAudiop->startInternetStream(parcel->getMusicURL());
+
+                LLOverlayBar::musicFirstRun();
+        }
+        gSavedSettings.setWarning("FirstStreamingMusic", FALSE);
+}
+
 // static
 void LLViewerParcelMgr::processParcelAccessListReply(LLMessageSystem *msg, void **user)
 {
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index 0be529f..92e2014 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -1893,20 +1893,32 @@ Try selecting a single parcel.
                         Region Not Found
                 </message>
         </alert>
-        <alert modal="true" name="ParcelCanPlayMedia">
-                <message name="message">
-                        This location can play streaming media. 
-Streaming media requires a fast Internet connection.
- 
-Play streaming media when available?
-(You can change this option later under 
-Preferences &gt; Audio &amp; Video.)
-                </message>
+  <alert modal="true" name="ParcelCanPlayMusic">
+    <message name="message">
+      This location wants to play streaming music.
+      (Requires a fast Internet connection.)
+
+      Play streaming music now?
+    </message>
+    <option name="PlayMusic">
+      Yes
+    </option>
+    <option name="No">
+      No
+    </option>
+  </alert>
+  <alert modal="true" name="ParcelCanPlayMedia">
+    <message name="message">
+      This location wants to play streaming media.
+      (Requires a fast Internet connection.)
+
+      Play streaming media now?
+    </message>
                 <option name="PlayMedia">
-                        Play Media
+                        Yes
                 </option>
-                <option name="Disable">
-                        Disable
+                <option name="No">
+                        No
                 </option>
         </alert>
         <alert modal="true" name="CannotDeedLandWaitingForServer">
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 a8ecfca..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
@@ -4,7 +4,7 @@
      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"
+             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"
@@ -13,15 +13,7 @@
              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" />
+             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"
@@ -33,7 +25,7 @@
   <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"
+             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"