[Tomahawk Integration] GSoC Report

2012-08-04 Thread Lucas Lira Gomes
Hi everyone, I finally managed to make Tomahawk's playlists available in Amarok. Now, It's time to give the ability, for Tomahawk, to do the same with Amarok's playlists. In spite of that, lets clarify some details first. When a new peer connects, Amarok simply shows the playlist along with the o

Re: [Tomahawk Integration] GSoC Report

2012-08-03 Thread Teo Mrnjavac
On Sat, Aug 4, 2012 at 4:24 AM, Lucas Lira Gomes wrote: > Hi everyone, > > I finally managed to make Tomahawk's playlists available in Amarok. Now, > It's time to give the ability, for Tomahawk, to do the same with Amarok's > playlists. > > In spite of that, lets clarify some details first. When a

Re: [Tomahawk Integration] GSoC Report

2012-07-26 Thread Teo Mrnjavac
On Thu, Jul 26, 2012 at 5:39 AM, Lucas Lira Gomes wrote: > Hi everyone, > > the loading times for big collections has hugely improved. > Bart's idea to get rid of MemoryMeta in favour of a custom QueryMaker really > solved our problems. > I also removed the need to use the Tomahawk's ViewManager i

[Tomahawk Integration] GSoC Report

2012-07-25 Thread Lucas Lira Gomes
Hi everyone, the loading times for big collections has hugely improved. Bart's idea to get rid of MemoryMeta in favour of a custom QueryMaker really solved our problems. I also removed the need to use the Tomahawk's ViewManager in Amarok. The less indirection the better ^^. >From now on, I'll be f

Re: [Tomahawk Integration] GSoC Report (plus: RFC on git work-flow guideline)

2012-07-13 Thread Bart Cerneels
This command is mandatory for all amarok developers: git config branch.master.rebase true the result of this is that all "git pull" commands will do a rebase rather then a merge. Your local commits will be rewritten (parented to origin/master). The prevents the git log to become unreadable because

Re: RFC on git work-flow guideline (was: [Tomahawk Integration] GSoC Report)

2012-07-11 Thread Myriam Schweingruber
Hi all, On Tue, Jul 10, 2012 at 3:01 PM, Matěj Laitl wrote: > On 10. 7. 2012 Edward Toroshchin wrote: >> G'day, >> >> On Tue, Jul 10, 2012 at 01:25:59PM +0200, Matěj Laitl wrote: >> > I've checked above repo and the master branch there is polluted with many >> > Merge branch 'master' of git://ano

Re: RFC on git work-flow guideline (was: [Tomahawk Integration] GSoC Report)

2012-07-10 Thread Edward Toroshchin
> Agreed. And hey, I didn't know about merge.conflictstyle, that'll make my > life > much easier, thanks! Anytime! Try also kdiff3 as mergetool. -- Edward "Hades" Toroshchin dr_lepper on irc.freenode.org ___ Amarok-devel mailing list Amarok-devel@kde

Re: RFC on git work-flow guideline (was: [Tomahawk Integration] GSoC Report)

2012-07-10 Thread Matěj Laitl
On 10. 7. 2012 Edward Toroshchin wrote: > On Tue, Jul 10, 2012 at 03:01:06PM +0200, Matěj Laitl wrote: > > E.g. `git push` without --rebase in master may still be correct if you > > don't have own commits so that it results in fast-forward, that's what I > > wanted to say. > > I see. There is actu

Re: RFC on git work-flow guideline (was: [Tomahawk Integration] GSoC Report)

2012-07-10 Thread Edward Toroshchin
On Tue, Jul 10, 2012 at 03:01:06PM +0200, Matěj Laitl wrote: > Lucas' repo looks like it has no his own commits in master. Therefore I > wanted > to say: Shouldn't all his `git pull git://anongit.kde.org/amarok master` > commands performed in his master branch have resulted in fast-forwards? (th

RFC on git work-flow guideline (was: [Tomahawk Integration] GSoC Report)

2012-07-10 Thread Matěj Laitl
On 10. 7. 2012 Edward Toroshchin wrote: > G'day, > > On Tue, Jul 10, 2012 at 01:25:59PM +0200, Matěj Laitl wrote: > > I've checked above repo and the master branch there is polluted with many > > Merge branch 'master' of git://anongit.kde.org/amarok commits. Shouldn't > > all these be fast-forward

Re: [Tomahawk Integration] GSoC Report (plus: RFC on git work-flow guideline)

2012-07-10 Thread Edward Toroshchin
G'day, On Tue, Jul 10, 2012 at 01:25:59PM +0200, Matěj Laitl wrote: > I've checked above repo and the master branch there is polluted with many > Merge branch 'master' of git://anongit.kde.org/amarok commits. Shouldn't all > these be fast-forwards? "Merge" and "fast-forward" are not antonyms. W

Re: [Tomahawk Integration] GSoC Report (plus: RFC on git work-flow guideline)

2012-07-10 Thread Matěj Laitl
On 9. 7. 2012 Lucas Lira Gomes wrote: > Hi everyone, Hi Lucas, > My amarok repo: > http://quickgit.kde.org/index.php?p=clones%2Famarok%2Fgomes%2Fmaskmaster-ama > rok.git&a=summary (tomahawk > branch) I've checked above repo and the master branch there is polluted with many Merge branch 'master'

Re: [Tomahawk Integration] GSoC Report

2012-07-09 Thread Teo Mrnjavac
On Mon, Jul 9, 2012 at 11:15 PM, Lucas Lira Gomes wrote: > Hi everyone, > > i've been fixing bugs and improving overall performance of the tomahawk > service. It's a bit lazy to load big collections(50k tracks) and I haven't > figured yet how I can make its loading faster. And yes, I'm running tra

Re: [Tomahawk Integration] GSoC Report

2012-07-09 Thread Bart Cerneels
On Mon, Jul 9, 2012 at 11:15 PM, Lucas Lira Gomes wrote: > Hi everyone, > > i've been fixing bugs and improving overall performance of the tomahawk > service. It's a bit lazy to load big collections(50k tracks) and I haven't > figured yet how I can make its loading faster. And yes, I'm running tra

[Tomahawk Integration] GSoC Report

2012-07-09 Thread Lucas Lira Gomes
Hi everyone, i've been fixing bugs and improving overall performance of the tomahawk service. It's a bit lazy to load big collections(50k tracks) and I haven't figured yet how I can make its loading faster. And yes, I'm running track loading and removal in the background using Threadweaver jobs. B

Re: [Tomahawk Integration] GSoC Report

2012-06-27 Thread Teo Mrnjavac
On Wed, Jun 27, 2012 at 4:09 AM, Lucas Lira Gomes wrote: > Hi everyone, > > Last two weeks weren’t the most productive of all, since some tests and a > project consumed a lot of my time. > In spite of that, I finally managed to play tomahawk streams in Amarok. To > query others collections is work

[Tomahawk Integration] GSoC Report

2012-06-26 Thread Lucas Lira Gomes
Hi everyone, Last two weeks weren’t the most productive of all, since some tests and a project consumed a lot of my time. In spite of that, I finally managed to play tomahawk streams in Amarok. To query others collections is working too. For those curious, tomahawk service is using capabilities, s