Jeff Mitchell
d5c182c151
Switch around a couple of qnam slots
2011-05-01 10:29:31 -04:00
Jeff Mitchell
7f7c55a293
Only delete qnam objects in liblastfm2 that it creates itself
2011-05-01 10:27:43 -04:00
Christian Muehlhaeuser
e8f2eedcb9
* Don't assert on unknown sources, but print out debug.
2011-05-01 15:30:15 +02:00
Christian Muehlhaeuser
4c3f5b0399
* Should fix compiling on OS X.
2011-05-01 14:54:48 +02:00
Christian Muehlhaeuser
5379d35084
* Should fix compiling on OS X.
2011-05-01 14:43:18 +02:00
Christian Muehlhaeuser
82a5058e4c
* Fix AudioEngine killing Phonon's QIODevice.
2011-05-01 13:05:04 +02:00
Jeff Mitchell
af49afac35
work around isLocalFile not existing
2011-05-01 03:01:34 -04:00
Jeff Mitchell
032e6f8d6f
Update local liblastfm2 to deal better with threads and qnams
2011-05-01 02:22:01 -04:00
Jeff Mitchell
2a4b0b2956
First part of more threadsafety, mostly for liblastfm2's qnam
2011-05-01 02:22:01 -04:00
Leo Franchi
c2b7ea9411
Merge remote-tracking branch 'origin/master' into cleanmaster
2011-05-01 01:29:41 -04:00
Leo Franchi
ab2e91fdd6
Allow url result-hints, load them from XSPFs too.
...
Add support for various tomahawk:// links
2011-05-01 01:27:34 -04:00
Jeff Mitchell
683d4a4529
Find local phonon installs if they exist instead of filtering them out
2011-05-01 01:24:29 -04:00
Jeff Mitchell
3f3a2798c7
have the worker let any interested plugins know when the nam changes, and have the echonestplugin make use of that to set the appropriate nam for the thread
2011-05-01 01:04:48 -04:00
Jeff Mitchell
4768f9acd7
Attempt to fix Leo's crash in destruction of infosystemworker
2011-04-30 21:55:23 -04:00
Jeff Mitchell
2a39355fb6
Add pushInfo API to InfoSystem, and switch the LastFM Plugin over to
...
using it
2011-04-30 17:10:36 -04:00
Jeff Mitchell
eec9283aff
Don't start on the script resolver page (I'm assuming this was
...
accidental?)
2011-04-30 17:10:23 -04:00
Jeff Mitchell
9dae7ded86
Fix crash on config dialog close
2011-04-30 15:19:05 -04:00
Jeff Mitchell
dfc518cedc
Use a new QNAM in the thread to avoid reparenting problems
2011-04-30 14:07:20 -04:00
Jeff Mitchell
37b9dea002
Split infosystemworker into its own header
2011-04-30 13:25:17 -04:00
Jeff Mitchell
1b656fe874
Clean up some of the threadification
2011-04-30 12:55:18 -04:00
Jeff Mitchell
750331d920
Merge branch 'master' into infosystem-threadify
2011-04-30 12:51:21 -04:00
Jeff Mitchell
63b1f4eae7
Don't allow a phonon version less than 4.5.0 as it causes problems
2011-04-30 11:25:54 -04:00
Jeff Mitchell
4fb41ff417
Initial work on threadifying
2011-04-30 11:10:29 -04:00
Leo Franchi
2d2426732c
fix whitespace
2011-04-30 09:24:51 -04:00
Leo Franchi
3d0d61524f
Merge branch 'tiegz-master'
2011-04-30 09:12:28 -04:00
Jeff Mitchell
2af7c9f18e
Fix a bug and start the skeleton for the thread-based worker
2011-04-29 17:01:58 -04:00
Jeff Mitchell
48f1745614
Hopefully fix problems with the auto-message going to gtalk users
2011-04-29 08:30:07 -04:00
Leo Franchi
b2a0e41eab
Merge branch 'master' of github.com:tomahawk-player/tomahawk into upstream
2011-04-28 07:36:35 -04:00
Leo Franchi
bf0b58fe60
Support year in external resolvers too
2011-04-28 07:36:12 -04:00
Leo Franchi
33e940f708
Set sourcetree to itunes/mail-like grey and blue on osx. Somehow this was lost during my merge.
2011-04-26 23:35:48 -04:00
Leo Franchi
6945b503cf
remove Home action from toolbar as it's now the recently played item in the sourcelist
2011-04-25 15:59:45 -04:00
Leo Franchi
033987eedb
use the sourceitem decoration role instead so we get teh supercollection icon
2011-04-24 21:06:33 -04:00
Leo Franchi
2507f8306c
Revert change of jreen namespace, as we were tracking Jreen trunk correctly but
...
our submodule was behind on clean checkouts. Updated now.
Revert "The Jreen guys went and changed capitalization of their namespace, which"
This reverts commit 41f1ac9713689dc915e81e2c61eaa70387518c19.
2011-04-23 12:47:45 -04:00
Leo Franchi
dd685d600d
Update jreen submodule to newest trunk.
2011-04-23 12:43:45 -04:00
Jeff Mitchell
41f1ac9713
The Jreen guys went and changed capitalization of their namespace, which
...
is why build was failing.
Jreen--
or, I guess,
jreen++
2011-04-22 10:46:29 -04:00
Leo Franchi
056efe2cd9
show name when editing first
2011-04-22 17:39:01 -04:00
Leo Franchi
519e1bb71e
allow to rename playlist when creating via drag
...
Merge branch 'master' into sourcelistrefactor
Conflicts:
src/tomahawkwindow.cpp
2011-04-22 17:09:23 -04:00
Leo Franchi
632889b590
fix a few more things
2011-04-22 16:32:38 -04:00
Leo Franchi
062cf35324
sort playlists by date added
...
allow users to drag tracks onto the New Playlist item to seed a new plsylist
2011-04-22 16:07:44 -04:00
Leo Franchi
8cdc9931b1
Add some tooltips, thanks Pranav
2011-04-22 16:00:58 -04:00
Leo Franchi
e6c7a73110
make welcome widget not abuse the filesystem
2011-04-22 15:31:40 -04:00
Leo Franchi
6a323832a9
split out items in their own parts
...
make generic item take a funcptr so we keep the link going
2011-04-22 14:43:44 -04:00
Jeff Mitchell
02272c0f87
Use the explicitly-configured server when one exists, otherwise do DNS querying
2011-04-22 13:11:57 -04:00
Jeff Mitchell
7239d3fdfd
Add a QCache to cache recent hits in memory
2011-04-22 13:02:35 -04:00
Jeff Mitchell
e3aa497b62
Fix crashes and bad accesses
2011-04-22 13:02:01 -04:00
Leo Franchi
4ffe635486
FindPhonon already spits out all the messages we need
2011-04-22 10:02:44 -04:00
Leo Franchi
695e029709
Add FindPhonon.cmake from kde, and uses phonon/ includes as that's the "proper" include path for both qt- and kde-phonon
2011-04-22 09:59:53 -04:00
Jeff Mitchell
89606c49d4
Warnings--
2011-04-22 09:58:43 -04:00
Jeff Mitchell
a8253c4abd
Merge remote branch 'origin/master' into single-file-cache
2011-04-22 09:52:02 -04:00
Leo Franchi
dd5c7b0af4
fix up
...
Merge branch 'master' into sourcelistrefactor
Conflicts:
src/sourcetree/sourcetreeview.cpp
2011-04-22 09:29:04 -04:00