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

While already at it: Change our callbacks into instance methods and use boost::bind to wire them up

Ansariel 2014-09-26 11:38:28 +02:00
parent 20d45755bf
commit 7552e9d735
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/llpanellandaudio.cpp
View File

@ -98,13 +98,13 @@ BOOL LLPanelLandAudio::postBuild()
childSetCommitCallback("music_url", onCommitAny, this);
mBtnStreamAdd = getChild<LLButton>("stream_add_btn");
childSetCommitCallback("stream_add_btn", onBtnStreamAdd, this);
mBtnStreamAdd->setCommitCallback(boost::bind(&LLPanelLandAudio::onBtnStreamAdd, this));
mBtnStreamDelete = getChild<LLButton>("stream_delete_btn");
childSetCommitCallback("stream_delete_btn", onBtnStreamDelete, this);
mBtnStreamDelete->setCommitCallback(boost::bind(&LLPanelLandAudio::onBtnStreamDelete, this));
mBtnStreamCopyToClipboard = getChild<LLButton>("stream_copy_btn");
childSetCommitCallback("stream_copy_btn", onBtnCopyToClipboard, this);
mBtnStreamCopyToClipboard->setCommitCallback(boost::bind(&LLPanelLandAudio::onBtnCopyToClipboard, this));
// </FS:CR>
mCheckAVSoundAny = getChild<LLCheckBoxCtrl>("all av sound check");
@ -248,12 +248,9 @@ void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)
}
// <FS:CR> FIRE-593 - Add/remove streams from the list with these. They're fantastic!
// static
void LLPanelLandAudio::onBtnStreamAdd(LLUICtrl*, void *userdata)
void LLPanelLandAudio::onBtnStreamAdd()
{
LLPanelLandAudio *self = (LLPanelLandAudio *)userdata;
std::string music_url = self->mMusicURLEdit->getSimple();
std::string music_url = mMusicURLEdit->getSimple();
LLStringUtil::trim(music_url);
if (!music_url.empty())
@ -262,16 +259,13 @@ void LLPanelLandAudio::onBtnStreamAdd(LLUICtrl*, void *userdata)
streamlist["version"] = 1;
streamlist["audio"].append(music_url);
gSavedSettings.setLLSD("FSStreamList", streamlist);
self->refresh();
refresh();
}
}
// static
void LLPanelLandAudio::onBtnStreamDelete(LLUICtrl*, void *userdata)
void LLPanelLandAudio::onBtnStreamDelete()
{
LLPanelLandAudio *self = (LLPanelLandAudio *)userdata;
std::string music_url = self->mMusicURLEdit->getSimple();
std::string music_url = mMusicURLEdit->getSimple();
LLStringUtil::trim(music_url);
LLSD streamlist = gSavedSettings.getLLSD("FSStreamList");
@ -288,14 +282,12 @@ void LLPanelLandAudio::onBtnStreamDelete(LLUICtrl*, void *userdata)
}
gSavedSettings.setLLSD("FSStreamList", streamlist_new);
self->refresh();
refresh();
}
//static
void LLPanelLandAudio::onBtnCopyToClipboard(LLUICtrl*, void *userdata)
void LLPanelLandAudio::onBtnCopyToClipboard()
{
LLPanelLandAudio *self = (LLPanelLandAudio *)userdata;
std::string music_url = self->mMusicURLEdit->getSimple();
std::string music_url = mMusicURLEdit->getSimple();
LLStringUtil::trim(music_url);
if (!music_url.empty())

6
indra/newview/llpanellandaudio.h
View File

@ -49,9 +49,9 @@ public:
private:
static void onCommitAny(LLUICtrl* ctrl, void *userdata);
// <FS:CR> FIRE-593 - Add/remove streams from the list
static void onBtnStreamAdd(LLUICtrl* ctrl, void *userdata);
static void onBtnStreamDelete(LLUICtrl* ctrl, void *userdata);
static void onBtnCopyToClipboard(LLUICtrl* ctrl, void *userdata);
void onBtnStreamAdd();
void onBtnStreamDelete();
void onBtnCopyToClipboard();
// </FS:CR>
private: