Merge branch 'master' into databasegenerator

data/js/tomahawk.js

@@ -31,19 +31,19 @@ Tomahawk.resolver = {
 
 Tomahawk.timestamp = function() {
     return Math.round( new Date()/1000 );
-}
+};
 
 Tomahawk.dumpResult = function( result ) {
     var results = result.results;
     Tomahawk.log("Dumping " + results.length + " results for query " + result.qid + "...");
     for(var i=0; i<results.length;i++)
     {
-        var result = results[i];
-        Tomahawk.log( result.artist + " - " + result.track + " | " + result.url );
+        var result1 = results[i];
+        Tomahawk.log( result1.artist + " - " + result1.track + " | " + result1.url );
     }
 
     Tomahawk.log("Done.");
-}
+};
 
 // javascript part of Tomahawk-Object API
 Tomahawk.extend = function(object, members) {
@@ -57,7 +57,7 @@ Tomahawk.extend = function(object, members) {
     }
 
     return newObject;
-}
+};
 
 
 // Resolver BaseObject, inherit it to implement your own resolver
@@ -77,7 +77,9 @@ var TomahawkResolver = {
     {
         var configJson = window.localStorage[ this.scriptPath() ];
         if( configJson === undefined )
+	{
             configJson = "{}";
+	}
 
         var config = JSON.parse( configJson );
 
@@ -153,11 +155,15 @@ var TomahawkResolver = {
 Tomahawk.valueForSubNode = function(node, tag)
 {
     if(node === undefined)
+    {
         throw new Error("Tomahawk.valueForSubnode: node is undefined!");
+    }
 
     var element = node.getElementsByTagName(tag)[0];
     if( element === undefined )
+    {
         return undefined;
+    }
 
     return element.textContent;
 };
@@ -165,11 +171,13 @@ Tomahawk.valueForSubNode = function(node, tag)
 
 Tomahawk.syncRequest = function(url)
 {
-    var xmlHttpRequest = new XMLHttpRequest();
-    xmlHttpRequest.open('GET', url, false);
-    xmlHttpRequest.send(null);
-    return xmlHttpRequest.responseText;
-}
+	var xmlHttpRequest = new XMLHttpRequest();
+	xmlHttpRequest.open('GET', url, false);
+	xmlHttpRequest.send(null);
+	if (xmlHttpRequest.status == 200){
+		return xmlHttpRequest.responseText;
+	}
+};
 
 /**
 *
@@ -210,7 +218,7 @@ Tomahawk.sha256=function(s){
         m[l >> 5] |= 0x80 << (24 - l % 32);
         m[((l + 64 >> 9) << 4) + 15] = l;
 
-        for ( var i = 0; i<m.length; i+=16 ) {
+        for ( i = 0; i<m.length; i+=16 ) {
             a = HASH[0];
             b = HASH[1];
             c = HASH[2];
@@ -220,9 +228,15 @@ Tomahawk.sha256=function(s){
             g = HASH[6];
             h = HASH[7];
 
-            for ( var j = 0; j<64; j++) {
-                if (j < 16) W[j] = m[j + i];
-                else W[j] = safe_add(safe_add(safe_add(Gamma1256(W[j - 2]), W[j - 7]), Gamma0256(W[j - 15])), W[j - 16]);
+            for ( j = 0; j<64; j++) {
+                if (j < 16)
+		{
+			W[j] = m[j + i];
+		}
+                else
+		{
+			W[j] = safe_add(safe_add(safe_add(Gamma1256(W[j - 2]), W[j - 7]), Gamma0256(W[j - 15])), W[j - 16]);
+		}
 
                 T1 = safe_add(safe_add(safe_add(safe_add(h, Sigma1256(e)), Ch(e, f, g)), K[j]), W[j]);
                 T2 = safe_add(Sigma0256(a), Maj(a, b, c));
@@ -297,4 +311,4 @@ Tomahawk.sha256=function(s){
     s = Utf8Encode(s);
     return binb2hex(core_sha256(str2binb(s), s.length * chrsz));
 
-}
+};

src/libtomahawk/CMakeLists.txt

@@ -31,7 +31,7 @@ set( libSources
     viewpage.cpp
     viewmanager.cpp
     globalactionmanager.cpp
-    contextMenu.cpp
+    contextmenu.cpp
 
     sip/SipPlugin.cpp
     sip/SipHandler.cpp
@@ -204,7 +204,7 @@ set( libHeaders
     sourceplaylistinterface.h
     viewmanager.h
     globalactionmanager.h
-    contextMenu.h
+    contextmenu.h
 
     artist.h
     album.h

src/libtomahawk/contextmenu.cpp

@@ -16,7 +16,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "contextMenu.h"
+#include "contextmenu.h"
 
 #include "globalactionmanager.h"
 #include "playlistview.h"

src/libtomahawk/contextmenu.h

@@ -23,7 +23,8 @@
 #include <QMenu>
 
 #include "typedefs.h"
-
+#include "album.h"
+#include "artist.h"
 #include "dllmacro.h"
 
 namespace Tomahawk

src/libtomahawk/pipeline.cpp

@@ -210,7 +210,7 @@ Pipeline::reportResults( QID qid, const QList< result_ptr >& results )
     }
     else
     {
-        new FuncTimeout( 50, boost::bind( &Pipeline::timeoutShunt, this, q ), this );
+        new FuncTimeout( 100, boost::bind( &Pipeline::timeoutShunt, this, q ), this );
     }
 }
 
@@ -247,7 +247,7 @@ Pipeline::shuntNext()
     }
 
     setQIDState( q, rc );
-    new FuncTimeout( 50, boost::bind( &Pipeline::shunt, this, q ), this );
+    new FuncTimeout( 100, boost::bind( &Pipeline::shunt, this, q ), this );
 }
 
 

src/libtomahawk/playlist/artistview.h

@@ -22,7 +22,7 @@
 #include <QTreeView>
 #include <QSortFilterProxyModel>
 
-#include "contextMenu.h"
+#include "contextmenu.h"
 #include "treemodel.h"
 #include "treeproxymodel.h"
 #include "viewpage.h"

src/libtomahawk/playlist/trackview.h

@@ -22,7 +22,7 @@
 #include <QTreeView>
 #include <QSortFilterProxyModel>
 
-#include "contextMenu.h"
+#include "contextmenu.h"
 #include "playlistitemdelegate.h"
 #include "album.h"