Merge remote-tracking branch 'origin/master' into snappy

janbar · Oct 1, 2017 · c2a71ab · c2a71ab
2 parents 5664ce8 + 4741edb
commit c2a71ab
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,7 +25,7 @@ set(QT_IMPORTS_DIR "lib/${ARCH_TRIPLET}")
 option(INSTALL_TESTS "Install the tests on make install" on)
 option(CLICK_MODE "Installs to a contained location" on)
 
-set(APP_VERSION       2.4.11)
+set(APP_VERSION       2.4.12)
 set(APP_NAME          noson)
 set(APP_ID            "noson.janbar")
 set(MAIN_QML          "Main.qml")

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Go to [project page](http://janbar.github.io/noson-app/index.html) for further d
 
 ## Build instructions
 
-The build can be achieved on Ubuntu platform with the Ubuntu SDK for Qt/QML. See `debian/control` file for more details about dependencies.
+The build can be achieved on Ubuntu platform with the Ubuntu SDK (15.04-16.10) for Qt/QML. See `debian/control` file for more details about dependencies.
 
 ### Ubuntu
 

diff --git a/backend/lib/noson/noson/src/sonossystem.cpp b/backend/lib/noson/noson/src/sonossystem.cpp
@@ -307,7 +307,7 @@ bool System::FindDeviceDescription(std::string& url)
         int status = 0;
         if (1 == sscanf(line, "%*s %d", &status) && status == 200)
         {
-          DBG(DBG_DEBUG, "%s: starting new context\n", __FUNCTION__);
+          DBG(DBG_INFO, "%s: starting new context\n", __FUNCTION__);
           _context = 1; // new valid context
         }
         else
@@ -344,27 +344,27 @@ bool System::FindDeviceDescription(std::string& url)
               {
                 if (memcmp(val, DISCOVER_ST, value_len) == 0)
                 {
-                  DBG(DBG_DEBUG, "%s: search target matches (%s)\n", __FUNCTION__, val);
+                  DBG(DBG_INFO, "%s: search target matches (%s)\n", __FUNCTION__, val);
                   _context |= 0x2;
                 }
                 else
                 {
-                  DBG(DBG_DEBUG, "%s: search target not matches (%s)\n", __FUNCTION__, val);
+                  DBG(DBG_INFO, "%s: search target not matches (%s)\n", __FUNCTION__, val);
                   _context = 0; // reset context
                 }
               }
               break;
             case 6:
               if (val && memcmp(token, "SERVER", token_len) == 0)
               {
-                DBG(DBG_DEBUG, "%s: server string found (%s)\n", __FUNCTION__, val);
+                DBG(DBG_INFO, "%s: server string found (%s)\n", __FUNCTION__, val);
                 _context |= 0x4;
               }
               break;
             case 8:
               if (val && memcmp(token, "LOCATION", token_len) == 0)
               {
-                DBG(DBG_DEBUG, "%s: location url found (%s)\n", __FUNCTION__, val);
+                DBG(DBG_INFO, "%s: location url found (%s)\n", __FUNCTION__, val);
                 _context |= 0x8;
                 url.assign(val);
               }
@@ -375,7 +375,7 @@ bool System::FindDeviceDescription(std::string& url)
         }
         else if (len == 0)
         {
-          DBG(DBG_DEBUG, "%s: reseting context\n", __FUNCTION__);
+          DBG(DBG_INFO, "%s: reseting context\n", __FUNCTION__);
           _context = 0; // reset context
         }
       }

diff --git a/backend/modules/NosonApp/sonos.cpp b/backend/modules/NosonApp/sonos.cpp
@@ -68,8 +68,10 @@ Sonos::~Sonos()
 
 bool Sonos::init(int debug)
 {
+  SONOS::DBGLevel(debug > DBG_INFO ? debug : DBG_INFO);
+  bool ret = m_system.Discover();
   SONOS::DBGLevel(debug);
-  return m_system.Discover();
+  return ret;
 }
 
 void Sonos::setLocale(const QString& locale)