3888 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jeff Mitchell	987e6b97dc	Revert "Go back to previous setNam, but functionality should really be identical." ... Also remove some debug This reverts commit e0177ed895. Conflicts: src/libtomahawk/utils/tomahawkutils.cpp	2011-11-09 15:49:39 -05:00
Jeff Mitchell	4a93e54e63	More debugging, and change around how the static function works	2011-11-09 15:28:39 -05:00
Jeff Mitchell	658201eb98	Revert "This function is probably unnecessary now, remove it" ... This reverts commit e9ed034dc7.	2011-11-09 15:19:05 -05:00
Jeff Mitchell	c0e486df3f	Add nam debug	2011-11-09 14:48:23 -05:00
Jeff Mitchell	e0177ed895	Go back to previous setNam, but functionality should really be identical.	2011-11-09 14:12:48 -05:00
Jeff Mitchell	b325d9bf0f	Don't use lastfm nam anymore, just use our in-built SOCKS support.	2011-11-09 13:00:07 -05:00
Jeff Mitchell	9e01e92839	Revert "First try to fix crash on win" ... This reverts commit 2fb7c5c289.	2011-11-09 12:49:14 -05:00
Jeff Mitchell	83c53b7150	Probably a necessary safety measure, although I can only really see this maybe being a problem on close, not startup	2011-11-09 11:51:26 -05:00
Jeff Mitchell	2fb7c5c289	First try to fix crash on win	2011-11-09 11:49:34 -05:00
Jeff Mitchell	e9ed034dc7	This function is probably unnecessary now, remove it	2011-11-09 09:42:13 -05:00
Dominik Schmidt	f88ee0fc82	Don't show connected state in diag dialog, it's lying anyways	2011-11-08 19:44:33 +01:00
Jeff Mitchell	68188a7958	Remove unused variable	2011-11-08 13:08:50 -05:00
Christian Muehlhaeuser	b537a237a8	* Hide empty / 0 values for bitrate, year, age, filesize.	2011-11-08 19:03:00 +01:00
Jeff Mitchell	1fc3c4c2f2	Have lastfmplugin use the proper nam(), and same for echonest...echonest was only being given the nam for the gui thread	2011-11-08 10:39:37 -05:00
Jeff Mitchell	8d695c5091	Create scrobbler on startup	2011-11-08 10:29:17 -05:00
Jeff Mitchell	d3f4046396	Merge remote branch 'origin/master' into proxyrefactor	2011-11-08 10:15:18 -05:00
Christian Muehlhaeuser	b80f3717b8	* Properly exclude queries without album position.	2011-11-08 15:49:09 +01:00
Christian Muehlhaeuser	7f9fc557a9	* Remove debugging output.	2011-11-08 15:30:53 +01:00
Christian Muehlhaeuser	14639337d4	* Fixed album position & ordering for InfoSystem views.	2011-11-08 15:30:19 +01:00
Dominik Schmidt	0c136e6815	Don't show CMD window for CrashReporter	2011-11-08 14:16:30 +01:00
Christian Muehlhaeuser	3057cdab5d	Merge branch 'proxyrefactor'	2011-11-08 12:02:39 +01:00
Jeff Mitchell	539f2eb700	Proxies are all we really set on nams, so reset proxy data on all threads when the main thread's nam changes	2011-11-08 04:52:06 -05:00
Jeff Mitchell	4c0c610b15	Refactor a ton of stuff. No crashes, but I'm not convinced it all works properly	2011-11-08 04:42:20 -05:00
Christian Muehlhaeuser	6ec8f127c0	* Fixed freezing when filtering out the current item in a tree-view and trying to advance to the next track.	2011-11-08 10:41:30 +01:00
Jeff Mitchell	5db219d571	Refactor proxy stuff...crashes in proxydialog saveSettings though	2011-11-08 03:08:31 -05:00
Jeff Mitchell	f3eb8fa30a	Yikes, how did I write these two lines in the wrong file. So tired.	2011-11-08 00:55:41 -05:00
Jeff Mitchell	f70da74f46	Add private listening status showing	2011-11-07 20:47:04 -05:00
Jason Herskowitz	35bbfac2c5	Merge branch 'master' of github.com:tomahawk-player/tomahawk	2011-11-07 19:25:44 -05:00
Jason Herskowitz	b304bf008d	First pass at a Private Listening icon	2011-11-07 19:24:43 -05:00
Jeff Mitchell	ebe39d9fac	Populate private listening option in right-click on your source	2011-11-07 19:14:29 -05:00
Jeff Mitchell	4bafeb34fd	Insert private listening actions into Tomahawk menu and tray icon menu. ... Some visual feedback would be nice.	2011-11-07 18:45:42 -05:00
Hugo Lindström	8e1cefbbb7	Better use non local source :p	2011-11-08 00:18:39 +01:00
Hugo Lindström	2d4fb5e00b	Adding ex.fm + If genre is not empty, use that instead of name	2011-11-08 00:16:50 +01:00
Jeff Mitchell	6e2ac3b931	Merge branch 'master' into privatelistening	2011-11-07 15:27:10 -05:00
Jeff Mitchell	3c7d73d4ae	Use queuedconnection for both types of connections for latching, which ... makes both work well (eventually, figure out where the bug is that makes this required)	2011-11-07 15:25:48 -05:00
Christian Muehlhaeuser	fca7d05ed7	Revert "* Show Last.fm login test button on OSX again." ... This reverts commit 7c5a4065df.	2011-11-07 21:06:26 +01:00
Jeff Mitchell	cf649cdafe	Merge branch 'master' into privatelistening	2011-11-07 14:54:30 -05:00
Christian Muehlhaeuser	7c5a4065df	* Show Last.fm login test button on OSX again.	2011-11-07 20:51:46 +01:00
Jeff Mitchell	475633c328	Remove all the QNAM-fuckery, since echonest and liblastfm are probably ... good now. (Note: will be pushing the change to liblastfm to libechonest as well)	2011-11-07 13:52:10 -05:00
Christian Muehlhaeuser	f542e97a70	* Register QList<unit> manually.	2011-11-07 16:33:05 +01:00
Christian Muehlhaeuser	c7ac6b5670	* Don't emit changed() twice in TomahawkSettings.	2011-11-07 15:42:02 +01:00
Leo Franchi	2d92cdade0	oops	2011-11-06 20:33:52 -05:00
Leo Franchi	b53f83aa95	Add fileid to result and rename dbid to trackid	2011-11-06 17:58:33 -05:00
Leo Franchi	fa5728d773	And add files	2011-11-06 17:58:20 -05:00
Leo Franchi	85662bb478	Port echonest catalog sync to new collection add/remove	2011-11-06 17:57:39 -05:00
Jeff Mitchell	a1b3538131	Work towards latch actions -- need to debug corner cases	2011-11-06 14:38:58 -05:00
Christian Muehlhaeuser	06ba09f357	* DbCmd_AddFiles should emit the file-IDs, not the track-IDs.	2011-11-06 19:53:23 +01:00
Jeff Mitchell	f70f61ac2f	Add initial actioncollection skeleton	2011-11-06 13:43:23 -05:00
Jeff Mitchell	bfcf4d3bdb	More cleanup work. Also, move twitter authentication to the account, so it's centralized	2011-11-06 13:18:19 -05:00
Jeff Mitchell	eaab5df5be	Merge branch 'master' into accounts	2011-11-06 12:37:40 -05:00