remove some now unused code from XMMSHandler and clean up headers
This commit is contained in:
parent
ced09fc049
commit
f10cd0465a
41 changed files with 407 additions and 242 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue