Some little code cleanups
like removing now unused code and so on
This commit is contained in:
parent
61064a924d
commit
778d828db8
5 changed files with 8 additions and 27 deletions
2
README
2
README
|
@ -1,5 +1,5 @@
|
||||||
Required dependencys:
|
Required dependencys:
|
||||||
* QT4.1.x http://www.trolltech.no/
|
* QT4.2.x http://www.trolltech.no/
|
||||||
* XMMS2 http://xmms2.xmms.org/
|
* XMMS2 http://xmms2.xmms.org/
|
||||||
* XMMS2 C++ bindings (make sure to have boost_signals when compiling xmms2)
|
* XMMS2 C++ bindings (make sure to have boost_signals when compiling xmms2)
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,9 @@ EqualizerWindow::EqualizerWindow (QWidget *parent) : QMainWindow (parent)
|
||||||
|
|
||||||
setCentralWidget (m_equalizer);
|
setCentralWidget (m_equalizer);
|
||||||
|
|
||||||
setMinimumSize (275, 116);
|
setFixedSize (275, 116);
|
||||||
setMaximumSize (275, 116);
|
// setMinimumSize (275, 116);
|
||||||
|
// setMaximumSize (275, 116);
|
||||||
}
|
}
|
||||||
|
|
||||||
EqualizerWindow::~EqualizerWindow (void)
|
EqualizerWindow::~EqualizerWindow (void)
|
||||||
|
|
|
@ -76,6 +76,7 @@ TextScroller::setPixmaps (Skin *skin)
|
||||||
setText (m_text);
|
setText (m_text);
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
TextScroller::addOffset ()
|
TextScroller::addOffset ()
|
||||||
{
|
{
|
||||||
|
|
|
@ -67,11 +67,6 @@ XMMSHandler::connect_handler (const char *ipcpath, const bool &sync, QWidget *pa
|
||||||
|
|
||||||
m_client->playback.broadcastVolumeChanged () (bind (&XMMSHandler::volume_changed, this));
|
m_client->playback.broadcastVolumeChanged () (bind (&XMMSHandler::volume_changed, this));
|
||||||
|
|
||||||
// TODO: Disabled for now. Seems to cause problems on startup
|
|
||||||
// QObject::connect (&m_playtime_timer, SIGNAL (timeout ()),
|
|
||||||
// this, SLOT (restartPlaytime ()));
|
|
||||||
// m_playtime_timer.start(0);
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -82,12 +77,6 @@ XMMSHandler::getClient ()
|
||||||
return m_client;
|
return m_client;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
XMMSHandler::restartPlaytime ()
|
|
||||||
{
|
|
||||||
m_client->playback.getPlaytime () (Xmms::bind (&XMMSHandler::playback_playtime, this));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
XMMSHandler::medialib_entry_changed (const unsigned int &id)
|
XMMSHandler::medialib_entry_changed (const unsigned int &id)
|
||||||
{
|
{
|
||||||
|
@ -119,13 +108,13 @@ XMMSHandler::requestMediainfo (uint id)
|
||||||
{
|
{
|
||||||
m_client->medialib.getInfo (id) (Xmms::bind (&XMMSHandler::medialib_info, this));
|
m_client->medialib.getInfo (id) (Xmms::bind (&XMMSHandler::medialib_info, this));
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
void
|
void
|
||||||
XMMSHandler::requestPlaylistList ()
|
XMMSHandler::requestPlaylistList ()
|
||||||
{
|
{
|
||||||
// m_client->playlist.listEntries () (Xmms::bind (&XMMSHandler::playlist_list, this));
|
// m_client->playlist.listEntries () (Xmms::bind (&XMMSHandler::playlist_list, this));
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
void
|
void
|
||||||
XMMSHandler::requestTrackChange (int pos)
|
XMMSHandler::requestTrackChange (int pos)
|
||||||
{
|
{
|
||||||
|
@ -147,14 +136,6 @@ XMMSHandler::playback_status (const Xmms::Playback::Status &status)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
|
||||||
XMMSHandler::playback_playtime (const unsigned int &time)
|
|
||||||
{
|
|
||||||
emit playtimeChanged (time);
|
|
||||||
m_playtime_timer.start (500);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
XMMSHandler::playback_current_id (const unsigned int &id)
|
XMMSHandler::playback_current_id (const unsigned int &id)
|
||||||
{
|
{
|
||||||
|
|
|
@ -22,7 +22,6 @@ class XMMSHandler : public XClient {
|
||||||
|
|
||||||
bool connect_handler (const char *ipcpath = NULL, const bool &sync = false, QWidget *parent = NULL);
|
bool connect_handler (const char *ipcpath = NULL, const bool &sync = false, QWidget *parent = NULL);
|
||||||
|
|
||||||
bool playback_playtime (const unsigned int &time);
|
|
||||||
bool playlist_list (const Xmms::List< unsigned int > &playlist);
|
bool playlist_list (const Xmms::List< unsigned int > &playlist);
|
||||||
bool playback_current_id (const unsigned int &id);
|
bool playback_current_id (const unsigned int &id);
|
||||||
bool medialib_info (const Xmms::PropDict &propdict);
|
bool medialib_info (const Xmms::PropDict &propdict);
|
||||||
|
@ -32,7 +31,7 @@ class XMMSHandler : public XClient {
|
||||||
bool playlist_changed (const Xmms::Dict &list);
|
bool playlist_changed (const Xmms::Dict &list);
|
||||||
|
|
||||||
void requestMediainfo (uint id);
|
void requestMediainfo (uint id);
|
||||||
void requestPlaylistList ();
|
// void requestPlaylistList ();
|
||||||
void requestTrackChange (int pos);
|
void requestTrackChange (int pos);
|
||||||
void playlistAddURL (const QString& url);
|
void playlistAddURL (const QString& url);
|
||||||
void playlistRemove (uint pos);
|
void playlistRemove (uint pos);
|
||||||
|
@ -60,7 +59,6 @@ class XMMSHandler : public XClient {
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void setPlaytime (uint pos);
|
void setPlaytime (uint pos);
|
||||||
void restartPlaytime ();
|
|
||||||
|
|
||||||
void playlistClear ();
|
void playlistClear ();
|
||||||
void play ();
|
void play ();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue