EXV_ENABLE_AUDIO_VIDEO.patch

Thomas Beutlich, 09 Sep 2014 12:00

Download (6.51 KB)

View differences:

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"
......
840 847
    }
841 848

  
842 849
}                                       // namespace Exiv2
850
#endif // EXV_ENABLE_AUDIO_VIDEO
src/image.cpp (working copy)
131 131
        { ImageType::tga,  newTgaInstance,  isTgaType,  amNone,      amNone,      amNone,      amNone      },
132 132
        { ImageType::bmp,  newBmpInstance,  isBmpType,  amNone,      amNone,      amNone,      amNone      },
133 133
        { ImageType::jp2,  newJp2Instance,  isJp2Type,  amReadWrite, amReadWrite, amReadWrite, amNone      },
134
#ifdef EXV_ENABLE_AUDIO_VIDEO
134 135
        { ImageType::qtime,newQTimeInstance,isQTimeType,amRead,      amNone,      amReadWrite, amNone      },
135 136
        { ImageType::riff, newRiffInstance, isRiffType, amRead,      amNone,      amReadWrite, amNone      },
136 137
        { ImageType::asf,  newAsfInstance,  isAsfType,  amNone,      amNone,      amRead,      amNone      },
137 138
        { ImageType::mkv,  newMkvInstance,  isMkvType,  amNone,      amNone,      amRead,      amNone      },
139
#endif // EXV_ENABLE_AUDIO_VIDEO
138 140
        // End of list marker
139 141
        { ImageType::none, 0,               0,          amNone,      amNone,      amNone,      amNone      }
140 142
    };
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"
......
997 1004
}
998 1005

  
999 1006
}                                       // namespace Exiv2
1007
#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
#ifdef EXV_ENABLE_AUDIO_VIDEO
99 100
    extern const XmpPropertyInfo xmpVideoInfo[];
100 101
    extern const XmpPropertyInfo xmpAudioInfo[];
102
#endif // EXV_ENABLE_AUDIO_VIDEO
101 103
    extern const XmpPropertyInfo xmpDwCInfo[];
102 104

  
103 105
    extern const XmpNsInfo xmpNsInfo[] = {
......
129 131
        { "http://ns.microsoft.com/photo/1.2/t/RegionInfo#", "MPRI",  xmpMicrosoftPhotoRegionInfoInfo, N_("Microsoft Photo RegionInfo schema")},
130 132
        { "http://ns.microsoft.com/photo/1.2/t/Region#",     "MPReg", xmpMicrosoftPhotoRegionInfo,     N_("Microsoft Photo Region schema")    },
131 133
        { "http://www.metadataworkinggroup.com/schemas/regions/", "mwg-rs", xmpMWGRegionsInfo,N_("Metadata Working Group Regions schema")     },
134
#ifdef EXV_ENABLE_AUDIO_VIDEO
132 135
        { "http://www.video",                                  "video",          xmpVideoInfo,     N_("XMP Extended Video schema")            },
133 136
        { "http://www.audio",                                  "audio",          xmpAudioInfo,     N_("XMP Extended Audio schema")            },
137
#endif // EXV_ENABLE_AUDIO_VIDEO
134 138
        { "http://rs.tdwg.org/dwc/index.htm",                     "dwc",            xmpDwCInfo,       N_("XMP Darwin Core schema")     		  },
135 139

  
136 140

  
......
994 998
        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
995 999
    };
996 1000

  
1001
#ifdef EXV_ENABLE_AUDIO_VIDEO
997 1002
    extern const XmpPropertyInfo xmpVideoInfo[] = {
998 1003
        { "Album",                  N_("Album"),                            "Text",                     xmpText, xmpExternal, N_("The name of the album.")   },
999 1004
        { "ArchivalLocation",       N_("Archival Location"),                "Text",                     xmpText, xmpExternal, N_("Information about the Archival Location.")   },
......
1387 1392
        { "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.")   },
1388 1393
        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
1389 1394
    };
1395
#endif // EXV_ENABLE_AUDIO_VIDEO
1390 1396

  
1391 1397
   extern const XmpPropertyInfo xmpDwCInfo[] = {
1392 1398

  
src/quicktimevideo.cpp (working copy)
32 32

  
33 33
// *****************************************************************************
34 34
// included header files
35
#ifdef _MSC_VER
36
# include "exv_msvc.h"
37
#else
38
# include "exv_conf.h"
39
#endif
40

  
41
#ifdef EXV_ENABLE_AUDIO_VIDEO
35 42
#include "quicktimevideo.hpp"
36 43
#include "futils.hpp"
37 44
#include "basicio.hpp"
......
2911 2918
    return matched;
2912 2919
} // isQTimeType
2913 2920
} // namespace Exiv2
2921
#endif // EXV_ENABLE_AUDIO_VIDEO
src/riffvideo.cpp (working copy)
32 32

  
33 33
// *****************************************************************************
34 34
// included header files
35
#ifdef _MSC_VER
36
# include "exv_msvc.h"
37
#else
38
# include "exv_conf.h"
39
#endif
40

  
41
#ifdef EXV_ENABLE_AUDIO_VIDEO
35 42
#include "riffvideo.hpp"
36 43
#include "futils.hpp"
37 44
#include "basicio.hpp"
......
1884 1891
    return matched;
1885 1892
}
1886 1893
}                                       // namespace Exiv2
1887

  
1894
#endif // EXV_ENABLE_AUDIO_VIDEO
Redmine Appliance - Powered by TurnKey Linux