Leo Franchi
eddaec701b
Merge pull request #79 from krf/make-compile-on-arm
...
Make compile on arm
2012-03-30 15:23:45 -07:00
Kevin Funk
87086e5278
Make compile on ARM (related to breakpad)
...
Make breakpad optional, add options
Same for CrashReporter - both don't work on ARM.
2012-03-31 00:20:14 +02:00
Leo Franchi
9c5966000c
TWK-799: Don't set autoupdate when loading playlist view
2012-03-30 17:47:28 -04:00
Leo Franchi
b49d810f01
Merge branch 'stable'
...
Conflicts:
src/libtomahawk/CMakeLists.txt
src/libtomahawk/playlist/treemodel.cpp
src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h
src/tomahawkapp.cpp
2012-03-30 17:29:34 -04:00
Leo Franchi
79bfdec895
TWK-798: Start playing first resolvable track when double-clicking on a playlist item
2012-03-30 17:14:08 -04:00
Christian Muehlhaeuser
d8be1fa224
* Merged neycho's bg translation.
2012-03-30 23:00:37 +02:00
Leo Franchi
948a438ff2
Remove autoconnect hidden toggle
2012-03-30 15:01:38 -04:00
Leo Franchi
9f5215302c
various updater fixes
2012-03-30 14:32:01 -04:00
Leo Franchi
73d7ba03f5
TWK-815: Try using foreground text color when drawing grey bg, white on grey is hard to read
2012-03-30 13:34:48 -04:00
Leo Franchi
d623bbefc2
Fix crash on exit
2012-03-30 13:27:36 -04:00
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
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