projects
/
groove
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://vcs.maemo.org/git/groove
[groove]
/
groove.h
diff --git
a/groove.h
b/groove.h
index
8779cce
..
d407c69
100644
(file)
--- a/
groove.h
+++ b/
groove.h
@@
-12,7
+12,8
@@
#include "topbar.h"
#include "vkb.h"
#include "bottombar.h"
#include "topbar.h"
#include "vkb.h"
#include "bottombar.h"
-#include "mpgplayer.h"
+//#include "mpgplayer.h"
+#include "plistwin.h"
class groove : public QWidget
{
class groove : public QWidget
{
@@
-36,7
+37,7
@@
private slots:
void addSongPlaylist();
void showOthers();
private:
void addSongPlaylist();
void showOthers();
private:
- mpgplayer *mpg;
+ //mpgplayer *mpg;
bottomBar *bBar;
sPlayer *player;
QMenuBar *mBar;
bottomBar *bBar;
sPlayer *player;
QMenuBar *mBar;
@@
-47,6
+48,7
@@
private:
QPushButton *button;
bool portrait;
gscom *gs;
QPushButton *button;
bool portrait;
gscom *gs;
+ pListWin *pwindow;
#if defined(Q_WS_MAEMO_5) || defined(Q_WS_HILDON)
QMaemo5Rotator *rot;
#endif
#if defined(Q_WS_MAEMO_5) || defined(Q_WS_HILDON)
QMaemo5Rotator *rot;
#endif