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

Move fileOpen from XMMSHandler to MainDisplay

Browse source
This commit is contained in:
Daniel Svensson 2006-03-11 11:09:40 +01:00
parent 7b00c4c9fb
commit 4c500bd768
4 changed files with 21 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

21
MainDisplay.cpp
View file

@ -169,10 +169,29 @@ MainDisplay::SetupPushButtons (void)
m_eject = new Button (this, Skin::BTN_EJECT_0, Skin::BTN_EJECT_1); m_eject = new Button (this, Skin::BTN_EJECT_0, Skin::BTN_EJECT_1);
m_eject->move(136, 89); m_eject->move(136, 89);
connect (m_eject, SIGNAL(clicked()), xmmsh, SLOT(fileOpen())); connect (m_eject, SIGNAL(clicked()), this, SLOT(fileOpen()));
} }
void
MainDisplay::fileOpen (void)
{
XMMSHandler *xmmsh = XMMSHandler::getInstance();
QStringList files;
files = QFileDialog::getOpenFileNames (NULL, "Select files to play",
QDir::homePath(),
"Music (*.mp3 *.ogg *.flac *.wav *.mpc *.mp4)");
if (files.count() > 0) {
xmmsh->playlistClear ();
}
for (int i = 0; i < files.count(); i++) {
xmmsh->playlistAddURL ("file://" + files.value(i));
}
}
MainDisplay::~MainDisplay (void) MainDisplay::~MainDisplay (void)
{ {
} }

1
MainDisplay.h
View file

@ -49,6 +49,7 @@ class MainDisplay : public SkinDisplay
void setStatus (uint status); void setStatus (uint status);
void setPlaytime (uint time); void setPlaytime (uint time);
void setMediainfo (QHash<QString,QString>); void setMediainfo (QHash<QString,QString>);
void fileOpen (void);
protected: protected:
void SetupPushButtons (void); void SetupPushButtons (void);

20
XMMSHandler.cpp
View file

@ -66,26 +66,6 @@ XMMSHandler::connect (const char *path)
return true; return true;
} }
void
XMMSHandler::fileOpen (void)
{
QStringList files =
QFileDialog::getOpenFileNames (NULL,
"Select files to play",
QDir::homePath(),
"Music (*.mp3 *.ogg *.flac *.wav *.mpc *.mp4)");
if (files.count() > 0) {
playlistClear ();
}
for (int i = 0; i < files.count(); i++) {
playlistAddURL ("file://" + files.value(i));
}
}
void void
XMMSHandler::medialib_entry_changed (XMMSResultValue<uint> *res) XMMSHandler::medialib_entry_changed (XMMSResultValue<uint> *res)

1
XMMSHandler.h
View file

@ -42,7 +42,6 @@ class XMMSHandler : public QObject, public sigc::trackable {
public slots: public slots:
void setPlaytime (); void setPlaytime ();
void fileOpen (void);
void play () { delete m_xmmsc->playback_start (); } void play () { delete m_xmmsc->playback_start (); }
void stop () { delete m_xmmsc->playback_stop (); } void stop () { delete m_xmmsc->playback_stop (); }