Add a stop button

diff --git a/Groove.pro b/Groove.pro
index 4b36e10..de7ff66 100644 (file)
--- a/Groove.pro
+++ b/Groove.pro
@@ -11,12 +11,12 @@ INSTALLS += target
 #CONFIG += build_all
 DEPENDPATH += .
 INCLUDEPATH += .
-INCLUDEPATH += /usr/include/qjson
-#INCLUDEPATH += ../qjson/src/
+#INCLUDEPATH += /usr/include/qjson
+INCLUDEPATH += ../qjson/src/
 #INCLUDEPATH += ./src/
-LIBS += -L/usr/lib -lqjson ##Desktop Target
+#LIBS += -L/usr/lib -lqjson ##Desktop Target
 #LIBS += -L/usr/local/lib -lqjson ##Armel Target
-#LIBS += -L~/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1014-slim/usr/lib -lqjson ##Armel Target SDK
+LIBS += -L~/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1014-slim/usr/lib -lqjson ##Armel Target SDK
 #LIBS += -L../qjson/lib -lqjson ##X86 maemo
 QT += network
 QT += phonon

diff --git a/Groove.pro.user b/Groove.pro.user
index 89f9a2a..1b5a1a2 100644 (file)
--- a/Groove.pro.user
+++ b/Groove.pro.user
@@ -2,7 +2,7 @@
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">0</value>
+  <value type="int">1</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.EditorSettings</variable>
@@ -194,7 +194,7 @@
     </valuemap>
     <value key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId" type="qulonglong">1</value>
     <valuemap key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployed" type="QVariantMap">
-     <value key="192.168.1.3" type="QDateTime">2010-05-27T11:12:48</value>
+     <value key="192.168.1.3" type="QDateTime">2010-06-17T01:03:56</value>
     </valuemap>
     <value key="Qt4ProjectManager.MaemoRunConfiguration.Simulator" type="QString"></value>
    </valuemap>

diff --git a/Makefile b/Makefile
index ef443ed..74ab4ae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: groove
-# Generated by qmake (2.01a) (Qt 4.6.2) on: Wed Jun 16 21:13:23 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Thu Jun 17 01:20:12 2010
 # Project:  Groove.pro
 # Template: app
 # Command: /usr/bin/qmake -unix -o Makefile Groove.pro
@@ -13,10 +13,10 @@ CXX           = g++
 DEFINES       = -DQT_NO_DEBUG -DQT_PHONON_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
 CFLAGS        = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
 CXXFLAGS      = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/phonon -I/usr/include/qt4 -I. -I/usr/include/qjson -I/usr/include/qt4/phonon_compat -I.
+INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/phonon -I/usr/include/qt4 -I. -I../qjson/src -I/usr/include/qt4/phonon_compat -I.
 LINK          = g++
 LFLAGS        = -Wl,-O1
-LIBS          = $(SUBLIBS)  -L/usr/lib -L/usr/lib -lqjson -lphonon -lQtGui -lQtNetwork -lQtCore -lpthread 
+LIBS          = $(SUBLIBS)  -L/usr/lib -L~/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1014-slim/usr/lib -lqjson -lphonon -lQtGui -lQtNetwork -lQtCore -lpthread 
 AR            = ar cqs
 RANLIB        = 
 QMAKE         = /usr/bin/qmake
@@ -47,19 +47,23 @@ SOURCES       = main.cpp \
                groove.cpp \
                gscom.cpp \
                splayer.cpp \
-               streamio.cpp moc_groove.cpp \
+               streamio.cpp \
+               playlist.cpp moc_groove.cpp \
                moc_gscom.cpp \
                moc_splayer.cpp \
-               moc_streamio.cpp
+               moc_streamio.cpp \
+               moc_playlist.cpp
 OBJECTS       = main.o \
                groove.o \
                gscom.o \
                splayer.o \
                streamio.o \
+               playlist.o \
                moc_groove.o \
                moc_gscom.o \
                moc_splayer.o \
-               moc_streamio.o
+               moc_streamio.o \
+               moc_playlist.o
 DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
                /usr/share/qt4/mkspecs/common/unix.conf \
                /usr/share/qt4/mkspecs/common/linux.conf \
@@ -163,7 +167,7 @@ qmake:  FORCE
 
 dist: 
        @$(CHK_DIR_EXISTS) .tmp/groove1.0.0 || $(MKDIR) .tmp/groove1.0.0 
