Hello Tom,

Looks like some kind of conflict was committed to the codebase for 
src/gui/seqmanager/ChannelManager.h:
<<<<<<< variant A
  void insertChannelSetup(MappedEventList &mC,
                          RosegardenDocument *doc,
                          Segment *s, RealTime start);
>>>>>>> variant B
  void insertChannelSetup(MappedEventList &mC, RealTime start,
                          MapperFunctionality *functionality);
####### Ancestor
======= end


--- On Mon, 1/30/12, Julie S <[email protected]> wrote:

> From: Julie S <[email protected]>
> Subject: [Rosegarden-devel] Trouble building logical instrument branch
> To: "Tom Breton (Tehom)" <[email protected]>
> Cc: [email protected]
> Date: Monday, January 30, 2012, 11:21 PM
> Hello Tom,
> 
> I get this error when trying to build from svn:
> make: *** No rule to make target
> `data/examples/logical-segments-2.rg', needed by
> `data/data.cpp'.  Stop.
> 
> make: *** No rule to make target
> `data/examples/logical-segments-3.rg', needed by
> `data/data.cpp'.  Stop.
> 
> I went ahead and bypassed this by adding the files (a dummy
> files) to the directory.  I think this file is missing
> from the repository or a config file needs updated.
> 
> Sincerely,
> Julie S.
> 
> --- On Mon, 1/30/12, Tom Breton (Tehom) <[email protected]>
> wrote:
> 
> > From: Tom Breton (Tehom) <[email protected]>
> > Subject: Re: [Rosegarden-devel] Logical instruments
> save and restore fixed channels now
> > To: "D. Michael McIntyre" <[email protected]>
> > Cc: [email protected]
> > Date: Monday, January 30, 2012, 12:38 PM
> > > On Saturday, January 28, 2012,
> > Tom Breton (Tehom) wrote:
> > >
> > >> Julie, I know that GM2 can support multiple
> > percussion channels, but I
> > >> have been unable to find out how to switch
> that on
> > and off.
> > >
> > > Even if you knew, that would only work for GM2
> devices,
> > and you can't
> > > assume
> > > that's what somebody has.  There would have to
> be
> > some way to specify, and
> > > we'd have to update 150 odd device definitions,
> mostly
> > for obscure one-off
> > > hardware nobody else ever heard of, which we'd
> have to
> > try to look up, and
> > > come up with incorrect results much of the time.
> > >
> > > I don't think it could possibly be worth it,
> > personally.
> > 
> > Thanks for the info.  I agree, I don't feel it would
> be
> > worth it either. 
> > Now I'm just trying to tie up the loose ends of what
> I've
> > done already.
> > 
> > If someone else does want to tackle it, I have to
> amend
> > something I just
> > said.  My code should be able to cope (that's hope
> > talking) if two things
> > are done:
> > 
> >  * make MidiDevice::isPercussionNumber smarter
> >  * kick auto instruments off every channel whose
> meaning
> > changed (Have
> > AllocateChannels emit sigVacateChannel).  They'll
> find
> > new homes.
> > 
> >     Tom Breton (Tehom)
> > 
> > 
> > 
> >
> ------------------------------------------------------------------------------
> > Try before you buy = See our experts in action!
> > The most comprehensive online learning library for
> Microsoft
> > developers
> > is just $99.99! Visual Studio, SharePoint, SQL - plus
> HTML5,
> > CSS3, MVC3,
> > Metro Style Apps, more. Free future releases when you
> > subscribe now!
> > http://p.sf.net/sfu/learndevnow-dev2
> > _______________________________________________
> > Rosegarden-devel mailing list
> > [email protected]
> > - use the link below to unsubscribe
> > https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
> > 
> 
> ------------------------------------------------------------------------------
> Keep Your Developer Skills Current with LearnDevNow!
> The most comprehensive online learning library for Microsoft
> developers
> is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5,
> CSS3, MVC3,
> Metro Style Apps, more. Free future releases when you
> subscribe now!
> http://p.sf.net/sfu/learndevnow-d2d
> _______________________________________________
> Rosegarden-devel mailing list
> [email protected]
> - use the link below to unsubscribe
> https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
> 

------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Rosegarden-devel mailing list
[email protected] - use the link below to unsubscribe
https://lists.sourceforge.net/lists/listinfo/rosegarden-devel

Reply via email to