|
a/src/ohproduct.cxx |
|
b/src/ohproduct.cxx |
|
... |
|
... |
| 74 |
if (m_dev->m_ohrcv) {
|
74 |
if (m_dev->m_ohrcv) {
|
| 75 |
o_sources.push_back(pair<string,string>("Receiver", "Receiver"));
|
75 |
o_sources.push_back(pair<string,string>("Receiver", "Receiver"));
|
| 76 |
csattrs.append(" Receiver");
|
76 |
csattrs.append(" Receiver");
|
| 77 |
if (m_dev->m_sndrcv &&
|
77 |
if (m_dev->m_sndrcv &&
|
| 78 |
m_dev->m_ohrcv->playMethod() == OHReceiverParams::OHRP_ALSA) {
|
78 |
m_dev->m_ohrcv->playMethod() == OHReceiverParams::OHRP_ALSA) {
|
|
|
79 |
if (!(m_dev->m_options & UpMpd::upmpdNoSongcastSource)) {
|
| 79 |
// It might be possible to make things work with the MPD
|
80 |
// It might be possible to make things work with the MPD
|
| 80 |
// play method but this would be complicated (the mpd we
|
81 |
// play method but this would be complicated (the mpd we
|
| 81 |
// want to get playing from sc2mpd HTTP is the
|
82 |
// want to get playing from sc2mpd HTTP is the
|
| 82 |
// original/saved one, not the current one, which is doing
|
83 |
// original/saved one, not the current one, which is doing
|
| 83 |
// the playing and sending to the fifo, so we'd need to
|
84 |
// the playing and sending to the fifo, so we'd need to
|
| 84 |
// tell ohreceiver about using the right one.
|
85 |
// tell ohreceiver about using the right one.
|
| 85 |
o_sources.push_back(pair<string,string>("Playlist", SndRcvPLName));
|
86 |
o_sources.push_back(pair<string,string>("Playlist",
|
|
|
87 |
SndRcvPLName));
|
| 86 |
if (m_dev->m_ohrd) {
|
88 |
if (m_dev->m_ohrd) {
|
| 87 |
o_sources.push_back(pair<string,string>("Radio", SndRcvRDName));
|
89 |
o_sources.push_back(pair<string,string>("Radio",
|
|
|
90 |
SndRcvRDName));
|
|
|
91 |
}
|
| 88 |
}
|
92 |
}
|
| 89 |
listScripts(o_sources);
|
93 |
listScripts(o_sources);
|
| 90 |
}
|
94 |
}
|
| 91 |
}
|
95 |
}
|
| 92 |
|
96 |
|