|
a/upmpd/upmpd.cxx |
|
b/upmpd/upmpd.cxx |
|
... |
|
... |
| 238 |
sprintf(cvalue, "%d", volume);
|
238 |
sprintf(cvalue, "%d", volume);
|
| 239 |
status["Volume"] = cvalue;
|
239 |
status["Volume"] = cvalue;
|
| 240 |
// sprintf(cvalue, "%d", percentodbvalue(volume));
|
240 |
// sprintf(cvalue, "%d", percentodbvalue(volume));
|
| 241 |
// status["VolumeDB"] = cvalue;
|
241 |
// status["VolumeDB"] = cvalue;
|
| 242 |
status["Mute"] = volume == 0 ? "1" : "0";
|
242 |
status["Mute"] = volume == 0 ? "1" : "0";
|
|
|
243 |
return true;
|
| 243 |
}
|
244 |
}
|
| 244 |
|
245 |
|
| 245 |
bool UpMpd::getEventDataRendering(bool all, std::vector<std::string>& names,
|
246 |
bool UpMpd::getEventDataRendering(bool all, std::vector<std::string>& names,
|
| 246 |
std::vector<std::string>& values)
|
247 |
std::vector<std::string>& values)
|
| 247 |
{
|
248 |
{
|
|
... |
|
... |
| 664 |
m_mpdcli->play(curpos);
|
665 |
m_mpdcli->play(curpos);
|
| 665 |
#if 1 || defined(upmpd_do_restore_play_state_after_add)
|
666 |
#if 1 || defined(upmpd_do_restore_play_state_after_add)
|
| 666 |
switch (st) {
|
667 |
switch (st) {
|
| 667 |
case MpdStatus::MPDS_PAUSE: m_mpdcli->togglePause(); break;
|
668 |
case MpdStatus::MPDS_PAUSE: m_mpdcli->togglePause(); break;
|
| 668 |
case MpdStatus::MPDS_STOP: m_mpdcli->stop(); break;
|
669 |
case MpdStatus::MPDS_STOP: m_mpdcli->stop(); break;
|
|
|
670 |
default: break;
|
| 669 |
}
|
671 |
}
|
| 670 |
#endif
|
672 |
#endif
|
| 671 |
// Clean up old song ids
|
673 |
// Clean up old song ids
|
| 672 |
for (set<int>::iterator it = m_songids.begin();
|
674 |
for (set<int>::iterator it = m_songids.begin();
|
| 673 |
it != m_songids.end(); it++) {
|
675 |
it != m_songids.end(); it++) {
|
|
... |
|
... |
| 742 |
|
744 |
|
| 743 |
string tstate("STOPPED");
|
745 |
string tstate("STOPPED");
|
| 744 |
switch(mpds.state) {
|
746 |
switch(mpds.state) {
|
| 745 |
case MpdStatus::MPDS_PLAY: tstate = "PLAYING"; break;
|
747 |
case MpdStatus::MPDS_PLAY: tstate = "PLAYING"; break;
|
| 746 |
case MpdStatus::MPDS_PAUSE: tstate = "PAUSED_PLAYBACK"; break;
|
748 |
case MpdStatus::MPDS_PAUSE: tstate = "PAUSED_PLAYBACK"; break;
|
|
|
749 |
default: break;
|
| 747 |
}
|
750 |
}
|
| 748 |
data.addarg("CurrentTransportState", tstate);
|
751 |
data.addarg("CurrentTransportState", tstate);
|
| 749 |
data.addarg("CurrentTransportStatus", m_mpdcli->ok() ? "OK" :
|
752 |
data.addarg("CurrentTransportStatus", m_mpdcli->ok() ? "OK" :
|
| 750 |
"ERROR_OCCURRED");
|
753 |
"ERROR_OCCURRED");
|
| 751 |
data.addarg("CurrentSpeed", "1");
|
754 |
data.addarg("CurrentSpeed", "1");
|
|
... |
|
... |
| 1002 |
int loglevel(upnppdebug::Logger::LLINF);
|
1005 |
int loglevel(upnppdebug::Logger::LLINF);
|
| 1003 |
string configfile;
|
1006 |
string configfile;
|
| 1004 |
string friendlyname(dfltFriendlyName);
|
1007 |
string friendlyname(dfltFriendlyName);
|
| 1005 |
|
1008 |
|
| 1006 |
const char *cp;
|
1009 |
const char *cp;
|
| 1007 |
if (cp = getenv("UPMPD_HOST"))
|
1010 |
if ((cp = getenv("UPMPD_HOST")))
|
| 1008 |
mpdhost = cp;
|
1011 |
mpdhost = cp;
|
| 1009 |
if (cp = getenv("UPMPD_PORT"))
|
1012 |
if ((cp = getenv("UPMPD_PORT")))
|
| 1010 |
mpdport = atoi(cp);
|
1013 |
mpdport = atoi(cp);
|
| 1011 |
if (cp = getenv("UPMPD_FRIENDLYNAME"))
|
1014 |
if ((cp = getenv("UPMPD_FRIENDLYNAME")))
|
| 1012 |
friendlyname = atoi(cp);
|
1015 |
friendlyname = atoi(cp);
|
| 1013 |
if (cp = getenv("UPMPD_CONFIG"))
|
1016 |
if ((cp = getenv("UPMPD_CONFIG")))
|
| 1014 |
configfile = cp;
|
1017 |
configfile = cp;
|
| 1015 |
|
1018 |
|
| 1016 |
thisprog = argv[0];
|
1019 |
thisprog = argv[0];
|
| 1017 |
argc--; argv++;
|
1020 |
argc--; argv++;
|
| 1018 |
while (argc > 0 && **argv == '-') {
|
1021 |
while (argc > 0 && **argv == '-') {
|