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

#3564 Permit 'labeling' audio streams that play via media plugin 

People were using fmod's undocumented capability to ignore everything
after the url to label their streams.
master
Andrey Kleshchev 2025-08-05 23:13:42 +03:00 committed by Andrey Kleshchev
parent c8f1890f96
commit c25df5224f
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llviewermedia_streamingaudio.cpp
View File

@ -60,13 +60,26 @@ void LLStreamingAudio_MediaPlugins::start(const std::string& url)
if(!mMediaPlugin)
return;
if (!url.empty()) {
if (!url.empty())
{
LL_INFOS() << "Starting internet stream: " << url << LL_ENDL;
mURL = url;
mMediaPlugin->loadURI ( url );
mURL = url; // keep original url here for comparison purposes
std::string snt_url = url;
LLStringUtil::trim(snt_url);
size_t pos = snt_url.find(' ');
if (pos != std::string::npos)
{
// fmod permited having names after the url and people were using it.
// People label their streams this way, ignore the 'label'.
snt_url = snt_url.substr(0, pos);
}
mMediaPlugin->loadURI(snt_url);
mMediaPlugin->start();
LL_INFOS() << "Playing stream..." << LL_ENDL;
} else {
}
else
{
LL_INFOS() << "setting stream to NULL"<< LL_ENDL;
mURL.clear();
mMediaPlugin->stop();