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

remove some now unused code from XMMSHandler and clean up headers

Browse source
This commit is contained in:
Thomas Frauendorfer 2008-02-11 19:28:07 +01:00
parent ced09fc049
commit f10cd0465a
41 changed files with 407 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/BrowseDialog.h
View file

@ -16,17 +16,15 @@
#ifndef __BROWSEDIALOG_H__
#define __BROWSEDIALOG_H__
#include "BrowseModel.h"
class BrowseModel;
#include <QDialog>
#include <QTreeView>
#include <QListView>
#include <QGridLayout>
#include <QPushButton>
#include <QLabel>
#include <QComboBox>
#include <QLineEdit>
#include <QItemSelectionModel>
class QTreeView;
class QComboBox;
class QLineEdit;
class QItemSelectionModel;
class QModelIndex;
class QString;
class BrowseDialog : public QDialog
{

2
src/BrowseModel.cpp
View file

@ -20,7 +20,7 @@
#include <QString>
#include <QIcon>
#include <QWidget>
#include <QStyle>
bool
BrowseModelItem::itemCompare (BrowseModelItem *s1, BrowseModelItem *s2)

2
src/BrowseModel.h
View file

@ -20,9 +20,9 @@
#include <QHash>
#include <QString>
#include <QStyle>
#include <QStringList>
#include <QAbstractTableModel>
class QStyle;
class BrowseModelItem
{

3
src/Display.cpp
View file

@ -17,11 +17,14 @@
#include "mainwindow.h"
#include "Display.h"
#include "Skin.h"
#include "TitleBar.h"
#include "FileDialog.h"
#include <QMouseEvent>
SkinDisplay::SkinDisplay (QWidget *parent) : QWidget(parent)
{
Skin *skin = Skin::getInstance ();

12
src/Display.h
View file

@ -16,16 +16,12 @@
#ifndef __SKINDISPLAY_H__
#define __SKINDISPLAY_H__
#include <iostream>
#include <QPixmap>
#include <QPainter>
#include <QWidget>
#include <QHash>
#include <QMouseEvent>
#include <QPaintEvent>
class QEvent;
class QMouseEvent;
class QPaintEvent;
#include "Skin.h"
class Skin;
class SkinDisplay : public QWidget
{

3
src/PixWidget.cpp
View file

@ -16,6 +16,9 @@
#include "Skin.h"
#include "PixWidget.h"
#include <QPainter>
#include <QPixmap>
PixWidget::PixWidget (QWidget *parent) : QWidget (parent)
{
Skin *skin = Skin::getInstance();

5
src/PixWidget.h
View file

@ -16,11 +16,8 @@
#ifndef __PIXWIDGET_H__
#define __PIXWIDGET_H__
#include <iostream>
#include <QPixmap>
#include <QPainter>
#include <QWidget>
class QPixmap;
class Skin;

3
src/PosBar.cpp
View file

@ -14,6 +14,7 @@
*/
#include "XMMSHandler.h"
#include "xplayback.h"
#include "mainwindow.h"
@ -173,7 +174,7 @@ PosBar::setPos (uint p)
void
PosBar::requestPos (float value)
{
XMMSHandler::getInstance ().setPlaytime (m_max * value);
XMMSHandler::getInstance ().xplayback ()->seekMs (m_max * value);
}
void

2
src/TextBar.cpp
View file

@ -48,7 +48,7 @@ TextScroller::TextScroller (QWidget *parent, uint w,
m_x2_off = 0;
m_fontsize = s.value ("fontsize").toInt ();
m_ttf = s.value ("ttf").toBool ();
m_text = "Promoe 0.1";
m_text = "Promoe " PROMOE_VERSION;
m_scroll = s.value ("scroll").toBool ();
s.endGroup ();

1
src/TimeDisplay.cpp
View file

@ -19,6 +19,7 @@
#include "maindisplay.h"
#include "TimeDisplay.h"
#include "NumberDisplay.h"
#include "Skin.h"
#include <QPen>

1
src/TitleBar.cpp
View file

@ -23,6 +23,7 @@
#include "settingsdialog.h"
#include "Button.h"
#include "BrowseDialog.h"
#include "Skin.h"
#include <QMenu>

1
src/TitleBar.h
View file

@ -21,6 +21,7 @@ class TitleBar;
#include "PixWidget.h"
class Button;
class Skin;
class TitleBar : public PixWidget
{

2
src/VolumeSlider.h
View file

@ -22,7 +22,7 @@ class Button;
#include "Button.h"
#include "PixWidget.h"
#include "Skin.h"
class Skin;
class SliderButton : public Button
{

102
src/XMMSHandler.cpp
View file

@ -25,9 +25,6 @@
#include <QErrorMessage>
#include <QHash>
#include <QFile>
#include <QFileDialog>
#include <QDir>
XMMSHandler &XMMSHandler::getInstance ()
{
@ -64,15 +61,22 @@ XMMSHandler::connect_handler (const char *ipcpath, const bool &sync, QWidget *pa
connect(ipcpath, sync, parent);
using Xmms::bind;
m_client->medialib.broadcastEntryChanged () (bind (&XMMSHandler::medialib_entry_changed, this));
m_client->medialib.broadcastEntryChanged () (
bind (&XMMSHandler::medialib_entry_changed, this));
m_client->playback.currentID () (bind (&XMMSHandler::playback_current_id, this));
m_client->playback.broadcastCurrentID () (bind (&XMMSHandler::playback_current_id, this));
m_client->playback.currentID () (
bind (&XMMSHandler::playback_current_id, this));
m_client->playback.broadcastCurrentID () (
bind (&XMMSHandler::playback_current_id, this));
m_client->playback.getStatus () (bind (&XMMSHandler::playback_status, this));
m_client->playback.broadcastStatus () (bind (&XMMSHandler::playback_status, this));
m_client->playback.broadcastVolumeChanged () (bind (&XMMSHandler::volume_changed, this));
m_client->playback.getStatus () (
bind (&XMMSHandler::playback_status, this));
m_client->playback.broadcastStatus () (
bind (&XMMSHandler::playback_status, this));
m_client->playback.broadcastVolumeChanged () (
bind (&XMMSHandler::volume_changed, this));
return true;
}
@ -98,30 +102,14 @@ XMMSHandler::playlistAddURL (const QString &s)
{
m_client->playlist.addUrl (s.toAscii ().constData ()) ();
}
void
XMMSHandler::playlistRemove (uint pos)
{
m_client->playlist.removeEntry (pos) ();
}
void
XMMSHandler::playlistMove (uint pos, uint newpos)
{
m_client->playlist.moveEntry (pos, newpos) ();
}
void
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
XMMSHandler::requestPlaylistList ()
{
// m_client->playlist.listEntries () (Xmms::bind (&XMMSHandler::playlist_list, this));
}
*/
void
XMMSHandler::requestTrackChange (int pos)
{
@ -129,13 +117,6 @@ XMMSHandler::requestTrackChange (int pos)
m_client->playback.tickle () ();
}
bool
XMMSHandler::playlist_list (const Xmms::List< unsigned int > &playlist)
{
emit playlistList (playlist);
return false;
}
bool
XMMSHandler::playback_status (const Xmms::Playback::Status &status)
{
@ -146,21 +127,15 @@ XMMSHandler::playback_status (const Xmms::Playback::Status &status)
bool
XMMSHandler::playback_current_id (const unsigned int &id)
{
m_currentid = id;
m_currentid = id;
if (id > 0) {
requestMediainfo (id);
}
if (id > 0) {
requestMediainfo (id);
}
emit currentID(id);
return true;
return true;
}
void
XMMSHandler::setPlaytime (uint pos)
{
m_client->playback.seekMs (pos) ();
}
void
XMMSHandler::DictToQHash (const std::string &key,
@ -221,13 +196,6 @@ XMMSHandler::medialib_select (XMMSResultDictList *res)
}
*/
bool
XMMSHandler::playlist_changed (const Xmms::Dict &list)
{
emit playlistChanged (list);
return true;
}
bool
XMMSHandler::medialib_info (const Xmms::PropDict &propdict)
{
@ -310,31 +278,3 @@ void XMMSHandler::playlistClear ()
{
m_client->playlist.clear () ();
}
void XMMSHandler::play ()
{
m_client->playback.start () ();
}
void XMMSHandler::stop ()
{
m_client->playback.stop () ();
}
void XMMSHandler::pause ()
{
m_client->playback.pause () ();
}
void XMMSHandler::next ()
{
m_client->playlist.setNextRel (1) ();
m_client->playback.tickle () ();
}
void XMMSHandler::prev ()
{
m_client->playlist.setNextRel (-1) ();
m_client->playback.tickle () ();
}

18
src/XMMSHandler.h
View file

@ -23,7 +23,6 @@
#include <QObject>
#include <QHash>
#include <QTimer>
class PlaylistModel;
@ -37,20 +36,15 @@ class XMMSHandler : public XClient {
bool connect_handler (const char *ipcpath = NULL, const bool &sync = false, QWidget *parent = NULL);
bool playlist_list (const Xmms::List< unsigned int > &playlist);
bool playback_current_id (const unsigned int &id);
bool medialib_info (const Xmms::PropDict &propdict);
bool medialib_entry_changed (const unsigned int &id);
bool playback_status (const Xmms::Playback::Status &status);
bool volume_changed (const Xmms::Dict &levels);
bool playlist_changed (const Xmms::Dict &list);
void requestMediainfo (uint id);
// void requestPlaylistList ();
void requestTrackChange (int pos);
void playlistAddURL (const QString& url);
void playlistRemove (uint pos);
void playlistMove (uint pos, uint newpos);
/*
void medialib_select (XMMSResultDictList *res);
@ -73,24 +67,14 @@ class XMMSHandler : public XClient {
PlaylistModel *getPlaylistModel () {return m_playlist_model; }
public slots:
void setPlaytime (uint pos);
void playlistClear ();
void play ();
void stop ();
void pause ();
void next ();
void prev ();
void volumeSet (uint volume);
signals:
void settingsSaved ();
void playbackStatusChanged (Xmms::Playback::Status status);
void playtimeChanged (uint time);
void mediainfoChanged (uint, const Xmms::PropDict &);
void currentSong (const Xmms::PropDict &);
void playlistList (const Xmms::List< unsigned int > &);
void currentID (uint);
void playlistChanged (const Xmms::Dict &);
/*
void medialibResponse (uint, const QList<QHash<QString, QString> > &);
@ -98,8 +82,6 @@ class XMMSHandler : public XClient {
void getVolume (uint);
private:
QTimer m_playtime_timer;
void DictToQHash (const std::string &key,
const Xmms::Dict::Variant &value,
QHash<QString, QString> &hash);

4
src/dialogs/urlopen.cpp
View file

@ -14,10 +14,6 @@
* GNU General Public License for more details.
*/
// FIXME: because somewhere something with the includes is wrons, this line
// is needed
#include "XMMSHandler.h"
#include <QUrl>
#include "urlopen.h"

1
src/equalizer/equalizerwidget.cpp
View file

@ -20,6 +20,7 @@
#include "mainwindow.h"
#include "Button.h"
#include "Skin.h"
#include "VolumeSlider.h"

15
src/mainwindow/maindisplay.cpp
View file

@ -15,6 +15,9 @@
#include <xmmsclient/xmmsclient++.h>
#include "XMMSHandler.h"
#include "xclientcache.h"
#include "xplayback.h"
#include "maindisplay.h"
#include "mainwindow.h"
@ -259,28 +262,28 @@ MainDisplay::toggleTime (void)
void
MainDisplay::SetupPushButtons (void)
{
XMMSHandler &xmmsh = XMMSHandler::getInstance ();
XMMSHandler &client = XMMSHandler::getInstance ();
/* Normal buttons */
m_prev = new Button (this, Skin::BTN_PREV_0, Skin::BTN_PREV_1);
m_prev->move(16, 88);
connect (m_prev, SIGNAL(clicked()), &xmmsh, SLOT(prev()));
connect (m_prev, SIGNAL(clicked()), client.xplayback (), SLOT(prev ()));
m_play = new Button (this, Skin::BTN_PLAY_0, Skin::BTN_PLAY_1);
m_play->move(39, 88);
connect (m_play, SIGNAL(clicked()), &xmmsh, SLOT(play()));
connect (m_play, SIGNAL(clicked()), client.xplayback (), SLOT(play ()));
m_pause = new Button (this, Skin::BTN_PAUSE_0, Skin::BTN_PAUSE_1);
m_pause->move(62, 88);
connect (m_pause, SIGNAL(clicked()), &xmmsh, SLOT(pause()));
connect (m_pause, SIGNAL(clicked()), client.xplayback (), SLOT(pause ()));
m_stop = new Button (this, Skin::BTN_STOP_0, Skin::BTN_STOP_1);
m_stop->move(85, 88);
connect (m_stop, SIGNAL(clicked()), &xmmsh, SLOT(stop()));
connect (m_stop, SIGNAL(clicked()), client.xplayback (), SLOT(stop ()));
m_next = new Button (this, Skin::BTN_NEXT_0, Skin::BTN_NEXT_1);
m_next->move(108, 88);
connect (m_next, SIGNAL(clicked()), &xmmsh, SLOT(next()));
connect (m_next, SIGNAL(clicked()), client.xplayback (), SLOT(next ()));
m_eject = new Button (this, Skin::BTN_EJECT_0, Skin::BTN_EJECT_1);
m_eject->move(136, 89);

1
src/mainwindow/mainwindow.cpp
View file

@ -26,6 +26,7 @@
#include "shadeddisplay.h"
#include "equalizerwindow.h"
#include "Button.h"
#include "Skin.h"
#include <QSettings>
#include <QIcon>

20
src/mainwindow/shadeddisplay.cpp
View file

@ -15,6 +15,8 @@
#include <xmmsclient/xmmsclient++.h>
#include "XMMSHandler.h"
#include "xclientcache.h"
#include "xplayback.h"
#include "shadeddisplay.h"
#include "TitleBar.h"
@ -25,7 +27,7 @@
ShadedDisplay::ShadedDisplay (QWidget *parent) : SkinDisplay (parent)
{
XMMSHandler &xmmsh = XMMSHandler::getInstance ();
XMMSHandler &client = XMMSHandler::getInstance ();
setMinimumSize (275, 14);
setMaximumSize (275, 14);
@ -47,38 +49,38 @@ ShadedDisplay::ShadedDisplay (QWidget *parent) : SkinDisplay (parent)
m_prev = new Button (this);
m_prev->move(169, 4);
m_prev->resize (8, 7);
connect (m_prev, SIGNAL(clicked()), &xmmsh, SLOT(prev()));
connect (m_prev, SIGNAL(clicked()), client.xplayback (), SLOT(prev ()));
m_play = new Button (this);
m_play->move(177, 4);
m_play->resize (10, 7);
connect (m_play, SIGNAL(clicked()), &xmmsh, SLOT(play()));
connect (m_play, SIGNAL(clicked()), client.xplayback (), SLOT(play ()));
m_pause = new Button (this);
m_pause->move(187, 4);
m_pause->resize (10, 7);
connect (m_pause, SIGNAL(clicked()), &xmmsh, SLOT(pause()));
connect (m_pause, SIGNAL(clicked()), client.xplayback (), SLOT(pause ()));
m_stop = new Button (this);
m_stop->move(197, 4);
m_stop->resize (9, 7);
connect (m_stop, SIGNAL(clicked()), &xmmsh, SLOT(stop()));
connect (m_stop, SIGNAL(clicked()), client.xplayback (), SLOT(stop ()));
m_next = new Button (this);
m_next->move(206, 4);
m_next->resize (8, 7);
connect (m_next, SIGNAL(clicked()), &xmmsh, SLOT(next()));
connect (m_next, SIGNAL(clicked()), client.xplayback (), SLOT(next ()));
m_eject = new Button (this);
m_eject->move(216, 4);
m_eject->resize (9, 7);
connect (m_eject, SIGNAL(clicked()), this, SLOT(fileOpen()));
connect (&xmmsh, SIGNAL(playbackStatusChanged(Xmms::Playback::Status)),
connect (&client, SIGNAL(playbackStatusChanged(Xmms::Playback::Status)),
this, SLOT(setStatus(Xmms::Playback::Status)));
connect (xmmsh.cache (), SIGNAL (playtime (uint32_t)),
connect (client.cache (), SIGNAL (playtime (uint32_t)),
this, SLOT ( setPlaytime(uint32_t)));
connect (&xmmsh, SIGNAL(currentSong (const Xmms::PropDict &)),
connect (&client, SIGNAL(currentSong (const Xmms::PropDict &)),
this, SLOT(setMediainfo (const Xmms::PropDict &)));
}

1
src/playlist/playlistmenu.cpp
View file

@ -14,6 +14,7 @@
*/
#include "playlistmenu.h"
#include "Skin.h"
#include <QMouseEvent>
#include <QWidget>

11
src/playlist/playlistmenu.h
View file

@ -19,16 +19,13 @@
class PlaylistMenu;
#include "XMMSHandler.h"
#include "Skin.h"
#include "PixWidget.h"
/*
#include <QWidget>
#include <QPixmap>
*/
#include "Skin.h"
class PlaylistMenu;
#include <QObject>
class QWidget;
class PlaylistMenuBar : public PixWidget {
Q_OBJECT
public:

2
src/playlist/playlistshade.cpp
View file

@ -40,7 +40,7 @@ PlaylistShade::PlaylistShade (QWidget *parent) : QWidget (parent)
connect (&xmmsh, SIGNAL(settingsSaved ()),
this, SLOT(settingsSaved ()));
m_text = "Promoe 0.1 - A very neat XMMS2 client";
m_text = "Promoe " PROMOE_VERSION " - A very neat XMMS2 client";
}
void

4
src/playlist/playlistview.cpp
View file

@ -17,10 +17,12 @@
// FIXME should not need those two
#include <xmmsclient/xmmsclient++.h>
#include "XMMSHandler.h"
#include "xplayback.h"
#include "playlistview.h"
#include "playlistmodel.h"
#include "playlistwidget.h"
#include "Skin.h"
#include <QColor>
#include <QMenu>
@ -272,6 +274,6 @@ PlaylistView::mouseDoubleClickEvent (QMouseEvent *event)
xmmsh.requestTrackChange (index.row());
if (m_status == XMMS_PLAYBACK_STATUS_STOP ||
m_status == XMMS_PLAYBACK_STATUS_PAUSE) {
xmmsh.play ();
xmmsh.xplayback ()->play ();
}
}

5
src/playlist/playlistview.h
View file

@ -19,11 +19,12 @@
//include "Playlist.h"
#include <xmmsclient/xmmsclient++.h>
#include "Skin.h"
class Skin;
#include <QObject>
#include <QAbstractItemDelegate>
#include <QListView>
#include <QWidget>
class QWidget;
class PlaylistDelegate : public QAbstractItemDelegate {
Q_OBJECT