Commit f6805e00 authored by SeeLook's avatar SeeLook 🎸
Browse files

Disable new feature under Android

- and do not activate it by default on desktop
parent 1a667253
......@@ -689,6 +689,7 @@ void Tglobals::loadSettings(QSettings* cfg) {
#else
A->minimalVol = cfg->value(QStringLiteral("minimalVolume"), 0.4).toReal();
A->dumpPath = cfg->value(QLatin1String("dumpPath"), QString()).toString();
m_showNotesDiff = cfg->value(QStringLiteral("showNotesDiff"), false).toBool();
#endif
A->minDuration = cfg->value(QStringLiteral("minimalDuration"), 0.15).toReal(); // 150 ms
setMidAfreq(cfg->value(QStringLiteral("midAfreq"), 440).toInt());
......@@ -700,7 +701,6 @@ void Tglobals::loadSettings(QSettings* cfg) {
A->audibleMetro = cfg->value(QStringLiteral("audibleMetro"), false).toBool();
A->countBefore = cfg->value(QStringLiteral("countBefore"), false).toBool();
A->quantization = cfg->value(QStringLiteral("quantization"), 6).toInt();
m_showNotesDiff = cfg->value(QStringLiteral("showNotesDiff"), true).toBool();
cfg->endGroup();
#if defined (Q_OS_ANDROID)
......@@ -892,8 +892,8 @@ void Tglobals::storeSettings(QSettings* cfg) {
cfg->setValue(QStringLiteral("audibleMetro"), A->audibleMetro);
cfg->setValue(QStringLiteral("countBefore"), A->countBefore);
cfg->setValue(QStringLiteral("quantization"), A->quantization);
cfg->setValue(QStringLiteral("showNotesDiff"), m_showNotesDiff);
#if !defined (Q_OS_ANDROID)
cfg->setValue(QStringLiteral("showNotesDiff"), m_showNotesDiff);
cfg->setValue(QLatin1String("dumpPath"), A->dumpPath);
#endif
cfg->endGroup();
......
......@@ -26,11 +26,11 @@
// #include "tmidiout.h"
#include "trtaudioout.h"
#include "trtaudioin.h"
#include "tnotesbaritem.h"
#include <QtCore/qfileinfo.h>
#endif
#include <tnootkaqml.h>
#include "ttickcolors.h"
#include "tnotesbaritem.h"
#include <tglobals.h>
#include <taudioparams.h>
#include <music/tmelody.h>
......@@ -69,7 +69,9 @@ Tsound::Tsound(QObject* parent) :
qRegisterMetaType<Tchunk>("Tchunk");
qRegisterMetaType<TnoteStruct>("TnoteStruct");
qmlRegisterType<TtickColors>("Nootka", 1, 0, "TtickColors");
#if !defined (Q_OS_ANDROID)
qmlRegisterType<TnotesBarItem>("Nootka", 1, 0, "TnotesBarItem");
#endif
setQuantization(GLOB->A->quantization);
}
......@@ -104,7 +106,9 @@ void Tsound::init() {
if (sniffer)
sniffer->startListening();
emit initialized();
#if !defined (Q_OS_ANDROID)
emit GLOB->showNotesDiffChanged(); // trigger this option - MainWindow.qml handles this signal
#endif
});
#if defined (Q_OS_ANDROID)
m_currVol = currentVol();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment