Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Jean-Francois Dockes
upmpdcli
Commits
aa9a815c
Commit
aa9a815c
authored
Feb 12, 2017
by
Jean-Francois Dockes
Browse files
comments and traces
parent
b1ab1bc1
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/ohradio.cxx
View file @
aa9a815c
...
...
@@ -215,7 +215,8 @@ bool OHRadio::makestate(unordered_map<string, string>& st)
string
uri
;
if
(
ExecCmd
::
backtick
(
radio
.
artScript
,
uri
))
{
trimstring
(
uri
,
"
\t\r\n
"
);
LOGDEB
(
"OHRadio::makestate: artScript got: ["
<<
uri
<<
"]
\n
"
);
LOGDEB
(
"OHRadio::makestate: artScript got: ["
<<
uri
<<
"]
\n
"
);
radio
.
dynArtUri
=
uri
;
}
}
...
...
@@ -417,13 +418,21 @@ static string radioDidlMake(const string& title, const string& uri,
return
out
;
}
// This is called from read, and readlist. Don't send current metadata
// (including dynamic art and song title) for the current channel,
// else the radio logo AND name are replaced by the song's in channel
// selection interfaces. Only send the song metadata with
// OHRadio::Channel and Info:Metatext
string
OHRadio
::
metaForId
(
unsigned
int
id
)
{
LOGDEB1
(
"OHRadio::metaForId: id "
<<
id
<<
" m_id "
<<
m_id
<<
endl
);
string
meta
;
if
(
id
>=
0
&&
id
<
o_radios
.
size
())
{
if
(
0
&&
id
==
m_id
)
{
if
(
false
&&
id
==
m_id
)
{
LOGDEB1
(
"OHRadio::metaForId: using Metatext
\n
"
);
meta
=
m_state
[
"Metadata"
];
}
else
{
LOGDEB1
(
"OHRadio::metaForId: using list data
\n
"
);
meta
=
radioDidlMake
(
o_radios
[
id
].
title
,
o_radios
[
id
].
uri
,
o_radios
[
id
].
artUri
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment