|
a/src/ohradio.cxx |
|
b/src/ohradio.cxx |
|
... |
|
... |
| 213 |
if (nsong.compare(m_currentsong)) {
|
213 |
if (nsong.compare(m_currentsong)) {
|
| 214 |
m_currentsong = nsong;
|
214 |
m_currentsong = nsong;
|
| 215 |
string uri;
|
215 |
string uri;
|
| 216 |
if (ExecCmd::backtick(radio.artScript, uri)) {
|
216 |
if (ExecCmd::backtick(radio.artScript, uri)) {
|
| 217 |
trimstring(uri, " \t\r\n");
|
217 |
trimstring(uri, " \t\r\n");
|
| 218 |
LOGDEB("OHRadio::makestate: artScript got: [" << uri << "]\n");
|
218 |
LOGDEB("OHRadio::makestate: artScript got: [" << uri <<
|
|
|
219 |
"]\n");
|
| 219 |
radio.dynArtUri = uri;
|
220 |
radio.dynArtUri = uri;
|
| 220 |
}
|
221 |
}
|
| 221 |
}
|
222 |
}
|
| 222 |
}
|
223 |
}
|
| 223 |
mpds.currentsong.artUri = radio.dynArtUri;
|
224 |
mpds.currentsong.artUri = radio.dynArtUri;
|
|
... |
|
... |
| 415 |
"</item>\n"
|
416 |
"</item>\n"
|
| 416 |
"</DIDL-Lite>\n";
|
417 |
"</DIDL-Lite>\n";
|
| 417 |
return out;
|
418 |
return out;
|
| 418 |
}
|
419 |
}
|
| 419 |
|
420 |
|
|
|
421 |
// This is called from read, and readlist. Don't send current metadata
|
|
|
422 |
// (including dynamic art and song title) for the current channel,
|
|
|
423 |
// else the radio logo AND name are replaced by the song's in channel
|
|
|
424 |
// selection interfaces. Only send the song metadata with
|
|
|
425 |
// OHRadio::Channel and Info:Metatext
|
| 420 |
string OHRadio::metaForId(unsigned int id)
|
426 |
string OHRadio::metaForId(unsigned int id)
|
| 421 |
{
|
427 |
{
|
|
|
428 |
LOGDEB1("OHRadio::metaForId: id " << id << " m_id " << m_id << endl);
|
| 422 |
string meta;
|
429 |
string meta;
|
| 423 |
if (id >= 0 && id < o_radios.size()) {
|
430 |
if (id >= 0 && id < o_radios.size()) {
|
| 424 |
if (0 && id == m_id) {
|
431 |
if (false && id == m_id) {
|
|
|
432 |
LOGDEB1("OHRadio::metaForId: using Metatext\n");
|
| 425 |
meta = m_state["Metadata"];
|
433 |
meta = m_state["Metadata"];
|
| 426 |
} else {
|
434 |
} else {
|
|
|
435 |
LOGDEB1("OHRadio::metaForId: using list data\n");
|
| 427 |
meta = radioDidlMake(o_radios[id].title, o_radios[id].uri,
|
436 |
meta = radioDidlMake(o_radios[id].title, o_radios[id].uri,
|
| 428 |
o_radios[id].artUri);
|
437 |
o_radios[id].artUri);
|
| 429 |
}
|
438 |
}
|
| 430 |
}
|
439 |
}
|
| 431 |
return meta;
|
440 |
return meta;
|