-       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/groove1.0.0/ && $(COPY_FILE) --parents groove.h gscom.h splayer.h streamio.h .tmp/groove1.0.0/ && $(COPY_FILE) --parents main.cpp groove.cpp gscom.cpp splayer.cpp streamio.cpp .tmp/groove1.0.0/ && (cd `dirname .tmp/groove1.0.0` && $(TAR) groove1.0.0.tar groove1.0.0 && $(COMPRESS) groove1.0.0.tar) && $(MOVE) `dirname .tmp/groove1.0.0`/groove1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/groove1.0.0
+       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/groove1.0.0/ && $(COPY_FILE) --parents groove.h gscom.h splayer.h streamio.h playlist.h .tmp/groove1.0.0/ && $(COPY_FILE) --parents main.cpp groove.cpp gscom.cpp splayer.cpp streamio.cpp playlist.cpp .tmp/groove1.0.0/ && (cd `dirname .tmp/groove1.0.0` && $(TAR) groove1.0.0.tar groove1.0.0 && $(COMPRESS) groove1.0.0.tar) && $(MOVE) `dirname .tmp/groove1.0.0`/groove1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/groove1.0.0
 
 
 clean:compiler_clean 
@@ -182,9 +186,9 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: moc_groove.cpp moc_gscom.cpp moc_splayer.cpp moc_streamio.cpp
+compiler_moc_header_make_all: moc_groove.cpp moc_gscom.cpp moc_splayer.cpp moc_streamio.cpp moc_playlist.cpp
 compiler_moc_header_clean:
-       -$(DEL_FILE) moc_groove.cpp moc_gscom.cpp moc_splayer.cpp moc_streamio.cpp
+       -$(DEL_FILE) moc_groove.cpp moc_gscom.cpp moc_splayer.cpp moc_streamio.cpp moc_playlist.cpp
 moc_groove.cpp: gscom.h \
                splayer.h \
                streamio.h \
@@ -204,6 +208,9 @@ moc_streamio.cpp: splayer.h \
                streamio.h
        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) streamio.h -o moc_streamio.cpp
 
+moc_playlist.cpp: playlist.h
+       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) playlist.h -o moc_playlist.cpp
+
 compiler_rcc_make_all:
 compiler_rcc_clean:
 compiler_image_collection_make_all: qmake_image_collection.cpp
@@ -246,6 +253,9 @@ streamio.o: streamio.cpp streamio.h \
                splayer.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o streamio.o streamio.cpp
 
+playlist.o: playlist.cpp playlist.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o playlist.o playlist.cpp
+
 moc_groove.o: moc_groove.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_groove.o moc_groove.cpp
 
@@ -258,6 +268,9 @@ moc_splayer.o: moc_splayer.cpp
 moc_streamio.o: moc_streamio.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_streamio.o moc_streamio.cpp
 
+moc_playlist.o: moc_playlist.cpp 
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_playlist.o moc_playlist.cpp
+
 ####### Install
 
 install_target: first FORCE

diff --git a/groove.cpp b/groove.cpp
index 02bda40..3bd7b6a 100644 (file)
--- a/groove.cpp
+++ b/groove.cpp
@@ -66,6 +66,7 @@ groove::groove(QWidget *parent) :
     connect(lineEdit,SIGNAL(returnPressed()),this, SLOT(search()));
     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()));
 }
 void groove::search()
@@ -136,3 +137,7 @@ void groove::startP()
     player->play(gs->streamID,gs->sku);
 
 }
+void groove::stop()
+{
+    player->stop();
+}

diff --git a/groove.h b/groove.h
index 2761070..177b9b6 100644 (file)
--- a/groove.h
+++ b/groove.h
@@ -19,6 +19,7 @@ public slots:
     void changeS( QAction * action);
     void play();
     void startP();
+    void stop();
 
 private:
     sPlayer *player;

diff --git a/playlist.h b/playlist.h
index d33386b..8b810ac 100644 (file)
--- a/playlist.h
+++ b/playlist.h
@@ -12,6 +12,7 @@ public:
     void addSong(QStandardItem item);
     QList<QStandardItem *> getPlaylist();
     void removeSong(int position);
+    void getSong(int position);
 
 
 signals:

diff --git a/splayer.cpp b/splayer.cpp
index 1c6e8ce..0509b3e 100644 (file)
--- a/splayer.cpp
+++ b/splayer.cpp
@@ -73,6 +73,11 @@ void sPlayer::start()
         media->play();
     }*/
 }
+void sPlayer::stop()
+{
+    media->stop();
+}
+
 void sPlayer::putb(qint64 b, qint64 t)
 {
     //qDebug() << "Download: " << b << "Total: " << t;