--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: upplay
-# Generated by qmake (2.01a) (Qt 4.8.2) on: Fri Nov 7 16:50:47 2014
+# Generated by qmake (2.01a) (Qt 4.8.2) on: Wed Nov 12 18:47:40 2014
# Project: upplay.pro
# Template: app
# Command: /usr/bin/qmake -o Makefile upplay.pro
@@ -12,7 +12,7 @@
CXX = g++
DEFINES = -DQT_WEBKIT -DPREFIX=\"/usr\" -DQT_WEBKIT_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
CFLAGS = -m64 -pipe -g -D_REENTRANT -Wall -W $(DEFINES)
-CXXFLAGS = -m64 -pipe -std=c++0x -DUPPLAY_VERSION=\"0.8.7\" -g -D_REENTRANT -Wall -W $(DEFINES)
+CXXFLAGS = -m64 -pipe -std=c++0x -DUPPLAY_VERSION=\"0.9.0\" -g -D_REENTRANT -Wall -W $(DEFINES)
INCPATH = -I../../../../usr-linksto/share/qt4/mkspecs/linux-g++-64 -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtWebKit -I/usr/include/qt4 -I.moc -I.ui
LINK = g++
LFLAGS = -m64
@@ -261,8 +261,8 @@
@$(QMAKE) -o Makefile upplay.pro
dist:
- @$(CHK_DIR_EXISTS) .obj/upplay0.8.7 || $(MKDIR) .obj/upplay0.8.7
- $(COPY_FILE) --parents $(SOURCES) $(DIST) .obj/upplay0.8.7/ && $(COPY_FILE) --parents GUI/ContextMenu.h GUI/player/GUI_Player.h GUI/player/GUI_TrayIcon.h GUI/player/DirectSlider.h GUI/playlist/GUI_Playlist.h GUI/playlist/delegate/PlaylistItemDelegate.h GUI/playlist/delegate/PlaylistItemDelegateInterface.h GUI/playlist/entry/GUI_PlaylistEntry.h GUI/playlist/entry/GUI_PlaylistEntryBig.h GUI/playlist/entry/GUI_PlaylistEntrySmall.h GUI/playlist/model/PlaylistItemModel.h GUI/playlist/view/PlaylistView.h GUI/renderchoose/renderchoose.h HelperStructs/CSettingsStorage.h HelperStructs/Helper.h HelperStructs/PlaylistMode.h HelperStructs/Style.h application.h dirbrowser/dirbrowser.h dirbrowser/cdbrowser.h dirbrowser/rreaper.h playlist/Playlist.h playlist/PlaylistAVT.h playlist/PlaylistOH.h upadapt/avtadapt.h upadapt/ohpladapt.h upqo/avtransport_qo.h upqo/cdirectory_qo.h upqo/ohplaylist_qo.h upqo/ohtime_qo.h upqo/renderingcontrol_qo.h .obj/upplay0.8.7/ && $(COPY_FILE) --parents GUI/upplay.qrc .obj/upplay0.8.7/ && $(COPY_FILE) --parents GUI/ContextMenu.cpp GUI/player/GUI_Player.cpp GUI/player/GUI_PlayerConnections.cpp GUI/player/GUI_PlayerControls.cpp GUI/player/GUI_PlayerCover.cpp GUI/player/GUI_PlayerMenubar.cpp GUI/player/GUI_TrayIcon.cpp GUI/player/DirectSlider.cpp GUI/playlist/GUI_Playlist.cpp GUI/playlist/delegate/PlaylistItemDelegate.cpp GUI/playlist/entry/GUI_PlaylistEntryBig.cpp GUI/playlist/entry/GUI_PlaylistEntrySmall.cpp GUI/playlist/model/PlaylistItemModel.cpp GUI/playlist/view/PlaylistView.cpp HelperStructs/CSettingsStorage.cpp HelperStructs/Helper.cpp HelperStructs/Style.cpp application.cpp dirbrowser/dirbrowser.cpp dirbrowser/cdbrowser.cpp playlist/Playlist.cpp playlist/PlaylistAVT.cpp playlist/PlaylistOH.cpp upadapt/upputils.cpp upplay.cpp .obj/upplay0.8.7/ && $(COPY_FILE) --parents dirbrowser/dirbrowser.ui GUI/player/GUI_Player.ui GUI/playlist/GUI_Playlist.ui GUI/playlist/entry/GUI_PlaylistEntryBig.ui GUI/playlist/entry/GUI_PlaylistEntrySmall.ui GUI/renderchoose/renderchoose.ui .obj/upplay0.8.7/ && (cd `dirname .obj/upplay0.8.7` && $(TAR) upplay0.8.7.tar upplay0.8.7 && $(COMPRESS) upplay0.8.7.tar) && $(MOVE) `dirname .obj/upplay0.8.7`/upplay0.8.7.tar.gz . && $(DEL_FILE) -r .obj/upplay0.8.7
+ @$(CHK_DIR_EXISTS) .obj/upplay0.9.0 || $(MKDIR) .obj/upplay0.9.0
+ $(COPY_FILE) --parents $(SOURCES) $(DIST) .obj/upplay0.9.0/ && $(COPY_FILE) --parents GUI/ContextMenu.h GUI/player/GUI_Player.h GUI/player/GUI_TrayIcon.h GUI/player/DirectSlider.h GUI/playlist/GUI_Playlist.h GUI/playlist/delegate/PlaylistItemDelegate.h GUI/playlist/delegate/PlaylistItemDelegateInterface.h GUI/playlist/entry/GUI_PlaylistEntry.h GUI/playlist/entry/GUI_PlaylistEntryBig.h GUI/playlist/entry/GUI_PlaylistEntrySmall.h GUI/playlist/model/PlaylistItemModel.h GUI/playlist/view/PlaylistView.h GUI/renderchoose/renderchoose.h HelperStructs/CSettingsStorage.h HelperStructs/Helper.h HelperStructs/PlaylistMode.h HelperStructs/Style.h application.h dirbrowser/dirbrowser.h dirbrowser/cdbrowser.h dirbrowser/rreaper.h playlist/Playlist.h playlist/PlaylistAVT.h playlist/PlaylistOH.h upadapt/avtadapt.h upadapt/ohpladapt.h upqo/avtransport_qo.h upqo/cdirectory_qo.h upqo/ohplaylist_qo.h upqo/ohtime_qo.h upqo/renderingcontrol_qo.h .obj/upplay0.9.0/ && $(COPY_FILE) --parents GUI/upplay.qrc .obj/upplay0.9.0/ && $(COPY_FILE) --parents GUI/ContextMenu.cpp GUI/player/GUI_Player.cpp GUI/player/GUI_PlayerConnections.cpp GUI/player/GUI_PlayerControls.cpp GUI/player/GUI_PlayerCover.cpp GUI/player/GUI_PlayerMenubar.cpp GUI/player/GUI_TrayIcon.cpp GUI/player/DirectSlider.cpp GUI/playlist/GUI_Playlist.cpp GUI/playlist/delegate/PlaylistItemDelegate.cpp GUI/playlist/entry/GUI_PlaylistEntryBig.cpp GUI/playlist/entry/GUI_PlaylistEntrySmall.cpp GUI/playlist/model/PlaylistItemModel.cpp GUI/playlist/view/PlaylistView.cpp HelperStructs/CSettingsStorage.cpp HelperStructs/Helper.cpp HelperStructs/Style.cpp application.cpp dirbrowser/dirbrowser.cpp dirbrowser/cdbrowser.cpp playlist/Playlist.cpp playlist/PlaylistAVT.cpp playlist/PlaylistOH.cpp upadapt/upputils.cpp upplay.cpp .obj/upplay0.9.0/ && $(COPY_FILE) --parents dirbrowser/dirbrowser.ui GUI/player/GUI_Player.ui GUI/playlist/GUI_Playlist.ui GUI/playlist/entry/GUI_PlaylistEntryBig.ui GUI/playlist/entry/GUI_PlaylistEntrySmall.ui GUI/renderchoose/renderchoose.ui .obj/upplay0.9.0/ && (cd `dirname .obj/upplay0.9.0` && $(TAR) upplay0.9.0.tar upplay0.9.0 && $(COMPRESS) upplay0.9.0.tar) && $(MOVE) `dirname .obj/upplay0.9.0`/upplay0.9.0.tar.gz . && $(DEL_FILE) -r .obj/upplay0.9.0
clean:compiler_clean
@@ -290,7 +290,6 @@
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) GUI/ContextMenu.h -o .moc/moc_ContextMenu.cpp
.moc/moc_GUI_Player.cpp: .ui/ui_GUI_Player.h \
- GUI/player/DirectSlider.h \
GUI/player/GUI_TrayIcon.h \
HelperStructs/CSettingsStorage.h \
HelperStructs/PlaylistMode.h \
@@ -311,13 +310,10 @@
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) GUI/player/DirectSlider.h -o .moc/moc_DirectSlider.cpp
.moc/moc_GUI_Playlist.cpp: .ui/ui_GUI_Playlist.h \
- GUI/playlist/view/PlaylistView.h \
- HelperStructs/MetaData.h \
- HelperStructs/globals.h \
- GUI/playlist/model/PlaylistItemModel.h \
GUI/playlist/delegate/PlaylistItemDelegate.h \
GUI/playlist/entry/GUI_PlaylistEntry.h \
- GUI/ContextMenu.h \
+ HelperStructs/MetaData.h \
+ HelperStructs/globals.h \
playlist/Playlist.h \
HelperStructs/PlaylistMode.h \
HelperStructs/CSettingsStorage.h \
@@ -367,39 +363,38 @@
.moc/moc_application.cpp: dirbrowser/dirbrowser.h \
.ui/ui_dirbrowser.h \
+ playlist/Playlist.h \
+ HelperStructs/MetaData.h \
+ HelperStructs/globals.h \
+ HelperStructs/PlaylistMode.h \
+ HelperStructs/CSettingsStorage.h \
dirbrowser/cdbrowser.h \
- HelperStructs/MetaData.h \
- HelperStructs/globals.h \
upqo/renderingcontrol_qo.h \
upqo/ohtime_qo.h \
upadapt/avtadapt.h \
upqo/avtransport_qo.h \
upadapt/upputils.h \
upadapt/ohpladapt.h \
- HelperStructs/PlaylistMode.h \
upqo/ohplaylist_qo.h \
GUI/player/GUI_Player.h \
.ui/ui_GUI_Player.h \
- GUI/player/DirectSlider.h \
GUI/player/GUI_TrayIcon.h \
- HelperStructs/CSettingsStorage.h \
HelperStructs/Helper.h \
GUI/playlist/GUI_Playlist.h \
.ui/ui_GUI_Playlist.h \
- GUI/playlist/view/PlaylistView.h \
- GUI/playlist/model/PlaylistItemModel.h \
GUI/playlist/delegate/PlaylistItemDelegate.h \
GUI/playlist/entry/GUI_PlaylistEntry.h \
- GUI/ContextMenu.h \
- playlist/Playlist.h \
HelperStructs/Style.h \
application.h
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) application.h -o .moc/moc_application.cpp
.moc/moc_dirbrowser.cpp: .ui/ui_dirbrowser.h \
+ playlist/Playlist.h \
+ HelperStructs/MetaData.h \
+ HelperStructs/globals.h \
+ HelperStructs/PlaylistMode.h \
+ HelperStructs/CSettingsStorage.h \
dirbrowser/cdbrowser.h \
- HelperStructs/MetaData.h \
- HelperStructs/globals.h \
dirbrowser/dirbrowser.h
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) dirbrowser/dirbrowser.h -o .moc/moc_dirbrowser.cpp
@@ -469,35 +464,52 @@
-$(DEL_FILE) qrc_upplay.cpp
qrc_upplay.cpp: GUI/upplay.qrc \
GUI/icons/close.png \
- GUI/icons/addtab.png \
- GUI/icons/info_small.png \
- GUI/icons/pause.png \
+ GUI/icons/rb_checked.png \
+ GUI/icons/shuffle.png \
+ GUI/icons/vol_3.png \
+ GUI/icons/vol_mute_dark.png \
+ GUI/icons/cb_checked_disabled.png \
+ GUI/icons/id3.png \
+ GUI/icons/vol_2_dark.png \
+ GUI/icons/arrow_right_orange.png \
+ GUI/icons/arrow_right.png \
+ GUI/icons/scroll_hor_bg.png \
+ GUI/icons/fwd.png \
+ GUI/icons/arrow_left.png \
+ GUI/icons/repAll.png \
+ GUI/icons/cross.png \
+ GUI/icons/scroll_ver_bg.png \
+ GUI/icons/slider_ver_bg.png \
+ GUI/icons/bwd.png \
+ GUI/icons/logo.png \
+ GUI/icons/stop.png \
+ GUI/icons/slider_hor_bg.png \
+ GUI/icons/arrow_down_orange.png \
+ GUI/icons/vol_3_dark.png \
GUI/icons/broom.png \
- GUI/icons/stop.png \
- GUI/icons/logo.png \
- GUI/icons/vol_2.png \
- GUI/icons/shuffle.png \
- GUI/icons/delete.png \
- GUI/icons/dynamic.png \
- GUI/icons/bwd.png \
- GUI/icons/id3.png \
- GUI/icons/vol_3_dark.png \
- GUI/icons/fwd.png \
- GUI/icons/vol_3.png \
- GUI/icons/edit.png \
+ GUI/icons/vol_mute.png \
GUI/icons/import.png \
- GUI/icons/append.png \
GUI/icons/numbers.png \
GUI/icons/rep1.png \
+ GUI/icons/append.png \
+ GUI/icons/cb_checked.png \
+ GUI/icons/addtab.png \
+ GUI/icons/dynamic.png \
+ GUI/icons/arrow_up_orange.png \
+ GUI/icons/delete.png \
+ GUI/icons/rec.png \
+ GUI/icons/edit.png \
+ GUI/icons/vol_1.png \
+ GUI/icons/info_small.png \
+ GUI/icons/rb_checked_disabled.png \
+ GUI/icons/vol_1_dark.png \
+ GUI/icons/play.png \
+ GUI/icons/arrow_left_orange.png \
+ GUI/icons/pause.png \
+ GUI/icons/arrow_up.png \
+ GUI/icons/arrow_down.png \
GUI/icons/fwd_orange.png \
- GUI/icons/vol_mute_dark.png \
- GUI/icons/play.png \
- GUI/icons/rec.png \
- GUI/icons/repAll.png \
- GUI/icons/vol_1_dark.png \
- GUI/icons/vol_1.png \
- GUI/icons/vol_mute.png \
- GUI/icons/vol_2_dark.png
+ GUI/icons/vol_2.png
/usr/bin/rcc -name upplay GUI/upplay.qrc -o qrc_upplay.cpp
compiler_image_collection_make_all: .ui/qmake_image_collection.cpp
@@ -554,7 +566,6 @@
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/ContextMenu.o GUI/ContextMenu.cpp
.obj/GUI_Player.o: GUI/player/GUI_Player.cpp .ui/ui_GUI_Player.h \
- GUI/player/DirectSlider.h \
GUI/player/GUI_Player.h \
GUI/player/GUI_TrayIcon.h \
HelperStructs/CSettingsStorage.h \
@@ -564,18 +575,14 @@
HelperStructs/Helper.h \
GUI/playlist/GUI_Playlist.h \
.ui/ui_GUI_Playlist.h \
- GUI/playlist/view/PlaylistView.h \
- GUI/playlist/model/PlaylistItemModel.h \
GUI/playlist/delegate/PlaylistItemDelegate.h \
GUI/playlist/entry/GUI_PlaylistEntry.h \
- GUI/ContextMenu.h \
playlist/Playlist.h \
HelperStructs/Style.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/GUI_Player.o GUI/player/GUI_Player.cpp
.obj/GUI_PlayerConnections.o: GUI/player/GUI_PlayerConnections.cpp GUI/player/GUI_Player.h \
.ui/ui_GUI_Player.h \
- GUI/player/DirectSlider.h \
GUI/player/GUI_TrayIcon.h \
HelperStructs/CSettingsStorage.h \
HelperStructs/PlaylistMode.h \
@@ -586,7 +593,6 @@
.obj/GUI_PlayerControls.o: GUI/player/GUI_PlayerControls.cpp GUI/player/GUI_Player.h \
.ui/ui_GUI_Player.h \
- GUI/player/DirectSlider.h \
GUI/player/GUI_TrayIcon.h \
HelperStructs/CSettingsStorage.h \
HelperStructs/PlaylistMode.h \
@@ -597,7 +603,6 @@
.obj/GUI_PlayerCover.o: GUI/player/GUI_PlayerCover.cpp GUI/player/GUI_Player.h \
.ui/ui_GUI_Player.h \
- GUI/player/DirectSlider.h \
GUI/player/GUI_TrayIcon.h \
HelperStructs/CSettingsStorage.h \
HelperStructs/PlaylistMode.h \
@@ -608,7 +613,6 @@
.obj/GUI_PlayerMenubar.o: GUI/player/GUI_PlayerMenubar.cpp GUI/player/GUI_Player.h \
.ui/ui_GUI_Player.h \
- GUI/player/DirectSlider.h \
GUI/player/GUI_TrayIcon.h \
HelperStructs/CSettingsStorage.h \
HelperStructs/PlaylistMode.h \
@@ -636,12 +640,10 @@
HelperStructs/Style.h \
GUI/playlist/GUI_Playlist.h \
.ui/ui_GUI_Playlist.h \
- GUI/playlist/view/PlaylistView.h \
- GUI/playlist/model/PlaylistItemModel.h \
GUI/playlist/delegate/PlaylistItemDelegate.h \
GUI/playlist/entry/GUI_PlaylistEntry.h \
- GUI/ContextMenu.h \
- playlist/Playlist.h
+ playlist/Playlist.h \
+ GUI/playlist/model/PlaylistItemModel.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/GUI_Playlist.o GUI/playlist/GUI_Playlist.cpp
.obj/PlaylistItemDelegate.o: GUI/playlist/delegate/PlaylistItemDelegate.cpp GUI/playlist/delegate/PlaylistItemDelegate.h \
@@ -713,31 +715,27 @@
.obj/application.o: application.cpp application.h \
dirbrowser/dirbrowser.h \
.ui/ui_dirbrowser.h \
+ playlist/Playlist.h \
+ HelperStructs/MetaData.h \
+ HelperStructs/globals.h \
+ HelperStructs/PlaylistMode.h \
+ HelperStructs/CSettingsStorage.h \
dirbrowser/cdbrowser.h \
- HelperStructs/MetaData.h \
- HelperStructs/globals.h \
upqo/renderingcontrol_qo.h \
upqo/ohtime_qo.h \
upadapt/avtadapt.h \
upqo/avtransport_qo.h \
upadapt/upputils.h \
upadapt/ohpladapt.h \
- HelperStructs/PlaylistMode.h \
upqo/ohplaylist_qo.h \
GUI/player/GUI_Player.h \
.ui/ui_GUI_Player.h \
- GUI/player/DirectSlider.h \
GUI/player/GUI_TrayIcon.h \
- HelperStructs/CSettingsStorage.h \
HelperStructs/Helper.h \
GUI/playlist/GUI_Playlist.h \
.ui/ui_GUI_Playlist.h \
- GUI/playlist/view/PlaylistView.h \
- GUI/playlist/model/PlaylistItemModel.h \
GUI/playlist/delegate/PlaylistItemDelegate.h \
GUI/playlist/entry/GUI_PlaylistEntry.h \
- GUI/ContextMenu.h \
- playlist/Playlist.h \
HelperStructs/Style.h \
GUI/renderchoose/renderchoose.h \
.ui/ui_renderchoose.h \
@@ -747,10 +745,14 @@
.obj/dirbrowser.o: dirbrowser/dirbrowser.cpp dirbrowser/dirbrowser.h \
.ui/ui_dirbrowser.h \
+ playlist/Playlist.h \
+ HelperStructs/MetaData.h \
+ HelperStructs/globals.h \
+ HelperStructs/PlaylistMode.h \
+ HelperStructs/CSettingsStorage.h \
dirbrowser/cdbrowser.h \
- HelperStructs/MetaData.h \
- HelperStructs/globals.h \
- HelperStructs/Helper.h
+ HelperStructs/Helper.h \
+ upadapt/upputils.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/dirbrowser.o dirbrowser/dirbrowser.cpp
.obj/cdbrowser.o: dirbrowser/cdbrowser.cpp HelperStructs/Helper.h \
@@ -762,14 +764,19 @@
upadapt/upputils.h \
upadapt/md5.hxx \
dirbrowser/cdbrowser.h \
+ dirbrowser/dirbrowser.h \
+ .ui/ui_dirbrowser.h \
+ playlist/Playlist.h \
dirbrowser/rreaper.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/cdbrowser.o dirbrowser/cdbrowser.cpp
-.obj/Playlist.o: playlist/Playlist.cpp playlist/Playlist.h \
- HelperStructs/MetaData.h \
- HelperStructs/globals.h \
- HelperStructs/PlaylistMode.h \
- HelperStructs/CSettingsStorage.h
+.obj/Playlist.o: playlist/Playlist.cpp upadapt/upputils.h \
+ playlist/Playlist.h \
+ HelperStructs/MetaData.h \
+ HelperStructs/globals.h \
+ HelperStructs/PlaylistMode.h \
+ HelperStructs/CSettingsStorage.h \
+ HelperStructs/Helper.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/Playlist.o playlist/Playlist.cpp
.obj/PlaylistAVT.o: playlist/PlaylistAVT.cpp playlist/PlaylistAVT.h \
@@ -778,7 +785,8 @@
HelperStructs/PlaylistMode.h \
HelperStructs/CSettingsStorage.h \
playlist/Playlist.h \
- HelperStructs/Helper.h
+ HelperStructs/Helper.h \
+ upadapt/upputils.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/PlaylistAVT.o playlist/PlaylistAVT.cpp
.obj/PlaylistOH.o: playlist/PlaylistOH.cpp playlist/PlaylistOH.h \
@@ -797,31 +805,27 @@
.obj/upplay.o: upplay.cpp application.h \
dirbrowser/dirbrowser.h \
.ui/ui_dirbrowser.h \
+ playlist/Playlist.h \
+ HelperStructs/MetaData.h \
+ HelperStructs/globals.h \
+ HelperStructs/PlaylistMode.h \
+ HelperStructs/CSettingsStorage.h \
dirbrowser/cdbrowser.h \
- HelperStructs/MetaData.h \
- HelperStructs/globals.h \
upqo/renderingcontrol_qo.h \
upqo/ohtime_qo.h \
upadapt/avtadapt.h \
upqo/avtransport_qo.h \
upadapt/upputils.h \
upadapt/ohpladapt.h \
- HelperStructs/PlaylistMode.h \
upqo/ohplaylist_qo.h \
GUI/player/GUI_Player.h \
.ui/ui_GUI_Player.h \
- GUI/player/DirectSlider.h \
GUI/player/GUI_TrayIcon.h \
- HelperStructs/CSettingsStorage.h \
HelperStructs/Helper.h \
GUI/playlist/GUI_Playlist.h \
.ui/ui_GUI_Playlist.h \
- GUI/playlist/view/PlaylistView.h \
- GUI/playlist/model/PlaylistItemModel.h \
GUI/playlist/delegate/PlaylistItemDelegate.h \
GUI/playlist/entry/GUI_PlaylistEntry.h \
- GUI/ContextMenu.h \
- playlist/Playlist.h \
HelperStructs/Style.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/upplay.o upplay.cpp