livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More refactoring of GrowlManager

Ansariel 2015-03-11 14:00:44 +01:00
parent 3722d01195
commit ee4d2c9947
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/growlmanager.cpp
View File

@ -32,9 +32,14 @@
#include "llviewerprecompiledheaders.h"
#include "growlmanager.h"
#include "growlnotifier.h"
#include "llagentdata.h"
#include "llappviewer.h"
#include "llfloaterimnearbychathandler.h"
#include "llimview.h"
#include "llnotificationmanager.h"
#include "llscriptfloater.h"
#include "llsdserialize.h"
#include "llstartup.h"
@ -42,11 +47,6 @@
#include "llviewercontrol.h"
#include "llviewerwindow.h"
#include "llwindow.h"
#include "llnotificationmanager.h"
#include "llfloaterimnearbychathandler.h"
#include "growlmanager.h"
#include "growlnotifier.h"
// Platform-specific includes
#ifndef LL_LINUX
@ -108,7 +108,6 @@ GrowlManager::GrowlManager()
// Hook into LLNotifications...
// We hook into all of them, even though (at the time of writing) nothing uses "alert", so more notifications can be added easily.
// Ansa: Hope this works...
mGrowlNotificationsChannel = new LLNotificationChannel("GrowlNotifications", "Visible", &filterOldNotifications);
mNotificationConnection = LLNotifications::instance().getChannel("GrowlNotifications")->connectChanged(&onLLNotification);
@ -160,7 +159,7 @@ void GrowlManager::loadConfig()
llifstream configs(config_file);
LLSD notificationLLSD;
std::set<std::string> notificationTypes;
notificationTypes.insert("Keyword Alert");
notificationTypes.insert(GROWL_KEYWORD_ALERT_TYPE);
notificationTypes.insert(GROWL_IM_MESSAGE_TYPE);
if (configs.is_open())
{
@ -232,7 +231,7 @@ void GrowlManager::performNotification(const std::string& title, const std::stri
if (mNotifier->needsThrottle())
{
U64 now = LLTimer::getTotalTime();
const U64 now = LLTimer::getTotalTime();
if (mTitleTimers.find(title) != mTitleTimers.end())
{
if (mTitleTimers[title] > now - GROWL_THROTTLE_TIME)
@ -261,7 +260,7 @@ bool GrowlManager::onLLNotification(const LLSD& notice)
}
LLNotificationPtr notification = LLNotifications::instance().find(notice["id"].asUUID());
std::string name = notification->getName();
const std::string name = notification->getName();
LLSD substitutions = notification->getSubstitutions();
if (gGrowlManager->mNotifications.find(name) != gGrowlManager->mNotifications.end())
{
@ -340,7 +339,7 @@ void GrowlManager::onInstantMessage(const LLSD& im)
void GrowlManager::onScriptDialog(const LLSD& data)
{
LLNotificationPtr notification = LLNotifications::instance().find(data["notification_id"].asUUID());
std::string name = notification->getName();
const std::string name = notification->getName();
LLSD payload = notification->getPayload();
LLSD substitutions = notification->getSubstitutions();

4
indra/newview/growlmanager.h
View File

@ -46,8 +46,8 @@ struct GrowlNotification
bool useDefaultTextForBody;
};
const U64 GROWL_THROTTLE_TIME = 1000000; // Maximum spam rate (in microseconds).
const F32 GROWL_THROTTLE_CLEANUP_PERIOD = 300; // How often we clean up the list (in seconds).
const U64 GROWL_THROTTLE_TIME = 1000000u; // Maximum spam rate (in microseconds).
const F32 GROWL_THROTTLE_CLEANUP_PERIOD = 300.f; // How often we clean up the list (in seconds).
const int GROWL_MAX_BODY_LENGTH = 255; // Arbitrary.
const std::string GROWL_IM_MESSAGE_TYPE = "Instant Message received";
const std::string GROWL_KEYWORD_ALERT_TYPE = "Keyword Alert";