ardour/livetrax
13
0
Fork 0
Code

Prevent failed reconfigurations on tracks with 0 inputs (#3709).

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8509 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-01-14 21:58:26 +00:00
parent 93b25e1f13
commit ae2314e4f9
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/route.h
View File

@ -447,7 +447,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
DataType _default_type;
FedBy _fed_by;
virtual ChanCount input_streams () const;
ChanCount input_streams () const;
protected:
virtual XMLNode& state(bool);

2
libs/ardour/ardour/track.h
View File

@ -164,8 +164,6 @@ class Track : public Route, public PublicDiskstream
TrackMode _mode;
bool _needs_butler;
ChanCount input_streams () const;
//private: (FIXME)
struct FreezeRecordProcessorInfo {
FreezeRecordProcessorInfo(XMLNode& st, boost::shared_ptr<Processor> proc)

12
libs/ardour/track.cc
View File

@ -361,18 +361,6 @@ Track::silent_roll (pframes_t nframes, framepos_t /*start_frame*/, framepos_t /*
return _diskstream->process (_session.transport_frame(), nframes, can_record, rec_monitors_input, need_butler);
}
ChanCount
Track::input_streams () const
{
ChanCount cc = _input->n_ports ();
if (cc.n_total() == 0 && _diskstream) {
return cc = _diskstream->n_channels();
}
return cc;
}
void
Track::set_diskstream (boost::shared_ptr<Diskstream> ds)
{