Jeff Mitchell
04864c7d79
Set scanning threads idle priority
...
(cherry picked from commit 5a57e285ec2a25fe71877a7828b87bb65a31cf3e)
2012-03-30 10:28:04 -04:00
Leo Franchi
0dc0067450
some cleanups
2012-03-29 23:28:09 -04:00
Christian Muehlhaeuser
a4421df9e9
* Potential fix for rotzbouw's weird crash.
2012-03-29 19:02:06 +02:00
Christian Muehlhaeuser
47774c3894
* Add polish to our released languages. All translations could do with an update now.
2012-03-29 18:04:57 +02:00
Jeff Mitchell
43c4daa4e3
Change wording
2012-03-29 10:41:16 -04:00
Jeff Mitchell
fc95cee6ce
Dynamically enable/disable the web API, and change the wording for the option to make it more enticing
2012-03-29 10:41:14 -04:00
Leo Franchi
f39e9621a0
Uncomment out, oops
2012-03-28 21:39:17 -04:00
Leo Franchi
704c736046
more fixes
2012-03-28 18:23:41 -04:00
Kevin Funk
0d8a8038b7
Compile fix for ARM
...
Not sure why this is needed, but without this the tomahawk binary fails
to link.
Error:
`.LTHUNK9' referenced in section
`.text._ZN21AccountFactoryWrapperD1Ev[AccountFactoryWrapper::~AccountFactoryWrapper()]'
of CMakeFiles/tomahawk.dir/tomahawk_automoc.cpp.o: defined in discarded
section
`.text._ZN21AccountFactoryWrapperD2Ev[_ZN21AccountFactoryWrapperD5Ev]'
of CMakeFiles/tomahawk.dir/tomahawk_automoc.cpp.o
collect2: ld returned 1 exit status
make[2]: *** [tomahawk] Error 1
2012-03-28 23:45:48 +02:00
Jeff Mitchell
38ea9653a0
Change wording
2012-03-28 14:20:29 -04:00
Jeff Mitchell
eebf5dfe07
Dynamically enable/disable the web API, and change the wording for the option to make it more enticing
2012-03-28 14:17:27 -04:00
Dominik Schmidt
ba46795749
Merge branch 'stable'
...
Conflicts:
src/libtomahawk/result.cpp
src/libtomahawk/utils/tomahawkutils.cpp
src/settingsdialog.cpp
src/sip/twitter/tomahawkoauthtwitter.cpp
src/sip/twitter/tomahawkoauthtwitter.h
2012-03-28 17:37:16 +02:00
Dominik Schmidt
fff8fbfe80
win: fix qca2 usage/grooveshark
2012-03-28 17:23:27 +02:00
Dominik Schmidt
00dade5460
YES, I GOT IT. I'M SURE.
2012-03-28 15:44:03 +02:00
Dominik Schmidt
301c1d21fe
Make publishing the user tune optional
2012-03-28 15:34:51 +02:00
Dominik Schmidt
bac82c0abf
Add missing return
2012-03-28 15:03:40 +02:00
Dominik Schmidt
8e0f44a374
Add XmppInfoPlugin for updating the user tune
2012-03-28 14:38:59 +02:00
Christian Muehlhaeuser
5593c134cd
* Reorder toma.hk parameters to match website order.
2012-03-28 07:06:10 +02:00
Leo Franchi
f414e92b74
Keep track of spotify IDs of tracks in a synced playlist and update to id api
2012-03-27 23:07:58 -04:00
Leo Franchi
02ff39f595
Merge branch 'master' into spotifyplaylists
...
Conflicts:
src/libtomahawk/utils/xspfloader.cpp
2012-03-27 17:49:02 -04:00
Leo Franchi
eec8b76de0
fix xspf auto-updating
...
(cherry picked from commit c54ca787693cd3a3e0340dfcb08032a09d6059cf)
2012-03-27 11:27:07 -04:00
Leo Franchi
68f03dbd13
autoupdate fixes: init on creation, and every 10 not 100 mins
...
(cherry picked from commit ff04ab3b922fdf44d18751546b371ffa7ed1c941)
2012-03-27 11:27:03 -04:00
Leo Franchi
c54ca78769
fix xspf auto-updating
2012-03-27 11:26:33 -04:00
Leo Franchi
ff04ab3b92
autoupdate fixes: init on creation, and every 10 not 100 mins
2012-03-27 10:30:37 -04:00
Leo Franchi
cb484a2058
Merge remote-tracking branch 'origin/master' into spotifyplaylists
...
Conflicts:
admin/mac/macdeploy.py
2012-03-26 12:26:09 -04:00
Leo Franchi
1bd7d37a0a
eh
2012-03-25 09:58:09 -04:00
Jason Herskowitz
f41872540d
Tweak recently played icon to give more padding
2012-03-24 20:23:20 -04:00
Leo Franchi
4dabbdf247
Disable ref work for now
2012-03-24 17:57:36 -04:00
Leo Franchi
4392e34882
Notify of tracks inserted also when dropped on sidebar item
2012-03-24 16:22:27 -04:00
Leo Franchi
aec6b557a6
fix adding hopefully
2012-03-23 18:38:29 -04:00
Leo Franchi
dddeb9e9a7
Some tomahawk-side fixes to playlist syncing. Removing works, adding not yet.
2012-03-23 18:11:36 -04:00
Jeff Mitchell
3c485949b6
Major restructuring to how ACLs will work. Disable dialog box again, for
...
now.
2012-03-22 17:57:57 -04:00
Leo Franchi
27978e5cd3
Now that vlc plugins are in Frameworks/vlc/plugins, we can rename plugins to PlugIns to retain case-sensitive compatibility on osx
2012-03-22 14:39:20 -04:00
Leo Franchi
fa49dde51a
Merge remote-tracking branch 'origin/master' into spotifyplaylists
2012-03-22 10:36:45 -04:00
Leo Franchi
6d56d4350a
Merge branch 'master' into spotifyplaylists
...
Conflicts:
src/libtomahawk/playlist.cpp
src/libtomahawk/playlist.h
2012-03-22 10:36:34 -04:00
Jeff Mitchell
a4ff57fafb
Add some safety...since m_waitingForResolved won't die on an invalid object, use it to determine whether to disconnect, since there should be a 1:1 correlation
2012-03-20 14:40:54 -04:00
Jeff Mitchell
8fa4252fd6
Move the ACL check to Connection...hopefully this will work around a Qt socket crash
2012-03-20 12:48:46 -04:00
Leo Franchi
753e1b3c90
aFix crash in dragging artist, don't assume AlbumModel only contains albums as it's hacked to also contain artists.
...
(cherry picked from commit 68d541d2e8dc847c40f6782c65beb4e15ff6aa72)
2012-03-20 11:29:30 -04:00
Leo Franchi
68d541d2e8
aFix crash in dragging artist, don't assume AlbumModel only contains albums as it's hacked to also contain artists.
2012-03-20 11:28:45 -04:00
Leo Franchi
75e9deabc4
Fix test when timeout fails
2012-03-19 23:59:22 -04:00
Leo Franchi
d6c7e7f57b
Add WIP test login button for spotify
2012-03-19 23:55:44 -04:00
Leo Franchi
e828dadec8
All QSharedPointers used in different threads need deleteLater as custom deleter. This is some of them.
...
(cherry picked from commit e3f5605c4e04bd3e5dc55ccafeb2e6fb150cb1e5)
2012-03-19 22:24:41 -04:00
Leo Franchi
6e929986cb
A bit of extra safety
...
(cherry picked from commit 2a58d53145e066d307029757866d34c3cde2543a)
2012-03-19 22:22:28 -04:00
mack-t
e1b086e3a4
Add albumpos, discnumber and score information from tomahawk resolver
...
(cherry picked from commit 21eeab61d8e871f9d1b1dbb7540c274e6e8781d8)
2012-03-19 22:20:32 -04:00
Leo Franchi
27147a0140
Guard against null sharedptr that shouldn't be null anyway -.-
2012-03-19 22:20:07 -04:00
Leo Franchi
b8d3b3bc5f
TWK-768: Enable xmlconsole by adding an xmlconsole arg to the settings for an account
2012-03-19 22:19:03 -04:00
Leo Franchi
b18f926fa5
TWK-744: Add individual account toggles in factory wrapper delegate
2012-03-19 22:06:46 -04:00
Leo Franchi
bf0b104d27
Guard against null sharedptr that shouldn't be null anyway -.-
2012-03-19 21:25:38 -04:00
Leo Franchi
c0ab42021e
Make consistent name
2012-03-19 19:11:18 -04:00
Jeff Mitchell
4d77074c78
Reclaim copyrights
2012-03-19 16:58:15 -04:00