X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=groove.cpp;h=050a7433620337706ebbdd31fd3fa0037f09d8ba;hb=ece7001a5b569241115c0187d654b92e247c68f6;hp=a63602d424cd8d59795b4dceca920b710b2b78fb;hpb=09cbcf06e7626449f197a738b1522ef3dd605650;p=groove

diff --git a/groove.cpp b/groove.cpp
index a63602d..050a743 100644
--- a/groove.cpp
+++ b/groove.cpp
@@ -74,9 +74,11 @@ groove::groove(QWidget *parent) :
     connect(pushMenu,SIGNAL(triggered(QAction*)),this,SLOT(changeS(QAction*)));
     connect(dButton,SIGNAL(clicked()),this, SLOT(play()));
     connect(stopButton,SIGNAL(clicked()),this,SLOT(stop()));
-    connect(gs,SIGNAL(sKeyFound()),this,SLOT(startP()));
     connect(moreButton,SIGNAL(clicked()),this,SLOT(moreB()));
     //connect(rotator,SIGNAL(orientationChanged(Orientation)),this,SLOT(orientationChanged()));
+    pl = new playlist();
+    pl->setGscom(gs);
+    player->setPlaylist(pl);
 }
 void groove::search()
 {
@@ -132,23 +134,11 @@ void groove::play()
         if(item == 0)
             return;
         //gs->getSong();
-        gs->getSong(item->text());
+        player->play(pl->addSong(item));
     }
     //selected.
     //if
 }
-void groove::startP()
-{
-    if(!gs->sku.isValid())
-        return;
-    player->~sPlayer();
-    player = new sPlayer();
-#ifdef Q_WS_MAEMO_5
-    player->play(gs->streamID,gs->sku,rot->currentOrientation());
-#else
-    player->play(gs->streamID,gs->sku);
-#endif
-}
 void groove::stop()
 {
     player->stop();