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

17
src/playlist/playlistshade.cpp
View file

@ -15,6 +15,7 @@
#include "XMMSHandler.h"
#include <xmmsclient/xmmsclient++.h>
#include "xclientcache.h"
#include "playlistshade.h"
#include "playlistwindow.h"
@ -45,8 +46,8 @@ PlaylistShade::PlaylistShade (PlaylistWindow *parent) : QWidget (parent)
connect (m_unshadebtn, SIGNAL (clicked ()),
parent, SLOT (switchDisplay ()));
connect (&xmmsh, SIGNAL(currentSong (const Xmms::PropDict &)),
this, SLOT(setMediainfo (const Xmms::PropDict &)));
connect (xmmsh.cache (), SIGNAL (activeEntryChanged (QVariantHash)),
this, SLOT (setMediainfo (QVariantHash)));
connect (&xmmsh, SIGNAL(settingsSaved ()),
this, SLOT(settingsSaved ()));
@ -65,18 +66,16 @@ PlaylistShade::settingsSaved ()
}
void
PlaylistShade::setMediainfo (const Xmms::PropDict &info)
PlaylistShade::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 ();
}
m_text = (n);

5
src/playlist/playlistshade.h
View file

@ -21,6 +21,9 @@
#include <QWidget>
#include <QHash>
#include <QVariant>
typedef QHash<QString, QVariant> QVariantHash;
class QResizeEvent;
class PixmapButton;
@ -39,7 +42,7 @@ class PlaylistShade : public QWidget {
public slots:
void setPixmaps (Skin *skin);
void setMediainfo (const Xmms::PropDict &info);
void setMediainfo (QVariantHash);
void settingsSaved ();
void resizeEvent (QResizeEvent *);