Enable sound library in qmake Android build system

nootka.pro

@@ -7,7 +7,7 @@ TEMPLATE = subdirs
 
 SUBDIRS = src/libs/core\
 #           src/libs/mobile\
-#           src/libs/sound\
+          src/libs/sound\
 #           src/libs/misc\
 #           src/libs/main\
           src\
@@ -22,10 +22,10 @@ SUBDIRS = src/libs/core\
 CONFIG += ordered
 
 # src/libs/mobile.depends = src/libs/core
-src/libs/sound.depends = src/libs/score
 # src/libs/misc.depends = src/libs/widgets
 # src/libs/main.depends = src/libs/widgets
 src.depends = src/libs/core
+sound.depends = src/libs/core
 # src/plugins/about.depends = src/libs/misc
 # src/plugins/level.depends = src/libs/widgets src/libs/sound
 # src/plugins/settings.depends = src/libs/misc

src/lang

+../lang
\ No newline at end of file

src/libs/core/core.pro

@@ -13,7 +13,6 @@ SOURCES +=  tcolor.cpp\
             tpath.cpp\
 #             tmtr.cpp\
             tnootkaqml.cpp\
-            ttickcolors.cpp\
             taction.cpp\
           \
 #             exam/tattempt.cpp\
@@ -46,8 +45,11 @@ SOURCES +=  tcolor.cpp\
             score/tstafflines.cpp\
             score/taddobject.cpp\
           \
+            instruments/tcommoninstrument.cpp\
             instruments/tguitarbg.cpp\
             instruments/tpianobg.cpp\
+            instruments/tbandoneonbg.cpp\
+            instruments/tsaxbg.cpp\
           \
             Android/tandroid.cpp\
 
@@ -64,7 +66,6 @@ HEADERS  += nootkaconfig.h\
             tscoreparams.h\
 #             tmtr.h\
             tnootkaqml.h\
-            ttickcolors.h\
             taction.h\
           \
 #             exam/tattempt.h\
@@ -99,8 +100,11 @@ HEADERS  += nootkaconfig.h\
             score/tstafflines.h\
             score/taddobject.h\
           \
+            instruments/tcommoninstrument.h\
             instruments/tguitarbg.h\
             instruments/tpianobg.h\
+            instruments/tbandoneonbg.h\
+            instruments/tsaxbg.h\
           \
             Android/tandroid.h\
 

src/libs/core/core.qrc

@@ -60,6 +60,7 @@
         <file>picts/save.png</file>
         <file>picts/tipbg.png</file>
         <file>picts/delete.png</file>
+        <file>picts/saxAlto.png</file>
 <!-- settings -->
         <file>picts/global.png</file>
         <file>picts/scoreSett.png</file>

src/libs/sound/sound.pro

 
-QT += core multimedia gui widgets androidextras
+QT += core multimedia gui widgets androidextras quick quickcontrols2
 
 
 TARGET = NootkaSound
@@ -12,6 +12,7 @@ SOURCES +=  tabstractplayer.cpp\
             tqtaudioout.cpp\
             toggscale.cpp\
             tsound.cpp\
+            ttickcolors.cpp\
             \
             tartini/analysisdata.cpp\
             tartini/bspline.cpp\
@@ -26,14 +27,6 @@ SOURCES +=  tabstractplayer.cpp\
             tartini/filters/GrowingAveragingFilter.cpp\
             tartini/filters/IIR_Filter.cpp\
             \
-            widgets/tabstractsoundview.cpp\
-            widgets/tintonationview.cpp\
-            widgets/tpitchview.cpp\
-            widgets/tvolumeview.cpp\
-            widgets/tmelodyitem.cpp\
-#            widgets/tpcmview.cpp\
-            widgets/tquickaudiodialog.cpp\
-            \
             stouch/SoundTouch.cpp\
             stouch/TDStretch.cpp\
             stouch/RateTransposer.cpp\
@@ -56,6 +49,7 @@ HEADERS  += tartiniparams.h\
             toggscale.h\
             tsound.h\
             taudiobuffer.h\
+            ttickcolors.h\
             \
             tartini/array1d.h\
             tartini/large_vector.h\
