Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fmod metadata parsing. Innitial.

Browse Source
This commit is contained in:
Shyotl
2011-12-21 01:23:04 -06:00
parent 6a5e203884
commit 6920bee5e2
6 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
indra/newview/llmediaremotectrl.cpp
View File

@@ -46,6 +46,7 @@
#include "llparcel.h"
#include "llviewercontrol.h"
#include "llbutton.h"
#include "llstreamingaudio.h"
////////////////////////////////////////////////////////////////////////////////
//
@@ -88,7 +89,11 @@ BOOL LLMediaRemoteCtrl::postBuild()
childSetAction("media_pause",LLOverlayBar::toggleMediaPlay,this);
childSetAction("music_pause",LLOverlayBar::toggleMusicPlay,this);
childSetAction("expand", onClickExpandBtn, this);
childSetAction("expand", onClickExpandBtn, this);
LLButton *pause = getChild<LLButton>("music_pause");
mCachedPauseTip = pause->getToolTip();
return TRUE;
}
@@ -235,6 +240,28 @@ void LLMediaRemoteCtrl::enableMediaButtons()
music_pause_btn->setEnabled(music_show_pause);
music_pause_btn->setVisible(music_show_pause);
music_play_btn->setVisible(! music_show_pause);
if(music_show_pause)
{
LLStreamingAudioInterface *stream = gAudiop ? gAudiop->getStreamingAudioImpl() : NULL;
if(stream && stream->getMetaData())
{
std::string info_text = "Loading...";
const LLSD& metadata = *(stream->getMetaData());
LLSD artist = metadata.get("ARTIST");
LLSD title = metadata.get("TITLE");
if(artist.isDefined() && title.isDefined())
info_text = artist.asString() + " -- " + title.asString();
else if(title.isDefined())
info_text = std::string("Title: ") + title.asString();
else if(artist.isDefined())
info_text = std::string("Artist: ") + artist.asString();
music_pause_btn->setToolTip(info_text);
}
else
music_pause_btn->setToolTip(mCachedPauseTip);
}
childSetColor("music_icon", music_icon_color);
if(!media_icon_name.empty())
{

4
indra/newview/llmediaremotectrl.h
View File

@@ -35,6 +35,8 @@
#include "llpanel.h"
class LLButton;
////////////////////////////////////////////////////////////////////////////////
//
class LLMediaRemoteCtrl : public LLPanel
@@ -57,6 +59,8 @@ public:
protected:
void build();
std::string mCachedPauseTip;
};
#endif

1
indra/newview/llviewermedia_streamingaudio.h
View File

@@ -55,6 +55,7 @@ class LLStreamingAudio_MediaPlugins : public LLStreamingAudioInterface
/*virtual*/ void setGain(F32 vol);
/*virtual*/ F32 getGain();
/*virtual*/ std::string getURL();
/*virtual*/ LLSD *getMetaData(){return NULL;} //return NULL if not supported.
private:
LLPluginClassMedia* initializeMedia(const std::string& media_type);