ardour/livetrax
13
0
Fork 0
Code

Link error fixed. Stub functions filled in.

Browse Source 
git-svn-id: svn://localhost/trunk/ardour2@374 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Taybin Rutkin 2006-03-10 18:43:08 +00:00
parent 1e668dfaf2
commit 1e05b4389d
4 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/coreaudio_source.h
View File

@ -42,7 +42,6 @@ class CoreAudioSource : public ExternalSource {
mutable PBD::Lock _tmpbuf_lock;
void init (const string &str, bool build_peak);
jack_nframes_t read_unlocked (Sample *dst, jack_nframes_t start, jack_nframes_t cnt, char * workbuf) const;
};
}; /* namespace ARDOUR */

3
libs/ardour/ardour/externalsource.h
View File

@ -58,8 +58,7 @@ class ExternalSource : public Source {
uint16_t channel;
string _path;
virtual void init (const string &str, bool build_peak) = 0;
virtual jack_nframes_t read_unlocked (Sample *dst, jack_nframes_t start, jack_nframes_t cnt, char * workbuf) const;
jack_nframes_t read_unlocked (Sample *dst, jack_nframes_t start, jack_nframes_t cnt, char * workbuf) const;
};
}; /* namespace ARDOUR */

1
libs/ardour/ardour/sndfilesource.h
View File

@ -46,7 +46,6 @@ class SndFileSource : public ExternalSource {
mutable PBD::Lock _tmpbuf_lock;
void init (const string &str, bool build_peak);
jack_nframes_t read_unlocked (Sample *dst, jack_nframes_t start, jack_nframes_t cnt, char * workbuf) const;
};
}; /* namespace ARDOUR */

45
libs/ardour/externalsource.cc
View File

@ -90,18 +90,63 @@ ExternalSource::old_peak_path (string audio_path)
return peak_path (audio_path);
}
#ifdef HAVE_COREAUDIO
ExternalSource*
ExternalSource::create (const XMLNode& node)
{
ExternalSource* es = 0;
try {
es = new CoreAudioSource (node);
}
catch (failed_constructor& err) {
es = new SndFileSource (node);
}
es = new SndFileSource (node);
return es;
}
#else
ExternalSource*
ExternalSource::create (const XMLNode& node)
{
return new SndFileSource (node);
}
#endif // HAVE_COREAUDIO
#ifdef HAVE_COREAUDIO
ExternalSource*
ExternalSource::create (const string& idstr, bool build_peak)
{
ExternalSource* es = 0;
try {
es = new CoreAudioSource (idstr, build_peak);
}
catch (failed_constructor& err) {
es = new SndFileSource (idstr, build_peak);
}
return es;
}
#else
ExternalSource*
ExternalSource::create (const string& idstr, bool build_peak)
{
return new SndFileSource (idstr, build_peak);
}
#endif // HAVE_COREAUDIO
#ifdef HAVE_COREAUDIO
std::string
CFStringRefToStdString(CFStringRef stringRef)