@@ -74,14 +68,6 @@ HEADERS  += tartiniparams.h\
             tartini/filters/GrowingAveragingFilter.h\
             tartini/filters/IIR_Filter.h\
             \
-            widgets/tabstractsoundview.h\
-            widgets/tintonationview.h\
-            widgets/tpitchview.h\
-            widgets/tvolumeview.h\
-            widgets/tmelodyitem.h\
-#            widgets/tpcmview.h\
-            widgets/tquickaudiodialog.h\
-            \
             stouch\STTypes.h\
             stouch/SoundTouch.h\
             stouch/TDStretch.h\
@@ -120,14 +106,18 @@ android {
   INCLUDEPATH += fftw ogg vorbis
 }
 
-LIBS += -L../core/ -lNootkaCore -L../mobile/ -lNootkaMobile -L../score/ -lNootkaScore
+LIBS += -L../core/ -lNootkaCore  #-L../mobile/ -lNootkaMobile
 
-INCLUDEPATH += ../core ../mobile ../score
+INCLUDEPATH += ../core #../mobile
 
 sounds.path = /assets/sounds
+sounds.files += sounds/alto-sax.ogg
+sounds.files += sounds/bandoneon.ogg
+sounds.files += sounds/bass-guitar.ogg
 sounds.files += sounds/classical-guitar.ogg
 sounds.files += sounds/electric-guitar.ogg
-sounds.files += sounds/bass-guitar.ogg
+sounds.files += sounds/piano.ogg
+sounds.files += sounds/tenor-sax.ogg
 sounds.depends += FORCE
 
 INSTALLS += sounds

src/src.pro

@@ -6,8 +6,9 @@ TARGET = Nootka2
 TEMPLATE = app
 
 SOURCES += main.cpp \
+           main/tnameitem.cpp \
 
-# HEADERS  += 
+HEADERS  += main/tnameitem.h \
 
 
 CONFIG += mobility warn_off
@@ -18,17 +19,16 @@ android {
   QMAKE_CXXFLAGS_DEBUG += -fsigned-char -O1
   ANDROID_EXTRA_LIBS += $$OUT_PWD/libs/core/libNootkaCore.so\
 #                         $$OUT_PWD/libs/mobile/libNootkaMobile.so\
-#                         $$OUT_PWD/libs/sound/libNootkaSound.so\
+                        $$OUT_PWD/libs/sound/libNootkaSound.so\
 #                         $$OUT_PWD/libs/misc/libNootkaMisc.so\
 #                         $$OUT_PWD/libs/main/libNootkaMain.so\
 }
 
-INCLUDEPATH += libs/core
-#libs/mobile libs/sound libs/main
+INCLUDEPATH += libs/core libs/mobile libs/sound libs/main
 
 LIBS += -Llibs/core/ -lNootkaCore \
 #         -Llibs/mobile/ -lNootkaMobile \
-#         -Llibs/sound -lNootkaSound \
+        -Llibs/sound -lNootkaSound \
 #         -Llibs/main -lNootkaMain
 
 RESOURCES += nootka.qrc
@@ -47,3 +47,25 @@ DISTFILES += \
 
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 
+# append Qt base translations from current Qt installation
+TR_DIR = "$$system(dirname $$QMAKESPEC)/../translations"
+
+lang.path = /assets/lang
+lang.files += lang/nootka_pl.qm
+lang.files += lang/nootka_cs.qm
+lang.files += lang/nootka_de.qm
+lang.files += lang/nootka_fr.qm
+lang.files += lang/nootka_ru.qm
+lang.files += lang/nootka_es.qm
+lang.files += $$system(ls $$TR_DIR/qtbase_cs.qm)
+lang.files += $$system(ls $$TR_DIR/qtbase_de.qm)
+lang.files += $$system(ls $$TR_DIR/qtbase_es.qm)
+lang.files += $$system(ls $$TR_DIR/qtbase_fr.qm)
+lang.files += $$system(ls $$TR_DIR/qtbase_pl.qm)
+lang.files += $$system(ls $$TR_DIR/qtbase_ru.qm)
+
+lang.depends += FORCE
+
+INSTALLS += lang
+
+