[pulseaudio-discuss] [PATCH] Please review RAOP2 support :)

[Alexander E. Patrakov]

18.09.2014 19:44, Colin Leroy wrote:
> On Thu, 18 Sep 2014 19:37:49 +0600, "Alexander E. Patrakov"
> <patrakov at gmail.com> wrote:
>
>> Well, if you prefer to have them, then OK, let's have them (and only
>> them) at the beginning and only functional changes at the end. If
>> some patch adds badly-formatted code only to be fixed up later,
>> please squash the formatting fixup into the original patch.
>>
>>>
>>>> Also, you have some "unimplemented" stuff like AAC encoding. Could
>>>> you please remove it? We can always use ALAC, and already have a
>>>> presumably-working standalone "encoder" (that just slaps a header
>>>> with an is-not-compressed bit) implementation in
>>>> write_ALAC_data().
>>>
>>> Sure.
>>
>> Also forgot to say: some patches in the series look like fixups for
>> others. E.g. "raop: Add a MD5 hashing fuction" and "raop: Correct the
>> MD5 hashing helper function". I think it is a good idea to squash
>> such fixups.
>
> OK, I see what you mean. That means I probably have to start from
> pulseaudio/master, apply existing patches manually and commit them in a
> new form, without referencing the original raop2 branch. Is this
> OK ?

That would be perfect.

Git can do most of the job for you automatically, here is how:

git checkout raop2
git checkout -b raop2-v2
git rebase master

and then fix up the conflicts. In fact, there will be only one rather 
trivial conflict in src/modules/raop/raop_client.c where the code 
allocates something before the asserts.

Then "git rebase -i master" is your friend.

-- 
Alexander E. Patrakov