Merge branch 'main' of file:///home/somebody/projects/someplayer into main

[someplayer] / someplayer.pro

diff --git a/someplayer.pro b/someplayer.pro
index d6ad5bc..ef76e94 100644 (file)
--- a/someplayer.pro
+++ b/someplayer.pro
@@ -12,20 +12,21 @@ TEMPLATE = app
 
 SOURCES += src/main.cpp\
         src/mainwindow.cpp \
-        src/player.cpp \
+               src/player/player.cpp \
         src/track.cpp \
     src/trackmetainformation.cpp \
     src/playlist.cpp \
     src/library.cpp \
-    src/storage.cpp \
     src/filestorage.cpp \
     src/dbstorage.cpp \
     src/mediascanner.cpp \
-    src/tagresolver.cpp
+    src/tagresolver.cpp \
+    src/playerform.cpp \
+    src/libraryform.cpp
 
 HEADERS  += src/mainwindow.h \
-        src/player.h \
-        src/track.h \
+               src/player/player.h \
+               src/track.h \
     src/trackmetainformation.h \
     src/playlist.h \
     src/someplayer.h \
@@ -34,9 +35,13 @@ HEADERS  += src/mainwindow.h \
     src/filestorage.h \
     src/dbstorage.h \
     src/mediascanner.h \
-    src/tagresolver.h
+    src/tagresolver.h \
+    src/playerform.h \
+    src/libraryform.h
 
-FORMS    += src/ui/mainwindow.ui
+FORMS    += src/ui/mainwindow.ui \
+    src/ui/playerform.ui \
+    src/ui/libraryform.ui
 
 CONFIG += mobility
 MOBILITY =