brian/promoe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OTHER: Replaced code for current_id handling

Browse source 
Now the current_id changed broadcast is handled in xclientcache, the now
unused code from XMMSHandler has been removed
This commit is contained in:
Thomas Frauendorfer 2008-07-12 06:12:20 +02:00
parent 058e2d0987
commit 20cfdad68d
11 changed files with 82 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/mainwindow/shadeddisplay.cpp
View file

@ -79,8 +79,8 @@ ShadedDisplay::ShadedDisplay (QWidget *parent) : SkinDisplay (parent)
this, SLOT(setStatus(Xmms::Playback::Status)));
connect (client.cache (), SIGNAL (playtime (uint32_t)),
this, SLOT ( setPlaytime(uint32_t)));
connect (&client, SIGNAL(currentSong (const Xmms::PropDict &)),
this, SLOT(setMediainfo (const Xmms::PropDict &)));
connect (client.cache (), SIGNAL (activeEntryChanged (QVariantHash)),
this, SLOT (setMediainfo (QVariantHash)));
}
void
@ -90,22 +90,20 @@ ShadedDisplay::setPixmaps (Skin *skin)
}
void
ShadedDisplay::setMediainfo (const Xmms::PropDict &info)
ShadedDisplay::setMediainfo (QVariantHash info)
{
QString n;
if (info.contains ("artist") && info.contains ("album") &&
info.contains ("title")) {
n = QString::fromUtf8 (info.get<std::string> ("artist").c_str ())
+ " - " +
QString::fromUtf8 (info.get<std::string> ("album").c_str ())
+ " - " +
QString::fromUtf8 (info.get<std::string> ("title").c_str ());
n = info["artist"].toString () + " - "
+ info["album"].toString () + " - "
+ info["title"].toString ();
} else {
n = QString::fromUtf8 (info.get<std::string> ("url").c_str ());
n = info["url"].toString ();
}
if (info.contains ("duration")) {
m_duration = (info.get<int32_t> ("duration"));
m_duration = info["duration"].toInt ();
} else {
m_duration = 0;
}