diff --git a/README b/README index f978b65..ddd383a 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ Required dependencys: - * QT4.1.x http://www.trolltech.no/ + * QT4.2.x http://www.trolltech.no/ * XMMS2 http://xmms2.xmms.org/ * XMMS2 C++ bindings (make sure to have boost_signals when compiling xmms2) diff --git a/src/Equalizer.cpp b/src/Equalizer.cpp index 0838edd..875e214 100644 --- a/src/Equalizer.cpp +++ b/src/Equalizer.cpp @@ -16,8 +16,9 @@ EqualizerWindow::EqualizerWindow (QWidget *parent) : QMainWindow (parent) setCentralWidget (m_equalizer); - setMinimumSize (275, 116); - setMaximumSize (275, 116); + setFixedSize (275, 116); +// setMinimumSize (275, 116); +// setMaximumSize (275, 116); } EqualizerWindow::~EqualizerWindow (void) diff --git a/src/TextBar.cpp b/src/TextBar.cpp index d1a588b..0a21c9c 100644 --- a/src/TextBar.cpp +++ b/src/TextBar.cpp @@ -76,6 +76,7 @@ TextScroller::setPixmaps (Skin *skin) setText (m_text); update(); } + void TextScroller::addOffset () { diff --git a/src/XMMSHandler.cpp b/src/XMMSHandler.cpp index 2cd1aea..aebfdc4 100644 --- a/src/XMMSHandler.cpp +++ b/src/XMMSHandler.cpp @@ -67,11 +67,6 @@ XMMSHandler::connect_handler (const char *ipcpath, const bool &sync, QWidget *pa 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; } @@ -82,12 +77,6 @@ XMMSHandler::getClient () return m_client; } -void -XMMSHandler::restartPlaytime () -{ - m_client->playback.getPlaytime () (Xmms::bind (&XMMSHandler::playback_playtime, this)); -} - bool 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)); } - +/* void XMMSHandler::requestPlaylistList () { // m_client->playlist.listEntries () (Xmms::bind (&XMMSHandler::playlist_list, this)); } - +*/ void XMMSHandler::requestTrackChange (int pos) { @@ -147,14 +136,6 @@ XMMSHandler::playback_status (const Xmms::Playback::Status &status) return true; } -bool -XMMSHandler::playback_playtime (const unsigned int &time) -{ - emit playtimeChanged (time); - m_playtime_timer.start (500); - return false; -} - bool XMMSHandler::playback_current_id (const unsigned int &id) { diff --git a/src/XMMSHandler.h b/src/XMMSHandler.h index 9ec2391..330ab22 100644 --- a/src/XMMSHandler.h +++ b/src/XMMSHandler.h @@ -22,7 +22,6 @@ class XMMSHandler : public XClient { 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 playback_current_id (const unsigned int &id); bool medialib_info (const Xmms::PropDict &propdict); @@ -32,7 +31,7 @@ class XMMSHandler : public XClient { bool playlist_changed (const Xmms::Dict &list); void requestMediainfo (uint id); - void requestPlaylistList (); +// void requestPlaylistList (); void requestTrackChange (int pos); void playlistAddURL (const QString& url); void playlistRemove (uint pos); @@ -60,7 +59,6 @@ class XMMSHandler : public XClient { public slots: void setPlaytime (uint pos); - void restartPlaytime (); void playlistClear (); void play ();