Various devel changes

- Use time_t to store MPD DB version, as that is what MPD sends anyway
- Initial changes for an (experimental) webapp
This commit is contained in:
Craig Drummond
2015-06-01 21:53:55 +01:00
parent 4ac46a5b0b
commit c83eb3fc27
24 changed files with 212 additions and 152 deletions

View File

@@ -23,12 +23,15 @@
#include "networkaccessmanager.h"
#include "networkproxyfactory.h"
#if !defined ENABLE_UBUNTU && !defined CANTATA_WEB
#include "gui/settings.h"
#endif
#include "config.h"
#include "support/globalstatic.h"
#include <QTimerEvent>
#include <QTimer>
#include <QSslSocket>
#include <QCoreApplication>
#include <QDebug>
static bool debugEnabled=false;
@@ -175,7 +178,7 @@ GLOBAL_STATIC(NetworkAccessManager, instance)
NetworkAccessManager::NetworkAccessManager(QObject *parent)
: BASE_NETWORK_ACCESS_MANAGER(parent)
{
#ifdef ENABLE_UBUNTU
#if defined ENABLE_UBUNTU || defined CANTATA_WEB
enabled=true;
#else
enabled=Settings::self()->networkAccessEnabled();