# HG changeset patch # User Chris Cannam # Date 1144835980 0 # Node ID 2beca8ddcdc37eb632bb293acd1fcc094b51f357 # Parent af2725b5d6fefba58b986b1a8e590a7299a3bf06 * Add BZipFileDevice to handle bzip2 compress/uncompress without all that ugly code in MainWindow.cpp * Remove all that ugly code in MainWindow.cpp and replace with uses of BZipFileDevice * Fix layer import/export for SV XML layers * and a few other minor fixes diff -r af2725b5d6fe -r 2beca8ddcdc3 base/Layer.cpp --- a/base/Layer.cpp Mon Apr 10 17:22:59 2006 +0000 +++ b/base/Layer.cpp Wed Apr 12 09:59:40 2006 +0000 @@ -70,10 +70,10 @@ s += indent; s += QString("\n") - .arg(LayerFactory::instance()->getLayerTypeName - (LayerFactory::instance()->getLayerType(this))) + .arg(encodeEntities(LayerFactory::instance()->getLayerTypeName + (LayerFactory::instance()->getLayerType(this)))) .arg(getObjectExportId(this)) - .arg(objectName()) + .arg(encodeEntities(objectName())) .arg(getObjectExportId(getModel())) .arg(extraAttributes); diff -r af2725b5d6fe -r 2beca8ddcdc3 base/Model.cpp --- a/base/Model.cpp Mon Apr 10 17:22:59 2006 +0000 +++ b/base/Model.cpp Wed Apr 12 09:59:40 2006 +0000 @@ -40,7 +40,7 @@ s += QString("\n") .arg(getObjectExportId(this)) - .arg(objectName()) + .arg(encodeEntities(objectName())) .arg(getSampleRate()) .arg(getStartFrame()) .arg(getEndFrame()) diff -r af2725b5d6fe -r 2beca8ddcdc3 transform/TransformFactory.cpp --- a/transform/TransformFactory.cpp Mon Apr 10 17:22:59 2006 +0000 +++ b/transform/TransformFactory.cpp Wed Apr 12 09:59:40 2006 +0000 @@ -423,8 +423,9 @@ getTransformUnits(name), output.toInt()); } else { - std::cerr << "TransformFactory::createTransform: Unknown transform " - << name.toStdString() << std::endl; + std::cerr << "TransformFactory::createTransform: Unknown transform \"" + << name.toStdString() << "\"" << std::endl; + return transform; } if (start && transform) transform->start();