Feature #733 » EXV_ENABLE_AUDIO_VIDEO.patch
msvc/include/exv_msvc.h (working copy) | ||
---|---|---|
61 | 61 | |
62 | 62 |
#endif /* !EXV_COMMERCIAL_VERSION */ |
63 | 63 | |
64 |
/* Define to 1 to enable audio/video metadata support. */ |
|
65 |
# undef EXV_ENABLE_AUDIO_VIDEO |
|
66 | ||
64 | 67 |
/* Define to 1 if you have the `iconv' function. */ |
65 | 68 |
# undef EXV_HAVE_ICONV |
66 | 69 |
src/asfvideo.cpp (working copy) | ||
---|---|---|
31 | 31 | |
32 | 32 |
// ***************************************************************************** |
33 | 33 |
// included header files |
34 |
#ifdef _MSC_VER |
|
35 |
# include "exv_msvc.h" |
|
36 |
#else |
|
37 |
# include "exv_conf.h" |
|
38 |
#endif |
|
39 | ||
40 |
#ifdef EXV_ENABLE_AUDIO_VIDEO |
|
34 | 41 |
#include "asfvideo.hpp" |
35 | 42 |
#include "futils.hpp" |
36 | 43 |
#include "basicio.hpp" |
... | ... | |
815 | 822 |
} |
816 | 823 | |
817 | 824 |
} // namespace Exiv2 |
825 |
#endif // EXV_ENABLE_AUDIO_VIDEO |
src/image.cpp (working copy) | ||
---|---|---|
60 | 60 |
#include "tgaimage.hpp" |
61 | 61 |
#include "bmpimage.hpp" |
62 | 62 |
#include "jp2image.hpp" |
63 |
#ifdef EXV_ENABLE_AUDIO_VIDEO |
|
63 | 64 |
#include "matroskavideo.hpp" |
64 | 65 |
#include "quicktimevideo.hpp" |
65 | 66 |
#include "riffvideo.hpp" |
66 | 67 |
#include "asfvideo.hpp" |
68 |
#endif // EXV_ENABLE_AUDIO_VIDEO |
|
67 | 69 |
#include "rw2image.hpp" |
68 | 70 |
#include "pgfimage.hpp" |
69 | 71 |
#include "xmpsidecar.hpp" |
... | ... | |
131 | 133 |
{ ImageType::tga, newTgaInstance, isTgaType, amNone, amNone, amNone, amNone }, |
132 | 134 |
{ ImageType::bmp, newBmpInstance, isBmpType, amNone, amNone, amNone, amNone }, |
133 | 135 |
{ ImageType::jp2, newJp2Instance, isJp2Type, amReadWrite, amReadWrite, amReadWrite, amNone }, |
136 |
#ifdef EXV_ENABLE_AUDIO_VIDEO |
|
134 | 137 |
{ ImageType::qtime,newQTimeInstance,isQTimeType,amRead, amNone, amRead, amNone }, |
135 | 138 |
{ ImageType::riff, newRiffInstance, isRiffType, amRead, amNone, amRead, amNone }, |
136 | 139 |
{ ImageType::asf, newAsfInstance, isAsfType, amNone, amNone, amRead, amNone }, |
137 | 140 |
{ ImageType::mkv, newMkvInstance, isMkvType, amNone, amNone, amRead, amNone }, |
138 |
// End of list marker |
|
141 |
#endif // EXV_ENABLE_AUDIO_VIDEO |
|
142 |
// End of list marker |
|
139 | 143 |
{ ImageType::none, 0, 0, amNone, amNone, amNone, amNone } |
140 | 144 |
}; |
141 | 145 |
src/matroskavideo.cpp (working copy) | ||
---|---|---|
31 | 31 | |
32 | 32 |
// ***************************************************************************** |
33 | 33 |
// included header files |
34 |
#ifdef _MSC_VER |
|
35 |
# include "exv_msvc.h" |
|
36 |
#else |
|
37 |
# include "exv_conf.h" |
|
38 |
#endif |
|
39 | ||
40 |
#ifdef EXV_ENABLE_AUDIO_VIDEO |
|
34 | 41 |
#include "matroskavideo.hpp" |
35 | 42 |
#include "futils.hpp" |
36 | 43 |
#include "basicio.hpp" |
... | ... | |
760 | 767 |
} |
761 | 768 | |
762 | 769 |
} // namespace Exiv2 |
770 |
#endif // EXV_ENABLE_AUDIO_VIDEO |
src/properties.cpp (working copy) | ||
---|---|---|
96 | 96 |
extern const XmpPropertyInfo xmpMicrosoftPhotoRegionInfoInfo[]; |
97 | 97 |
extern const XmpPropertyInfo xmpMicrosoftPhotoRegionInfo[]; |
98 | 98 |
extern const XmpPropertyInfo xmpMWGRegionsInfo[]; |
99 |
extern const XmpPropertyInfo xmpVideoInfo[]; |
|
99 |
#ifdef EXV_ENABLE_AUDIO_VIDEO |
|
100 |
extern const XmpPropertyInfo xmpVideoInfo[]; |
|
100 | 101 |
extern const XmpPropertyInfo xmpAudioInfo[]; |
101 | ||
102 |
#endif // EXV_ENABLE_AUDIO_VIDEO |
|
102 | 103 |
extern const XmpNsInfo xmpNsInfo[] = { |
103 | 104 |
// Schemas - NOTE: Schemas which the XMP-SDK doesn't know must be registered in XmpParser::initialize - Todo: Automate this |
104 | 105 |
{ "http://purl.org/dc/elements/1.1/", "dc", xmpDcInfo, N_("Dublin Core schema") }, |
... | ... | |
128 | 129 |
{ "http://ns.microsoft.com/photo/1.2/t/RegionInfo#", "MPRI", xmpMicrosoftPhotoRegionInfoInfo, N_("Microsoft Photo RegionInfo schema")}, |
129 | 130 |
{ "http://ns.microsoft.com/photo/1.2/t/Region#", "MPReg", xmpMicrosoftPhotoRegionInfo, N_("Microsoft Photo Region schema") }, |
130 | 131 |
{ "http://www.metadataworkinggroup.com/schemas/regions/", "mwg-rs", xmpMWGRegionsInfo,N_("Metadata Working Group Regions schema") }, |
131 |
{ "http://www.video", "video", xmpVideoInfo, N_("XMP Extended Video schema") }, |
|
132 |
#ifdef EXV_ENABLE_AUDIO_VIDEO |
|
133 |
{ "http://www.video", "video", xmpVideoInfo, N_("XMP Extended Video schema") }, |
|
132 | 134 |
{ "http://www.audio", "audio", xmpAudioInfo, N_("XMP Extended Audio schema") }, |
135 |
#endif //EXV_ENABLE_AUDIO_VIDEO |
|
133 | 136 | |
134 | ||
135 | 137 |
// Structures |
136 | 138 |
{ "http://ns.adobe.com/xap/1.0/g/", "xapG", 0, N_("Colorant structure") }, |
137 | 139 |
{ "http://ns.adobe.com/xap/1.0/sType/Dimensions#", "stDim", 0, N_("Dimensions structure") }, |
... | ... | |
991 | 993 |
{ 0, 0, 0, invalidTypeId, xmpInternal, 0 } |
992 | 994 |
}; |
993 | 995 | |
994 |
extern const XmpPropertyInfo xmpVideoInfo[] = { |
|
996 |
#ifdef EXV_ENABLE_AUDIO_VIDEO |
|
997 |
extern const XmpPropertyInfo xmpVideoInfo[] = { |
|
995 | 998 |
{ "Album", N_("Album"), "Text", xmpText, xmpExternal, N_("The name of the album.") }, |
996 | 999 |
{ "ArchivalLocation", N_("Archival Location"), "Text", xmpText, xmpExternal, N_("Information about the Archival Location.") }, |
997 | 1000 |
{ "Arranger", N_("Arranger"), "Text", xmpText, xmpExternal, N_("Information about the Arranger.") }, |
... | ... | |
1384 | 1387 |
{ "VendorID", N_("Vendor ID"), "Text", xmpText, xmpExternal, N_("A 32-bit integer that specifies the developer of the compressor that generated the compressed data. Often this field contains 'appl' to indicate Apple Computer, Inc.") }, |
1385 | 1388 |
{ 0, 0, 0, invalidTypeId, xmpInternal, 0 } |
1386 | 1389 |
}; |
1390 |
#endif EXV_ENABLE_AUDIO_VIDEO |
|
1387 | 1391 | |
1388 |
extern const XmpPrintInfo xmpPrintInfo[] = {
|
|
1392 |
extern const XmpPrintInfo xmpPrintInfo[] = {
|
|
1389 | 1393 |
{"Xmp.crs.CropUnits", EXV_PRINT_TAG(crsCropUnits) }, |
1390 | 1394 |
{"Xmp.exif.ApertureValue", print0x9202 }, |
1391 | 1395 |
{"Xmp.exif.BrightnessValue", printFloat }, |
src/quicktimevideo.cpp (working copy) | ||
---|---|---|
31 | 31 | |
32 | 32 |
// ***************************************************************************** |
33 | 33 |
// included header files |
34 |
#ifdef _MSC_VER |
|
35 |
# include "exv_msvc.h" |
|
36 |
#else |
|
37 |
# include "exv_conf.h" |
|
38 |
#endif |
|
39 | ||
40 |
#ifdef EXV_ENABLE_AUDIO_VIDEO |
|
34 | 41 |
#include "quicktimevideo.hpp" |
35 | 42 |
#include "futils.hpp" |
36 | 43 |
#include "basicio.hpp" |
... | ... | |
1649 | 1656 |
} |
1650 | 1657 | |
1651 | 1658 |
} // namespace Exiv2 |
1652 | ||
1659 |
#endif // EXV_ENABLE_AUDIO_VIDEO |
src/riffvideo.cpp (working copy) | ||
---|---|---|
31 | 31 | |
32 | 32 |
// ***************************************************************************** |
33 | 33 |
// included header files |
34 |
#ifdef _MSC_VER |
|
35 |
# include "exv_msvc.h" |
|
36 |
#else |
|
37 |
# include "exv_conf.h" |
|
38 |
#endif |
|
39 | ||
40 |
#ifdef EXV_ENABLE_AUDIO_VIDEO |
|
34 | 41 |
#include "riffvideo.hpp" |
35 | 42 |
#include "futils.hpp" |
36 | 43 |
#include "basicio.hpp" |
... | ... | |
1245 | 1252 |
} |
1246 | 1253 | |
1247 | 1254 |
} // namespace Exiv2 |
1255 |
#endif // EXV_ENABLE_AUDIO_VIDEO |