You should have received a copy of the GNU General Public License
along with libdcp. If not, see <http://www.gnu.org/licenses/>.
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of portions of this program with the
+ OpenSSL library under certain conditions as described in each
+ individual source file, and distribute linked combinations
+ including the two.
+
+ You must obey the GNU General Public License in all respects
+ for all of the code used other than OpenSSL. If you modify
+ file(s) with this exception, you may extend this exception to your
+ version of the file(s), but you are not obligated to do so. If you
+ do not wish to do so, delete this exception statement from your
+ version. If you delete this exception statement from all source
+ files in the program, then also delete it here.
*/
#include "picture_asset.h"
#include "picture_asset_writer.h"
#include "dcp_assert.h"
#include "compose.hpp"
-#include "AS_DCP.h"
-#include "KM_fileio.h"
#include "j2k.h"
+#include <asdcp/AS_DCP.h>
+#include <asdcp/KM_fileio.h>
#include <libxml++/nodes/element.h>
#include <boost/filesystem.hpp>
#include <list>
#include <stdexcept>
-#include <iostream>
-#include <sstream>
using std::string;
-using std::ostream;
using std::list;
using std::vector;
using std::max;
-using std::stringstream;
using std::pair;
using std::make_pair;
-using std::istream;
-using std::cout;
using boost::shared_ptr;
using namespace dcp;
+/** Load a PictureAsset from a file */
PictureAsset::PictureAsset (boost::filesystem::path file)
: Asset (file)
, _intrinsic_duration (0)
}
-PictureAsset::PictureAsset (Fraction edit_rate)
- : _edit_rate (edit_rate)
+/** Create a new PictureAsset with a given edit rate and standard */
+PictureAsset::PictureAsset (Fraction edit_rate, Standard standard)
+ : MXF (standard)
+ , _edit_rate (edit_rate)
, _intrinsic_duration (0)
{
}
string
-PictureAsset::pkl_type (Standard standard) const
+PictureAsset::static_pkl_type (Standard standard)
{
switch (standard) {
case INTEROP:
DCP_ASSERT (false);
}
}
+
+string
+PictureAsset::pkl_type (Standard standard) const
+{
+ return static_pkl_type (standard);
+}