Fix some buid issues on maemo, Also add some simple usability fixes

[groove] / Makefile

diff --git a/Makefile b/Makefile
index ad55042..75253f8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: groove
-# Generated by qmake (2.01a) (Qt 4.7.0) on: Sun Dec 5 22:41:24 2010
+# Generated by qmake (2.01a) (Qt 4.7.0) on: Wed Jan 5 17:21:15 2011
 # Project:  Groove.pro
 # Template: app
 # Command: /usr/bin/qmake -o Makefile Groove.pro
@@ -16,7 +16,7 @@ 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/phonon -I/usr/include/qt4 -I. -I/usr/include/qjson -I/usr/include -I/usr/include/qt4/phonon_compat -I. -I.
 LINK          = g++
 LFLAGS        = -Wl,-O1
-LIBS          = $(SUBLIBS)  -L/usr/lib -L/usr/local/lib -lqjson -lmpg123 -lpulse-simple -lphonon -lQtGui -lQtNetwork -lQtCore -lpthread 
+LIBS          = $(SUBLIBS)  -L/usr/lib -L/usr/local/lib -lqjson -lpulse-simple -lphonon -lQtGui -lQtNetwork -lQtCore -lpthread 
 AR            = ar cqs
 RANLIB        = 
 QMAKE         = /usr/bin/qmake
@@ -55,7 +55,7 @@ SOURCES       = main.cpp \
                bottombar.cpp \
                vkb.cpp \
                searchresults.cpp \
-               mpgplayer.cpp moc_groove.cpp \
+               plistwin.cpp moc_groove.cpp \
                moc_gscom.cpp \
                moc_splayer.cpp \
                moc_streamio.cpp \
@@ -66,7 +66,7 @@ SOURCES       = main.cpp \
                moc_bottombar.cpp \
                moc_vkb.cpp \
                moc_searchresults.cpp \
-               moc_mpgplayer.cpp \
+               moc_plistwin.cpp \
                qrc_res.cpp
 OBJECTS       = main.o \
                groove.o \
@@ -80,7 +80,7 @@ OBJECTS       = main.o \
                bottombar.o \
                vkb.o \
                searchresults.o \
-               mpgplayer.o \
+               plistwin.o \
                moc_groove.o \
                moc_gscom.o \
                moc_splayer.o \
@@ -92,7 +92,7 @@ OBJECTS       = main.o \
                moc_bottombar.o \
                moc_vkb.o \
                moc_searchresults.o \
-               moc_mpgplayer.o \
+               moc_plistwin.o \
                qrc_res.o
 DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
                /usr/share/qt4/mkspecs/common/unix.conf \
@@ -198,7 +198,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 playlist.h downloadmanager.h grooveprogressbar.h topbar.h bottombar.h vkb.h searchresults.h mpgplayer.h .tmp/groove1.0.0/ && $(COPY_FILE) --parents res.qrc .tmp/groove1.0.0/ && $(COPY_FILE) --parents main.cpp groove.cpp gscom.cpp splayer.cpp streamio.cpp playlist.cpp downloadmanager.cpp grooveprogressbar.cpp topbar.cpp bottombar.cpp vkb.cpp searchresults.cpp mpgplayer.cpp .tmp/groove1.0.0/ && $(COPY_FILE) --parents topbar.ui bottombar.ui vkb.ui searchresults.ui .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 downloadmanager.h grooveprogressbar.h topbar.h bottombar.h vkb.h searchresults.h plistwin.h .tmp/groove1.0.0/ && $(COPY_FILE) --parents res.qrc .tmp/groove1.0.0/ && $(COPY_FILE) --parents main.cpp groove.cpp gscom.cpp splayer.cpp streamio.cpp playlist.cpp downloadmanager.cpp grooveprogressbar.cpp topbar.cpp bottombar.cpp vkb.cpp searchresults.cpp plistwin.cpp .tmp/groove1.0.0/ && $(COPY_FILE) --parents topbar.ui bottombar.ui vkb.ui searchresults.ui .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 
@@ -219,9 +219,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 moc_playlist.cpp moc_downloadmanager.cpp moc_grooveprogressbar.cpp moc_topbar.cpp moc_bottombar.cpp moc_vkb.cpp moc_searchresults.cpp moc_mpgplayer.cpp
+compiler_moc_header_make_all: moc_groove.cpp moc_gscom.cpp moc_splayer.cpp moc_streamio.cpp moc_playlist.cpp moc_downloadmanager.cpp moc_grooveprogressbar.cpp moc_topbar.cpp moc_bottombar.cpp moc_vkb.cpp moc_searchresults.cpp moc_plistwin.cpp
 compiler_moc_header_clean:
-       -$(DEL_FILE) moc_groove.cpp moc_gscom.cpp moc_splayer.cpp moc_streamio.cpp moc_playlist.cpp moc_downloadmanager.cpp moc_grooveprogressbar.cpp moc_topbar.cpp moc_bottombar.cpp moc_vkb.cpp moc_searchresults.cpp moc_mpgplayer.cpp
+       -$(DEL_FILE) moc_groove.cpp moc_gscom.cpp moc_splayer.cpp moc_streamio.cpp moc_playlist.cpp moc_downloadmanager.cpp moc_grooveprogressbar.cpp moc_topbar.cpp moc_bottombar.cpp moc_vkb.cpp moc_searchresults.cpp moc_plistwin.cpp
 moc_groove.cpp: gscom.h \
                splayer.h \
                streamio.h \
@@ -231,6 +231,7 @@ moc_groove.cpp: gscom.h \
                topbar.h \
                vkb.h \
                bottombar.h \
+               plistwin.h \
                groove.h
        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) groove.h -o moc_groove.cpp
 
@@ -279,14 +280,10 @@ moc_vkb.cpp: vkb.h
 moc_searchresults.cpp: searchresults.h
        /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) searchresults.h -o moc_searchresults.cpp
 
-moc_mpgplayer.cpp: streamio.h \
-               splayer.h \
-               grooveprogressbar.h \
-               qmaemo5rotator.h \
-               playlist.h \
+moc_plistwin.cpp: playlist.h \
                gscom.h \
-               mpgplayer.h
-       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) mpgplayer.h -o moc_mpgplayer.cpp
+               plistwin.h
+       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) plistwin.h -o moc_plistwin.cpp
 
 compiler_rcc_make_all: qrc_res.cpp
 compiler_rcc_clean:
@@ -348,7 +345,8 @@ main.o: main.cpp groove.h \
                playlist.h \
                topbar.h \
                vkb.h \
-               bottombar.h
+               bottombar.h \
+               plistwin.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
 
 groove.o: groove.cpp groove.h \
@@ -361,15 +359,14 @@ groove.o: groove.cpp groove.h \
                topbar.h \
                vkb.h \
                bottombar.h \
-               mpgplayer.h
+               plistwin.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o groove.o groove.cpp
 
 gscom.o: gscom.cpp gscom.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o gscom.o gscom.cpp
 
-splayer.o: splayer.cpp mpgplayer.h \
+splayer.o: splayer.cpp splayer.h \
                streamio.h \
-               splayer.h \
                grooveprogressbar.h \
                qmaemo5rotator.h \
                playlist.h \
@@ -412,14 +409,10 @@ searchresults.o: searchresults.cpp searchresults.h \
                ui_searchresults.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o searchresults.o searchresults.cpp
 
-mpgplayer.o: mpgplayer.cpp mpgplayer.h \
-               streamio.h \
-               splayer.h \
-               grooveprogressbar.h \
-               qmaemo5rotator.h \
+plistwin.o: plistwin.cpp plistwin.h \
                playlist.h \
                gscom.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mpgplayer.o mpgplayer.cpp
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o plistwin.o plistwin.cpp
 
 moc_groove.o: moc_groove.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_groove.o moc_groove.cpp
@@ -454,8 +447,8 @@ moc_vkb.o: moc_vkb.cpp
 moc_searchresults.o: moc_searchresults.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_searchresults.o moc_searchresults.cpp
 
-moc_mpgplayer.o: moc_mpgplayer.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mpgplayer.o moc_mpgplayer.cpp
+moc_plistwin.o: moc_plistwin.cpp 
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_plistwin.o moc_plistwin.cpp
 
 qrc_res.o: qrc_res.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_res.o qrc_res.cpp