1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-30 21:52:27 +02:00

4230 Commits

Author SHA1 Message Date
Leo Franchi
907dad95e1 TWK-721: Don't flicker from officialtracks to supercollection tracks.
If the second infosystem albumtracks request comes back empty but the first one
came back with tracks, this is not a failure and so keep the official tracks
2012-03-30 12:09:59 -04:00
Leo Franchi
cdb70b05d2 Cleanups 2012-03-30 11:25:51 -04:00
Leo Franchi
565217a53a TWK-725: Some extra pointer safety 2012-03-30 10:42:11 -04:00
Christian Muehlhaeuser
bee6485475 * Fixed crash situation in AudioControls.
(cherry picked from commit a2bfd73d555ac1a8e8b6107bba4cee89a0ca701f)

Conflicts:

	src/audiocontrols.cpp
2012-03-30 10:31:07 -04:00
Christian Muehlhaeuser
ace18dfa1f * Prevent race condition.
(cherry picked from commit ebbedb2b991f1f02b862b91af14ad6eaa9574c70)
2012-03-30 10:30:29 -04:00
Christian Muehlhaeuser
95f1162b6e * Fixed cached resolving.
(cherry picked from commit bd098e3ff267dbe636192464683314679e1f225d)
2012-03-30 10:30:09 -04:00
Christian Muehlhaeuser
e5bdd2242f * Fixed race condition during resolving.
(cherry picked from commit b70114a22557be39d998b017fd82c4553a40bdfb)
2012-03-30 10:30:01 -04:00
Christian Muehlhaeuser
deb0eb819c * Fetch square covers from Last.fm.
(cherry picked from commit d5aed7b6df11634ea6d86691feea94e8a3462a36)
2012-03-30 10:29:48 -04:00
Jeff Mitchell
04864c7d79 Set scanning threads idle priority
(cherry picked from commit 5a57e285ec2a25fe71877a7828b87bb65a31cf3e)
2012-03-30 10:28:04 -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
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
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
Jason Herskowitz
f41872540d Tweak recently played icon to give more padding 2012-03-24 20:23:20 -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
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
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
Jeff Mitchell
4d77074c78 Reclaim copyrights 2012-03-19 16:58:15 -04:00
Jeff Mitchell
8ffd79d764 Move old code out of servent to acl registry; make ACL registry actually
do something.

Still needed: a page in settings to manage it
2012-03-19 15:53:15 -04:00
Jason Herskowitz
e0f60931f7 Make track title prominent information in Queue and make it match new charts and latest additions 2012-03-18 19:21:33 -04:00
Jason Herskowitz
5b1aa81d1d Make track title primary info in track charts and top loved and lighten text of secondary info. Muesli, like? 2012-03-18 18:30:13 -04:00
Jason Herskowitz
44a1adb922 Pretty up Recently Played widget on dashboard a bit by making played time/playee gray text 2012-03-18 17:50:21 -04:00
Leo Franchi
93c68b4ce1 Merge pull request #78 from mack-t/master
Pull additional information from tomahawk resolvers
2012-03-18 14:25:54 -07:00
mack-t
21eeab61d8 Add albumpos, discnumber and score information from tomahawk resolver 2012-03-18 16:20:57 -04:00
jeff
0c4ac584e4 Refactor ACLSystem into ACLRegistry, clean it up a lot 2012-03-18 15:08:43 -04:00
Jason Herskowitz
819623300d Use recently played icon for new recently played sidebar item 2012-03-18 13:36:29 -04:00