#include "safe_stringstream.h"
#include "raw_convert.h"
#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <iostream>
#include "i18n.h"
using std::cout;
using boost::shared_ptr;
-SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::path p)
- : Content (f, p)
- , SingleStreamAudioContent (f, p)
+SndfileContent::SndfileContent (shared_ptr<const Film> film, boost::filesystem::path p)
+ : Content (film, p)
+ , SingleStreamAudioContent (film, p)
{
}
-SndfileContent::SndfileContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
- : Content (f, node)
- , SingleStreamAudioContent (f, node, version)
- , _audio_length (node->number_child<int64_t> ("AudioLength"))
+SndfileContent::SndfileContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
+ : Content (film, node)
+ , SingleStreamAudioContent (film, node, version)
+ , _audio_length (node->number_child<Frame> ("AudioLength"))
{
}
/* XXX: more extensions */
string ext = f.extension().string();
transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
- return (ext == ".wav" || ext == ".aif" || ext == ".aiff");
+ return (ext == ".wav" || ext == ".w64" || ext == ".flac" || ext == ".aif" || ext == ".aiff");
}
void
DCPTime
SndfileContent::full_length () const
{
- shared_ptr<const Film> film = _film.lock ();
- DCPOMATIC_ASSERT (film);
- FrameRateChange const frc = film->active_frame_rate_change (position ());
+ FrameRateChange const frc (audio_video_frame_rate(), film()->video_frame_rate());
return DCPTime::from_frames (audio_length() / frc.speed_up, audio_stream()->frame_rate ());
}
-