Leo Franchi
|
24d9cce3a8
|
Install a .protocol file on KDE so tomahawk:// links work there too
|
2011-04-11 15:36:29 -04:00 |
|
Leo Franchi
|
b3eaa1a761
|
Merge branch 'stable'
Conflicts:
ChangeLog
src/tomahawkwindow.cpp
|
2011-04-11 11:03:31 -04:00 |
|
Leo Franchi
|
1cb3516dc6
|
As per domme's suggestion, use ::fromUserInput to make loading xspfs work everywhere
|
2011-04-11 11:01:26 -04:00 |
|
Leo Franchi
|
c24a95e49f
|
support loading local .xspfs from files
(cherry picked from commit 4095f4b5aac8a1f292788d617458ae7cd49177fe)
|
2011-04-11 10:22:00 -04:00 |
|
Leo Franchi
|
4095f4b5aa
|
support loading local .xspfs from files
|
2011-04-11 10:11:40 -04:00 |
|
Leo Franchi
|
5235cc9093
|
less debug
|
2011-04-10 21:04:18 -04:00 |
|
Leo Franchi
|
41c553fac7
|
undo oops
|
2011-04-10 21:03:47 -04:00 |
|
Leo Franchi
|
a9a9ffa40f
|
Changes to make Spotify resolver work
|
2011-04-10 21:03:47 -04:00 |
|
Alejandro Wainzinger
|
252a48196c
|
Move signal connections of scrobbler into scrobbler, easier to read.
|
2011-04-10 16:46:35 -07:00 |
|
Alejandro Wainzinger
|
5ae0a7138c
|
Make compile on OS X. (liblastfm2)
|
2011-04-10 02:24:32 -07:00 |
|
Christian Muehlhaeuser
|
c0994e3c24
|
* Fixed crash bug caused by multiple sources going on- and offline at a time.
|
2011-04-09 11:03:52 +02:00 |
|
Jeff Mitchell
|
7639d8da9e
|
Happy Birthday, muesli
|
2011-04-07 17:58:45 -04:00 |
|
Jeff Mitchell
|
bf744ac8bb
|
Ah-whoops, knew I forgot something in my previous commit
|
2011-04-07 10:41:08 -04:00 |
|
Jeff Mitchell
|
db6a93e55c
|
Now when inserting into the cache a max age time is specified. It can be refreshed by issuing a new max age time when doing a getCachedInfo call (optional).
|
2011-04-07 10:40:11 -04:00 |
|
Leo Franchi
|
196397f210
|
fix build
|
2011-04-07 09:16:21 -04:00 |
|
Leo Franchi
|
80c8e61cf8
|
Merge branch 'stable'
Conflicts:
src/main.cpp
src/tomahawkapp.cpp
|
2011-04-07 08:57:43 -04:00 |
|
Christian Muehlhaeuser
|
87c554c6f0
|
* Fixed TomahawkApp CTOR for secondary instances.
|
2011-04-07 04:47:41 +02:00 |
|
Jeff Mitchell
|
83909e53f9
|
Don't unconditionally scan for changes on startup
|
2011-04-06 19:58:24 -04:00 |
|
Jeff Mitchell
|
8690a76df7
|
Fix hang-on-exit in ScanManager. Turns out all it needed was to be explicitly deleted; I guess the parenting wasn't working right, or something?
|
2011-04-06 19:51:58 -04:00 |
|
Jeff Mitchell
|
0c52b37bb2
|
InfoSystemCache saving and loading from disk works. We might have to tweak exactly how it's stored on disk at some point, depending on efficiency, but this works.
|
2011-04-06 19:42:50 -04:00 |
|
Christian Muehlhaeuser
|
621770eada
|
Merge remote-tracking branch 'origin/stable'
|
2011-04-06 11:49:13 +02:00 |
|
Christian Muehlhaeuser
|
17c1cdc2c1
|
* Renamed PlItem to TrackModelItem.
|
2011-04-06 11:48:49 +02:00 |
|
Christian Muehlhaeuser
|
d5f21dc9f2
|
* Remove debug output.
|
2011-04-06 08:19:10 +02:00 |
|
Christian Muehlhaeuser
|
495621b715
|
Merge remote-tracking branch 'origin/stable'
|
2011-04-06 07:33:45 +02:00 |
|
Christian Muehlhaeuser
|
51a3eb39be
|
* Fixed page-history related crash when deleting / creating playlists.
|
2011-04-06 07:26:57 +02:00 |
|
Dominik Schmidt
|
60142eb92d
|
Merge branch 'master' into jreen-tpqt4-comp
Conflicts:
CMakeLists.txt
src/tomahawkapp.cpp
|
2011-04-06 06:58:33 +02:00 |
|
Dominik Schmidt
|
c1385761b6
|
Find jreen headers in source, HACK
|
2011-04-06 06:43:24 +02:00 |
|
Christian Muehlhaeuser
|
ab2443792a
|
* Don't manually delete the root item. This speeds up shut down, since the proxy will be disconnected before the root item gets deleted (automatically).
|
2011-04-06 06:18:00 +02:00 |
|
Jeff Mitchell
|
dc43452bfc
|
Fix build
|
2011-04-05 21:15:04 -04:00 |
|
Jeff Mitchell
|
17733fea1d
|
Fix build
|
2011-04-05 21:14:32 -04:00 |
|
Leo Franchi
|
69011e3f90
|
cleanup
|
2011-04-05 21:06:24 -04:00 |
|
Leo Franchi
|
3d93a82d08
|
go back to previous page in history when deleting a playlist
|
2011-04-05 21:04:34 -04:00 |
|
Leo Franchi
|
a1848f46bd
|
Set a query loaded from a source as already resolved
|
2011-04-05 21:04:34 -04:00 |
|
Jeff Mitchell
|
1ef9b7c241
|
Update twitter connect caching
|
2011-04-05 20:59:11 -04:00 |
|
Jeff Mitchell
|
47fb4f3b50
|
Update twitter connect caching
|
2011-04-05 20:58:47 -04:00 |
|
Jeff Mitchell
|
73d88dcf7b
|
Keep track of offered dbid to a peer and check offer key to make sure it matches
|
2011-04-05 20:51:48 -04:00 |
|
Jeff Mitchell
|
394f3ee383
|
Keep track of offered dbid to a peer and check offer key to make sure it matches
|
2011-04-05 20:50:53 -04:00 |
|
Jeff Mitchell
|
a52ecfb5b8
|
Do some explicit string emptiness checking in Twitter
|
2011-04-05 20:21:14 -04:00 |
|
Jeff Mitchell
|
db8088b30f
|
Actually start writing cached info to disk
|
2011-04-05 20:20:49 -04:00 |
|
Jeff Mitchell
|
baa039bbf6
|
Do some explicit string emptiness checking in Twitter
|
2011-04-05 20:18:37 -04:00 |
|
Jeff Mitchell
|
da7a45950a
|
Merge remote branch 'origin/stable'
|
2011-04-05 13:50:31 -04:00 |
|
Leo Franchi
|
f8619d4aa5
|
hm, add a newline where it belongs
|
2011-04-05 13:21:33 -04:00 |
|
Leo Franchi
|
f8452b4fdc
|
only connect if there is that signal, no more warnings
|
2011-04-05 13:14:01 -04:00 |
|
Dominik Schmidt
|
9d95644b9f
|
Add debug when sending messages
|
2011-04-05 17:15:02 +02:00 |
|
Dominik Schmidt
|
e944293d02
|
Build jreen on default
|
2011-04-05 17:14:11 +02:00 |
|
Leo Franchi
|
8881fab205
|
clean up after ourselves
|
2011-04-04 18:50:10 -04:00 |
|
Leo Franchi
|
806b3a3281
|
change loading animation, show animation while resolving a playlist
|
2011-04-04 18:43:51 -04:00 |
|
Dominik Schmidt
|
4cb2532fab
|
Heyyeeyeeey - hey stupid
|
2011-04-04 23:22:49 +02:00 |
|
Dominik Schmidt
|
3a0874bcdd
|
More debug and fails--
|
2011-04-04 23:20:35 +02:00 |
|
Dominik Schmidt
|
0cfb98b0af
|
Squash me
|
2011-04-04 21:14:05 +02:00 |
|