1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-26 02:32:35 +01:00

1431 Commits

Author SHA1 Message Date
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
Christian Muehlhaeuser
15014f137b * Merged phonon into master. 2011-04-22 15:27:33 +02:00
Christian Muehlhaeuser
7b10f99b53 * This wasn't supposed to end up in phonon branch. 2011-04-22 15:24:25 +02:00
Christian Muehlhaeuser
48265c8262 * Removed phonon warning. 2011-04-22 15:11:24 +02:00
Christian Muehlhaeuser
34ac2b6b86 * Merged master into phonon branch. 2011-04-22 15:08:59 +02:00
Leo Franchi
a8d8a485e5 Add support for stations and automatic playlists back to the sourcetree
don't look at this commit for too long or some parts might cause your eyes to fall out of your head. i apoligize in advance.
2011-04-21 23:29:05 -04:00
Christian Muehlhaeuser
ae36ce956a * Always show source's current friendly name, not a cached copy of it. 2011-04-22 02:08:58 +02:00
Jeff Mitchell
1640872bd9 Update infosystemcache to load from disk on demand. It still uses a (much smaller) amount of memory for one optimization: tracking known hashes to file paths. This prevents re-reading directory trees over and over and constantly refiltering them. 2011-04-21 12:11:51 -04:00
Leo Franchi
127548e3a2 Merge remote-tracking branch 'origin/master' into sourcelistrefactor
Conflicts:
	src/sourcetree/sourcetreeitem.cpp
	src/sourcetree/sourcetreeview.cpp
	thirdparty/jreen
2011-04-21 11:32:14 -04:00
Leo Franchi
61bf30de57 Merge remote-tracking branch 'origin/master' into sourcelistrefactor 2011-04-21 11:22:33 -04:00
Jeff Mitchell
d727f3a319 Merge branch 'master' into single-file-cache 2011-04-21 10:38:55 -04:00
Dominik Schmidt
3e20fd1f6a Let SipHandler set the avatar for MyCollection 2011-04-21 13:42:26 +02:00
Leo Franchi
990e160a2e allow renaming of local playlists 2011-04-20 22:21:43 -04:00
Leo Franchi
74b310eb00 do lots of stuff.
rename playlistmanager to viewmanager. link pages in the viewmanager to indexes in the sourcetree, so it is never out of sync. yay!
2011-04-20 22:14:45 -04:00
Frank Osterfeld
3182a294d7 Do not truncate FLAC playback.
If "finish" is set, play until the buffer is empty.
2011-04-20 23:34:13 +02:00
Dominik Schmidt
84019e5d11 Add DLLEXPORT macro to SipHandler 2011-04-20 21:43:14 +02:00
Dominik Schmidt
26be5c954d Merge branch 'jreen-avatars'
Conflicts:
	src/libtomahawk/source.h
2011-04-20 21:31:44 +02:00
Dominik Schmidt
d9a4b71414 Use the AvatarManager and show avatars in the MainWindow. 2011-04-20 21:26:16 +02:00
Dominik Schmidt
ddb7e012df sipjreen: Add AvatarManager class 2011-04-20 21:12:04 +02:00
Dominik Schmidt
47fd7b8285 Add avatar support to controlconnection, source and sourcetreeview. 2011-04-20 20:36:49 +02:00
Dominik Schmidt
def3e3d868 Move SipHandler from application to library 2011-04-20 20:22:06 +02:00
Jeff Mitchell
e36b6bd41e Merge remote branch 'origin/master' into single-file-cache 2011-04-20 13:01:41 -04:00
Jeff Mitchell
439521424b Merge branch 'master' into single-file-cache 2011-04-20 12:59:30 -04:00
Alejandro Wainzinger
af9d2d388c Lower the amount of time PortFwdThread waits until destruction. Greatly reduces shutdown time in the case where it can't communicate properly. 2011-04-20 12:58:59 -04:00
Christian Muehlhaeuser
2e80475a9d * Moved --demo stuff to Source class. 2011-04-20 16:21:12 +02:00
Alejandro Wainzinger
cbd5196080 Fix CMake. 2011-04-19 22:26:18 -04:00
Dominik Schmidt
d87398c47a First shitty implementation of loading avatars 2011-04-20 00:26:13 +02:00
Jeff Mitchell
248e3e7a4a Rename some values and make slots and other functions use const values,
for sanity checking
2011-04-19 16:37:37 -04:00
Jeff Mitchell
edaabc0ae6 Efficiency++ 2011-04-19 15:57:13 -04:00
Jeff Mitchell
9310755e92 Fix loading files, and preventing duplicates 2011-04-19 15:53:26 -04:00
Jeff Mitchell
66358d2103 Use hex in the filename 2011-04-19 15:22:29 -04:00
Jeff Mitchell
b916125756 Whoops, actually start the sync timer! 2011-04-19 09:48:42 -04:00
Jeff Mitchell
d391b9bd66 Per-file cache entry saving and loading 2011-04-19 09:43:53 -04:00
Jeff Mitchell
b9f80edea9 Move infosystem register meta types to the location as the other register
statements
2011-04-19 08:48:02 -04:00
Jeff Mitchell
43834a17bc Add sync timer to cache to avoid saving everything at shutdown (runs
once a minute)
2011-04-19 08:38:47 -04:00
Christian Muehlhaeuser
af0b7f9a74 * Merged master into phonon branch. 2011-04-19 00:03:55 +02:00
Dominik Schmidt
ed93084315 Merge branch 'jreen-tpqt4-comp' 2011-04-18 22:35:42 +02:00
Dominik Schmidt
04b4c69ab3 sipjreen: Add I'm-not-a-person-auto-response 2011-04-18 22:35:30 +02:00
Dominik Schmidt
01980ab6d1 sipjreen: Add authError signal 2011-04-18 22:35:18 +02:00
Dominik Schmidt
35d51a2cd2 sipjreen: Fix some signal and slot connections 2011-04-18 22:35:09 +02:00
Jeff Mitchell
309024a467 Switch some calls from InfoCustomData to InfoCriteriaHash, much simplifying 2011-04-18 10:40:45 -04:00
Jeff Mitchell
8bafe8bb9a Rename InfoCacheCriteria into something more generic since many plugins will probably use it for input data 2011-04-18 10:12:37 -04:00
Dominik Schmidt
5b01ae5268 On default use system jreen package, allow the user to enforce in-tree compilation with -DINTERNAL_JREEN=ON. 2011-04-17 21:25:24 +02:00
Dominik Schmidt
b52b87f818 Updated jreen submodule 2011-04-17 19:49:03 +02:00
Leo Franchi
22de39b96a add files 2011-04-17 11:51:59 -04:00
Leo Franchi
4eaff359f0 make collectionitems icons used not hardcoded, and add supercollection icon 2011-04-17 11:51:59 -04:00