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

OTHER: Use correct types for dict gets and use Xmms::List for playlistList

Browse source 
signal.
This commit is contained in:
Jonne Lehtinen 2006-05-27 19:49:25 +03:00 • committed by Tobias Rundstrom
parent c98cadb1f2
commit f8dc612c13
5 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
MainDisplay.cpp
View file

@ -138,19 +138,19 @@ MainDisplay::setMediainfo (const Xmms::PropDict &info)
} }
m_text->setText (n); m_text->setText (n);
m_kbps->setNumber (info.get<uint32_t> ("bitrate")/1000, 3); m_kbps->setNumber (info.get<int32_t> ("bitrate")/1000, 3);
if (info.contains ("samplerate")) { if (info.contains ("samplerate")) {
m_khz->setNumber (info.get<uint32_t> ("samplerate")/1000, 2); m_khz->setNumber (info.get<int32_t> ("samplerate")/1000, 2);
} else { } else {
m_khz->setNumber(0, 1); m_khz->setNumber(0, 1);
} }
if (info.contains ("channels:in") && if (info.contains ("channels:in") &&
info.get<uint32_t> ("channels:in") > 1) { info.get<int32_t> ("channels:in") > 1) {
m_stereo->setStereoMono (1, 0); m_stereo->setStereoMono (1, 0);
} else { } else {
m_stereo->setStereoMono (0, 1); m_stereo->setStereoMono (0, 1);
} }
m_slider->setMax (info.get<uint32_t> ("duration")); m_slider->setMax (info.get<int32_t> ("duration"));
m_slider->hideBar (false); m_slider->hideBar (false);
} }

16
PlaylistList.cpp
View file

@ -75,8 +75,8 @@ PlaylistList::PlaylistList (QWidget *parent) : QWidget (parent)
m_status = XMMS_PLAYBACK_STATUS_STOP; m_status = XMMS_PLAYBACK_STATUS_STOP;
m_bar = -2; m_bar = -2;
connect (&xmmsh, SIGNAL(playlistList(const QList<uint> &)), connect (&xmmsh, SIGNAL(playlistList(const Xmms::List< unsigned int > &)),
this, SLOT(playlistList(const QList<uint> &))); this, SLOT(playlistList(const Xmms::List< unsigned int > &)));
connect (&xmmsh, SIGNAL(currentID(uint)), connect (&xmmsh, SIGNAL(currentID(uint)),
this, SLOT(currentID(uint))); this, SLOT(currentID(uint)));
@ -234,7 +234,7 @@ PlaylistList::mediainfoChanged (uint id, const Xmms::PropDict &info)
i->setText (n); i->setText (n);
if (info.contains ("duration")) { if (info.contains ("duration")) {
unsigned int duration = info.get<uint32_t> ("duration"); unsigned int duration = info.get<int32_t> ("duration");
QString dur; QString dur;
dur.sprintf ("%02d:%02d", duration/60000, (duration/1000)%60); dur.sprintf ("%02d:%02d", duration/60000, (duration/1000)%60);
i->setDuration (dur); i->setDuration (dur);
@ -246,13 +246,13 @@ PlaylistList::mediainfoChanged (uint id, const Xmms::PropDict &info)
} }
void void
PlaylistList::playlistList (const QList<uint> &l) PlaylistList::playlistList (const Xmms::List< unsigned int > &list)
{ {
for (int i = 0; i < l.count(); i++) { for (list.first (); list.isValid (); ++list) {
if (m_itemmap->contains (l.value(i))) { if (m_itemmap->contains (*list)) {
addItem (m_itemmap->value (l.value (i))); addItem (m_itemmap->value (*list));
} else { } else {
new PlaylistItem (this, l.value(i)); new PlaylistItem (this, *list);
} }
} }

2
PlaylistList.h
View file

@ -26,7 +26,7 @@ class PlaylistList : public QWidget {
public slots: public slots:
void setPixmaps (Skin *skin); void setPixmaps (Skin *skin);
void playlistList (const QList<uint> &); void playlistList (const Xmms::List< unsigned int > &);
void mediainfoChanged (uint, const Xmms::PropDict &); void mediainfoChanged (uint, const Xmms::PropDict &);
void playlistChanged (const Xmms::Dict &); void playlistChanged (const Xmms::Dict &);
void currentID (uint); void currentID (uint);

9
XMMSHandler.cpp
View file

@ -5,6 +5,7 @@
#include <cstdlib> #include <cstdlib>
#include <string> #include <string>
#include <iostream>
#include <QErrorMessage> #include <QErrorMessage>
#include <QHash> #include <QHash>
@ -131,11 +132,7 @@ XMMSHandler::requestTrackChange (int pos)
bool bool
XMMSHandler::playlist_list (const Xmms::List< unsigned int > &playlist) XMMSHandler::playlist_list (const Xmms::List< unsigned int > &playlist)
{ {
QList<uint> list; emit playlistList (playlist);
for (;playlist.isValid (); ++playlist) {
list.append (*playlist);
}
emit playlistList (list);
return false; return false;
} }
@ -241,7 +238,7 @@ XMMSHandler::playlist_changed (const Xmms::Dict &list)
bool bool
XMMSHandler::medialib_info (const Xmms::PropDict &propdict) XMMSHandler::medialib_info (const Xmms::PropDict &propdict)
{ {
unsigned int id = propdict.get<uint32_t>("id"); unsigned int id = propdict.get<int32_t>("id");
emit mediainfoChanged (id, propdict); emit mediainfoChanged (id, propdict);
if (id == m_currentid) { if (id == m_currentid) {

2
XMMSHandler.h
View file

@ -67,7 +67,7 @@ class XMMSHandler : public QObject {
void playtimeChanged (uint time); void playtimeChanged (uint time);
void mediainfoChanged (uint, const Xmms::PropDict &); void mediainfoChanged (uint, const Xmms::PropDict &);
void currentSong (const Xmms::PropDict &); void currentSong (const Xmms::PropDict &);
void playlistList (const QList<uint> &); void playlistList (const Xmms::List< unsigned int > &);
void currentID (uint); void currentID (uint);
void playlistChanged (const Xmms::Dict &); void playlistChanged (const Xmms::Dict &);
/* /*