Yeah. If you merge one, then we can handle the conflicts and get back to you. I'd just ping the relevant discussion first to see if it's finalized.
> On Feb 24, 2020, at 8:48 PM, Miller Puckette <[email protected]> wrote: > > Sounds like, if one of the two is ready to merge, I should do taht one first > so that the other one can then more easily sync to it. Am I right that I > can just go on and merge the "double" PR soonish? 9I can do that before I > dive all the way into things). > > cheers > M > > On Mon, Feb 24, 2020 at 08:33:16PM +0100, Dan Wilcox wrote: >> I can say I have had a good look at the threading and have had to >> double/triple check things. >> >> Also, if there is a set of PRs you are interested in that might have >> conflicts together, IOhannes and I were thinking of merging them into a >> develop branch you could then more easily grab. Right now, I can think of >> the double and sound file branches. I tried to structure the sound file work >> to drop into the double branch but of course they touch he same files, so >> there are a few lines to fix between the two. >> >> enohp ym morf tnes >> ----------- >> Dan Wilcox >> danomatika.com >> robotcowboy.com >> >> >>> On Feb 24, 2020, at 5:51 PM, Miller Puckette <[email protected]> wrote: >>> >>> Cool. My (informal) plan is to merge updates first, then move on to your >>> soundfile I/O changes. (There, the main issue will be to try to make sure >>> it's >>> somehow kept threadsafe; I remember in th past having very-occasional >>> crashes >>> when I had made an innocuous assumption about threads before :) >>> >>> Miller >>> >>>> On Mon, Feb 24, 2020 at 01:14:31PM +0100, Dan Wilcox wrote: >>>> As a note, I will finalize the soundfile updates by then, if you want to >>>> take a look at them. >>>> >>>>> On Feb 24, 2020, at 12:00 PM, [email protected] wrote: >>>>> >>>>> Date: Sun, 23 Feb 2020 18:01:14 -0800 >>>>> From: Miller Puckette <[email protected] <mailto:[email protected]>> >>>>> To: Alexandre Torres Porres <[email protected] <mailto:[email protected]>> >>>>> Cc: pd-dev <[email protected] <mailto:[email protected]>> >>>>> Subject: Re: [PD-dev] PRs for 0.51 (was: macOS direct plist reading) >>>>> Message-ID: <[email protected] >>>>> <mailto:[email protected]>> >>>>> Content-Type: text/plain; charset=us-ascii >>>>> >>>>> Well, I didn't get through all the PRs in December (by a long shot) - and >>>>> my >>>>> next good block of time to work on this isn't til beginning of April. So >>>>> hopefully msometime this spring. >>>>> >>>>> cheers >>>>> Miller >>>> >>>> -------- >>>> Dan Wilcox >>>> @danomatika <http://twitter.com/danomatika> >>>> danomatika.com <http://danomatika.com/> >>>> robotcowboy.com <http://robotcowboy.com/> >>>> >>>> >>>> -------- Dan Wilcox @danomatika <http://twitter.com/danomatika> danomatika.com <http://danomatika.com/> robotcowboy.com <http://robotcowboy.com/>
_______________________________________________ Pd-dev mailing list [email protected] https://lists.puredata.info/listinfo/pd-dev
