llmediaplugins first step

1 files changed, 52 insertions, 2 deletions

diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 59f4d70..2daa5aa 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -190,6 +190,15 @@ void LLFloaterChat::setMinimized(BOOL minimized)
         updateConsoleVisibility();
 }
 
+// linden library includes
+#include "llaudioengine.h"
+#include "llchat.h"
+#include "llfontgl.h"
+#include "llrect.h"
+#include "llerror.h"
+#include "llstring.h"
+#include "llwindow.h"
+#include "message.h"
 
 void LLFloaterChat::updateConsoleVisibility()
 {
@@ -583,13 +592,54 @@ void LLFloaterChat::addChat(const LLChat& chat,
         if(from_instant_message && gSavedSettings.getBOOL("IMInChatHistory"))    
                 addChatHistory(chat,false);
 
-        LLTextParser* highlight = LLTextParser::getInstance();
-        highlight->triggerAlerts(gAgent.getID(), gAgent.getPositionGlobal(), chat.mText, gViewerWindow->getWindow());
+        triggerAlerts(chat.mText);
 
         if(!from_instant_message)
                 addChatHistory(chat);
 }
 
+// Moved from lltextparser.cpp to break llui/llaudio library dependency.
+//static
+void LLFloaterChat::triggerAlerts(const std::string& text)
+{
+        LLTextParser* parser = LLTextParser::getInstance();
+//    bool spoken=FALSE;
+        for (S32 i=0;i<parser->mHighlights.size();i++)
+        {
+                LLSD& highlight = parser->mHighlights[i];
+                if (parser->findPattern(text,highlight) >= 0 )
+                {
+                        if(gAudiop)
+                        {
+                                if ((std::string)highlight["sound_lluuid"] != LLUUID::null.asString())
+                                {
+                                        gAudiop->triggerSound(highlight["sound_lluuid"].asUUID(), 
+                                                gAgent.getID(),
+                                                1.f,
+                                                LLAudioEngine::AUDIO_TYPE_UI,
+                                                gAgent.getPositionGlobal() );
+                                }
+/*                              
+                                if (!spoken) 
+                                {
+                                        LLTextToSpeech* text_to_speech = NULL;
+                                        text_to_speech = LLTextToSpeech::getInstance();
+                                        spoken = text_to_speech->speak((LLString)highlight["voice"],text); 
+                                }
+ */
+                        }
+                        if (highlight["flash"])
+                        {
+                                LLWindow* viewer_window = gViewerWindow->getWindow();
+                                if (viewer_window && viewer_window->getMinimized())
+                                {
+                                        viewer_window->flashIcon(5.f);
+                                }
+                        }
+                }
+        }
+}
+
 LLColor4 get_text_color(const LLChat& chat)
 {
         LLColor4 text_color;