So, I've been spending some time not being paid for working on Ardour, but it seems I just can't keep my hands off it...

After quite a bit of changes from the 2.X branch were merged into the 3.0 branch, it was time to merge my Summercode stuff there also. Merging my stuff was mostly pain free, but the 2.X merge seemed to be more problematic. libsndfile was removed from the source tree, but a pre-release version has to be used. Unfortunately, to have Ogg Vorbis support, you need to also get a svn version of Vorbis.

Today I also committed my session merging code, which is capable of merging regions, playlists, locations and the tempo map from external sessions. The GUI still needs work, and tracks is definitely something that should still be implemented.

Ardour's 3.0 branch in general is a bit messy at the moment. One big problem is memory corruption, which we haven't been able to diagnose yet. Some people say things work fine, but other have problems all over the place. Hopefully this will be solved soon.

Most development has moved to 3.0, as commits done to 2.X have to be committed to 3.0 also. That means no more merges to break things ;)