update MediaInfoLib to v0.7.60 r5042 and ZenLib to v0.4.28 r403

1 files changed, 275 insertions, 256 deletions

diff --git a/include/MediaInfoDLL.h b/include/MediaInfoDLL.h
index d9a837ac7..888b36240 100644
--- a/include/MediaInfoDLL.h
+++ b/include/MediaInfoDLL.h
@@ -1,5 +1,5 @@
 /* MediaInfoDLL - All info about media files, for DLL

-// Copyright (C) 2002-2009 Jerome Martinez, Zen@MediaArea.net

+// Copyright (C) 2002-2012 Jerome Martinez, Zen@MediaArea.net

 //

 // This library is free software: you can redistribute it and/or modify it

 // under the terms of the GNU Library General Public License as published by

@@ -74,9 +74,9 @@
 

 /*---------------------------------------------------------------------------*/

 /*Unix (Linux, HP, Sun, BeOS...)*/

-#if defined(UNIX) || defined(_UNIX) || defined(__UNIX__) \

-    || defined(__unix) || defined(__unix__) \

-    || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) \

+#if defined(UNIX) || defined(_UNIX) || defined(__UNIX__)                    \

+    || defined(__unix) || defined(__unix__)                                 \

+    || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi)        \

     || defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) \

     || defined(__EMX__) || defined(__VMS) || defined(__BEOS__)

     #ifndef UNIX

@@ -130,22 +130,22 @@
 /*-------------------------------------------------------------------------*/

 #if defined (_WIN32) || defined (WIN32)

     #ifdef _UNICODE

-        #define MEDIAINFODLL_NAME  L"MediaInfo.dll"

+        #define MEDIAINFODLL_NAME L"MediaInfo.dll"

     #else //_UNICODE

-        #define MEDIAINFODLL_NAME  "MediaInfo.dll"

+        #define MEDIAINFODLL_NAME "MediaInfo.dll"

     #endif //_UNICODE

 #elif defined(__APPLE__) && defined(__MACH__)

-    #define MEDIAINFODLL_NAME  "libmediainfo.0.dylib"

+    #define MEDIAINFODLL_NAME "libmediainfo.0.dylib"

     #define __stdcall

 #else

-    #define MEDIAINFODLL_NAME  "libmediainfo.so.0"

+    #define MEDIAINFODLL_NAME "libmediainfo.so.0"

     #define __stdcall

 #endif //!defined(_WIN32) || defined (WIN32)

 

 /*-------------------------------------------------------------------------*/

 /*Char types                                                               */

 #undef  __T

-#define __T(__x)     __T(__x)

+#define __T(__x)    __T(__x)

 #if defined(UNICODE) || defined (_UNICODE)

     typedef wchar_t MediaInfo_Char;

     #undef  __T

@@ -161,7 +161,7 @@
 

 /*-------------------------------------------------------------------------*/

 /*8-bit int                                                                */

-typedef unsigned char       MediaInfo_int8u;

+typedef unsigned char MediaInfo_int8u;

 /*-------------------------------------------------------------------------*/

 

 /*-------------------------------------------------------------------------*/

@@ -169,26 +169,25 @@ typedef unsigned char       MediaInfo_int8u;
 #if defined(__MINGW32__) || defined(__CYGWIN32__) || defined(__UNIX__) || defined(__MACOSX__)

     #undef  MAXTYPE_INT

     #define MAXTYPE_INT 64

-    typedef unsigned long long  MediaInfo_int64u;

+    typedef unsigned long long MediaInfo_int64u;

 #elif defined(__WIN32__) || defined(_WIN32)

     #undef  MAXTYPE_INT

     #define MAXTYPE_INT 64

-    typedef unsigned __int64    MediaInfo_int64u;

+    typedef unsigned __int64   MediaInfo_int64u;

 #else

     #pragma message This machine has no 64-bit integer type?

 #endif

 /*-------------------------------------------------------------------------*/

 

 /*-------------------------------------------------------------------------*/

-/*NULL                                                                      */

+/*NULL                                                                     */

 #ifndef NULL

     #define NULL 0

 #endif

 /*-------------------------------------------------------------------------*/

 

 /** @brief Kinds of Stream */

-typedef enum MediaInfo_stream_t

-{

+typedef enum MediaInfo_stream_t {

     MediaInfo_Stream_General,

     MediaInfo_Stream_Video,

     MediaInfo_Stream_Audio,

@@ -200,8 +199,7 @@ typedef enum MediaInfo_stream_t
 } MediaInfo_stream_C;

 

 /** @brief Kinds of Info */

-typedef enum MediaInfo_info_t

-{

+typedef enum MediaInfo_info_t {

     MediaInfo_Info_Name,

     MediaInfo_Info_Text,

     MediaInfo_Info_Measure,

@@ -214,8 +212,7 @@ typedef enum MediaInfo_info_t
 } MediaInfo_info_C;

 

 /** @brief Option if InfoKind = Info_Options */

-typedef enum MediaInfo_infooptions_t

-{

+typedef enum MediaInfo_infooptions_t {

     MediaInfo_InfoOption_ShowInInform,

     MediaInfo_InfoOption_Reserved,

     MediaInfo_InfoOption_ShowInSupported,

@@ -224,12 +221,11 @@ typedef enum MediaInfo_infooptions_t
 } MediaInfo_infooptions_C;

 

 /** @brief File opening options */

-typedef enum MediaInfo_fileoptions_t

-{

-    MediaInfo_FileOption_Nothing        =0x00,

-    MediaInfo_FileOption_NoRecursive    =0x01,

-    MediaInfo_FileOption_CloseAll       =0x02,

-    MediaInfo_FileOption_Max            =0x04

+typedef enum MediaInfo_fileoptions_t {

+    MediaInfo_FileOption_Nothing     = 0x00,

+    MediaInfo_FileOption_NoRecursive = 0x01,

+    MediaInfo_FileOption_CloseAll    = 0x02,

+    MediaInfo_FileOption_Max         = 0x04

 } MediaInfo_fileoptions_C;

 

 

@@ -240,15 +236,15 @@ extern "C"
 

 #ifdef MEDIAINFO_GLIBC

     #include <gmodule.h>

-    static GModule* MediaInfo_Module=NULL;

+    static GModule* MediaInfo_Module = NULL;

 #elif defined (_WIN32) || defined (WIN32)

     #include <windows.h>

-    static HMODULE  MediaInfo_Module=NULL;

+    static HMODULE  MediaInfo_Module = NULL;

 #else

     #include <dlfcn.h>

-    static void*    MediaInfo_Module=NULL;

+    static void* MediaInfo_Module = NULL;

 #endif

-static size_t Module_Count=0;

+    static size_t Module_Count = 0;

 

 #ifdef MEDIAINFO_GLIBC

 #define MEDIAINFO_ASSIGN(_Name,_Name2) \

@@ -273,98 +269,125 @@ static size_t Module_Count=0;
     if (MediaInfoList_##_Name==NULL) Errors++;

 #endif

 

-typedef void* (__stdcall *MEDIAINFO_New)(); static MEDIAINFO_New MediaInfo_New;

-typedef void* (__stdcall *MEDIAINFOLIST_New)(); static MEDIAINFOLIST_New MediaInfoList_New;

-typedef void (__stdcall *MEDIAINFO_Delete)(void*); static MEDIAINFO_Delete MediaInfo_Delete;

-typedef void (__stdcall *MEDIAINFOLIST_Delete)(void*); static MEDIAINFOLIST_Delete MediaInfoList_Delete;

-typedef size_t (__stdcall *MEDIAINFO_Open)(void*, const MediaInfo_Char*); static MEDIAINFO_Open MediaInfo_Open;

-typedef size_t (__stdcall *MEDIAINFOLIST_Open)(void*, const MediaInfo_Char*, const MediaInfo_fileoptions_C); static MEDIAINFOLIST_Open MediaInfoList_Open;

-typedef size_t (__stdcall *MEDIAINFO_Open_Buffer_Init)(void*, MediaInfo_int64u File_Size, MediaInfo_int64u File_Offset); static MEDIAINFO_Open_Buffer_Init MediaInfo_Open_Buffer_Init;

-typedef size_t (__stdcall *MEDIAINFO_Open_Buffer_Continue)(void*, MediaInfo_int8u* Buffer, size_t Buffer_Size); static MEDIAINFO_Open_Buffer_Continue MediaInfo_Open_Buffer_Continue;

-typedef MediaInfo_int64u (__stdcall *MEDIAINFO_Open_Buffer_Continue_GoTo_Get)(void*); static MEDIAINFO_Open_Buffer_Continue_GoTo_Get MediaInfo_Open_Buffer_Continue_GoTo_Get;

-typedef size_t (__stdcall *MEDIAINFO_Open_Buffer_Finalize)(void*); static MEDIAINFO_Open_Buffer_Finalize MediaInfo_Open_Buffer_Finalize;

-typedef size_t (__stdcall *MEDIAINFO_Open_NextPacket)(void*); static MEDIAINFO_Open_NextPacket MediaInfo_Open_NextPacket;

-typedef void (__stdcall *MEDIAINFO_Close)(void*); static MEDIAINFO_Close MediaInfo_Close;

-typedef void (__stdcall *MEDIAINFOLIST_Close)(void*, size_t); static MEDIAINFOLIST_Close MediaInfoList_Close;

-typedef const MediaInfo_Char* (__stdcall *MEDIAINFO_Inform)(void*, size_t Reserved); static MEDIAINFO_Inform MediaInfo_Inform;

-typedef const MediaInfo_Char* (__stdcall *MEDIAINFOLIST_Inform)(void*, size_t, size_t Reserved); static MEDIAINFOLIST_Inform MediaInfoList_Inform;

-typedef const MediaInfo_Char* (__stdcall *MEDIAINFO_GetI)(void*, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, MediaInfo_info_C KindOfInfo); static MEDIAINFO_GetI MediaInfo_GetI;

-typedef const MediaInfo_Char* (__stdcall *MEDIAINFOLIST_GetI)(void*, size_t, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, MediaInfo_info_C KindOfInfo); static MEDIAINFOLIST_GetI MediaInfoList_GetI;

-typedef const MediaInfo_Char* (__stdcall *MEDIAINFO_Get)(void*, MediaInfo_stream_C StreamKind, size_t StreamNumber, const MediaInfo_Char* Parameter, MediaInfo_info_C KindOfInfo, MediaInfo_info_C KindOfSearch); static MEDIAINFO_Get MediaInfo_Get;

-typedef const MediaInfo_Char* (__stdcall *MEDIAINFOLIST_Get)(void*, size_t, MediaInfo_stream_C StreamKind, size_t StreamNumber, const MediaInfo_Char* Parameter, MediaInfo_info_C KindOfInfo, MediaInfo_info_C KindOfSearch); static MEDIAINFOLIST_Get MediaInfoList_Get;

-typedef size_t (__stdcall *MEDIAINFO_Output_Buffer_Get)(void*, const MediaInfo_Char* Parameter); static MEDIAINFO_Output_Buffer_Get MediaInfo_Output_Buffer_Get;

-typedef size_t (__stdcall *MEDIAINFO_Output_Buffer_GetI)(void*, size_t Pos); static MEDIAINFO_Output_Buffer_GetI MediaInfo_Output_Buffer_GetI;

-typedef const MediaInfo_Char* (__stdcall *MEDIAINFO_Option)(void*, const MediaInfo_Char* Parameter, const MediaInfo_Char* Value); static MEDIAINFO_Option MediaInfo_Option;

-typedef const MediaInfo_Char* (__stdcall *MEDIAINFOLIST_Option)(void*, const MediaInfo_Char* Parameter, const MediaInfo_Char* Value); static MEDIAINFOLIST_Option MediaInfoList_Option;

-typedef size_t (__stdcall *MEDIAINFO_State_Get)(void*); static MEDIAINFO_State_Get MediaInfo_State_Get;

-typedef size_t (__stdcall *MEDIAINFOLIST_State_Get)(void*); static MEDIAINFOLIST_State_Get MediaInfoList_State_Get;

-typedef size_t (__stdcall *MEDIAINFO_Count_Get)(void*, MediaInfo_stream_C StreamKind, size_t StreamNumber); static MEDIAINFO_Count_Get MediaInfo_Count_Get;

-typedef size_t (__stdcall *MEDIAINFOLIST_Count_Get)(void*, size_t, MediaInfo_stream_C StreamKind, size_t StreamNumber); static MEDIAINFOLIST_Count_Get MediaInfoList_Count_Get;

-typedef size_t (__stdcall *MEDIAINFO_Count_Get_Files)(void*); static MEDIAINFO_Count_Get_Files MediaInfo_Count_Get_Files;

-typedef size_t (__stdcall *MEDIAINFOLIST_Count_Get_Files)(void*); static MEDIAINFOLIST_Count_Get_Files MediaInfoList_Count_Get_Files;

-

-static size_t MediaInfoDLL_Load()

-{

-    size_t Errors=0;

-

-    if (Module_Count>0)

+    typedef void* (__stdcall *MEDIAINFO_New)();

+    static MEDIAINFO_New MediaInfo_New;

+    typedef void* (__stdcall *MEDIAINFOLIST_New)();

+    static MEDIAINFOLIST_New MediaInfoList_New;

+    typedef void (__stdcall *MEDIAINFO_Delete)(void*);

+    static MEDIAINFO_Delete MediaInfo_Delete;

+    typedef void (__stdcall *MEDIAINFOLIST_Delete)(void*);

+    static MEDIAINFOLIST_Delete MediaInfoList_Delete;

+    typedef size_t (__stdcall *MEDIAINFO_Open)(void*, const MediaInfo_Char*);

+    static MEDIAINFO_Open MediaInfo_Open;

+    typedef size_t (__stdcall *MEDIAINFOLIST_Open)(void*, const MediaInfo_Char*, const MediaInfo_fileoptions_C);

+    static MEDIAINFOLIST_Open MediaInfoList_Open;

+    typedef size_t (__stdcall *MEDIAINFO_Open_Buffer_Init)(void*, MediaInfo_int64u File_Size, MediaInfo_int64u File_Offset);

+    static MEDIAINFO_Open_Buffer_Init MediaInfo_Open_Buffer_Init;

+    typedef size_t (__stdcall *MEDIAINFO_Open_Buffer_Continue)(void*, MediaInfo_int8u* Buffer, size_t Buffer_Size);

+    static MEDIAINFO_Open_Buffer_Continue MediaInfo_Open_Buffer_Continue;

+    typedef MediaInfo_int64u(__stdcall *MEDIAINFO_Open_Buffer_Continue_GoTo_Get)(void*);

+    static MEDIAINFO_Open_Buffer_Continue_GoTo_Get MediaInfo_Open_Buffer_Continue_GoTo_Get;

+    typedef size_t (__stdcall *MEDIAINFO_Open_Buffer_Finalize)(void*);

+    static MEDIAINFO_Open_Buffer_Finalize MediaInfo_Open_Buffer_Finalize;

+    typedef size_t (__stdcall *MEDIAINFO_Open_NextPacket)(void*);

+    static MEDIAINFO_Open_NextPacket MediaInfo_Open_NextPacket;

+    typedef void (__stdcall *MEDIAINFO_Close)(void*);

+    static MEDIAINFO_Close MediaInfo_Close;

+    typedef void (__stdcall *MEDIAINFOLIST_Close)(void*, size_t);

+    static MEDIAINFOLIST_Close MediaInfoList_Close;

+    typedef const MediaInfo_Char* (__stdcall *MEDIAINFO_Inform)(void*, size_t Reserved);

+    static MEDIAINFO_Inform MediaInfo_Inform;

+    typedef const MediaInfo_Char* (__stdcall *MEDIAINFOLIST_Inform)(void*, size_t, size_t Reserved);

+    static MEDIAINFOLIST_Inform MediaInfoList_Inform;

+    typedef const MediaInfo_Char* (__stdcall *MEDIAINFO_GetI)(void*, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, MediaInfo_info_C KindOfInfo);

+    static MEDIAINFO_GetI MediaInfo_GetI;

+    typedef const MediaInfo_Char* (__stdcall *MEDIAINFOLIST_GetI)(void*, size_t, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, MediaInfo_info_C KindOfInfo);

+    static MEDIAINFOLIST_GetI MediaInfoList_GetI;

+    typedef const MediaInfo_Char* (__stdcall *MEDIAINFO_Get)(void*, MediaInfo_stream_C StreamKind, size_t StreamNumber, const MediaInfo_Char* Parameter, MediaInfo_info_C KindOfInfo, MediaInfo_info_C KindOfSearch);

+    static MEDIAINFO_Get MediaInfo_Get;

+    typedef const MediaInfo_Char* (__stdcall *MEDIAINFOLIST_Get)(void*, size_t, MediaInfo_stream_C StreamKind, size_t StreamNumber, const MediaInfo_Char* Parameter, MediaInfo_info_C KindOfInfo, MediaInfo_info_C KindOfSearch);

+    static MEDIAINFOLIST_Get MediaInfoList_Get;

+    typedef size_t (__stdcall *MEDIAINFO_Output_Buffer_Get)(void*, const MediaInfo_Char* Parameter);

+    static MEDIAINFO_Output_Buffer_Get MediaInfo_Output_Buffer_Get;

+    typedef size_t (__stdcall *MEDIAINFO_Output_Buffer_GetI)(void*, size_t Pos);

+    static MEDIAINFO_Output_Buffer_GetI MediaInfo_Output_Buffer_GetI;

+    typedef const MediaInfo_Char* (__stdcall *MEDIAINFO_Option)(void*, const MediaInfo_Char* Parameter, const MediaInfo_Char* Value);

+    static MEDIAINFO_Option MediaInfo_Option;

+    typedef const MediaInfo_Char* (__stdcall *MEDIAINFOLIST_Option)(void*, const MediaInfo_Char* Parameter, const MediaInfo_Char* Value);

+    static MEDIAINFOLIST_Option MediaInfoList_Option;

+    typedef size_t (__stdcall *MEDIAINFO_State_Get)(void*);

+    static MEDIAINFO_State_Get MediaInfo_State_Get;

+    typedef size_t (__stdcall *MEDIAINFOLIST_State_Get)(void*);

+    static MEDIAINFOLIST_State_Get MediaInfoList_State_Get;

+    typedef size_t (__stdcall *MEDIAINFO_Count_Get)(void*, MediaInfo_stream_C StreamKind, size_t StreamNumber);

+    static MEDIAINFO_Count_Get MediaInfo_Count_Get;

+    typedef size_t (__stdcall *MEDIAINFOLIST_Count_Get)(void*, size_t, MediaInfo_stream_C StreamKind, size_t StreamNumber);

+    static MEDIAINFOLIST_Count_Get MediaInfoList_Count_Get;

+    typedef size_t (__stdcall *MEDIAINFO_Count_Get_Files)(void*);

+    static MEDIAINFO_Count_Get_Files MediaInfo_Count_Get_Files;

+    typedef size_t (__stdcall *MEDIAINFOLIST_Count_Get_Files)(void*);

+    static MEDIAINFOLIST_Count_Get_Files MediaInfoList_Count_Get_Files;

+

+    static size_t MediaInfoDLL_Load()

     {

-        Module_Count++;

-        return 1;

-    }

+        size_t Errors = 0;

+

+        if (Module_Count > 0) {

+            Module_Count++;

+            return 1;

+        }

 

     /* Load library */

     #ifdef MEDIAINFO_GLIBC

-        MediaInfo_Module=g_module_open(MEDIAINFODLL_NAME, G_MODULE_BIND_LAZY);

+        MediaInfo_Module = g_module_open(MEDIAINFODLL_NAME, G_MODULE_BIND_LAZY);

     #elif defined (_WIN32) || defined (WIN32)

-        MediaInfo_Module=LoadLibrary(MEDIAINFODLL_NAME);

+        MediaInfo_Module = LoadLibrary(MEDIAINFODLL_NAME);

     #else

-        MediaInfo_Module=dlopen(MEDIAINFODLL_NAME, RTLD_LAZY);

+        MediaInfo_Module = dlopen(MEDIAINFODLL_NAME, RTLD_LAZY);

         if (!MediaInfo_Module)

-            MediaInfo_Module=dlopen("./" MEDIAINFODLL_NAME, RTLD_LAZY);

+            MediaInfo_Module = dlopen("./" MEDIAINFODLL_NAME, RTLD_LAZY);

         if (!MediaInfo_Module)

-            MediaInfo_Module=dlopen("/usr/local/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);

+            MediaInfo_Module = dlopen("/usr/local/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);

         if (!MediaInfo_Module)

-            MediaInfo_Module=dlopen("/usr/local/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);

+            MediaInfo_Module = dlopen("/usr/local/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);

         if (!MediaInfo_Module)

-            MediaInfo_Module=dlopen("/usr/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);

+            MediaInfo_Module = dlopen("/usr/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);

         if (!MediaInfo_Module)

-            MediaInfo_Module=dlopen("/usr/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);

+            MediaInfo_Module = dlopen("/usr/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);

     #endif

-    if (!MediaInfo_Module)

-        return (size_t)-1;

-

-    /* Load methods */

-    MEDIAINFO_ASSIGN    (New,"New")

-    MEDIAINFOLIST_ASSIGN(New,"New")

-    MEDIAINFO_ASSIGN    (Delete,"Delete")

-    MEDIAINFOLIST_ASSIGN(Delete,"Delete")

-    MEDIAINFO_ASSIGN    (Open,"Open")

-    MEDIAINFOLIST_ASSIGN(Open,"Open")

-    MEDIAINFO_ASSIGN    (Open_Buffer_Init,"Open_Buffer_Init")

-    MEDIAINFO_ASSIGN    (Open_Buffer_Continue,"Open_Buffer_Continue")

-    MEDIAINFO_ASSIGN    (Open_Buffer_Continue_GoTo_Get,"Open_Buffer_Continue_GoTo_Get")

-    MEDIAINFO_ASSIGN    (Open_Buffer_Finalize,"Open_Buffer_Finalize")

-    MEDIAINFO_ASSIGN    (Open_NextPacket,"Open_NextPacket")

-    MEDIAINFO_ASSIGN    (Close,"Close")

-    MEDIAINFOLIST_ASSIGN(Close,"Close")

-    MEDIAINFO_ASSIGN    (Inform,"Inform")

-    MEDIAINFOLIST_ASSIGN(Inform,"Inform")

-    MEDIAINFO_ASSIGN    (GetI,"GetI")

-    MEDIAINFOLIST_ASSIGN(GetI,"GetI")

-    MEDIAINFO_ASSIGN    (Get,"Get")

-    MEDIAINFOLIST_ASSIGN(Get,"Get")

-    MEDIAINFO_ASSIGN    (Output_Buffer_Get,"Output_Buffer_Get")

-    MEDIAINFO_ASSIGN    (Output_Buffer_GetI,"Output_Buffer_GetI")

-    MEDIAINFO_ASSIGN    (Option,"Option")

-    MEDIAINFOLIST_ASSIGN(Option,"Option")

-    MEDIAINFO_ASSIGN    (State_Get,"State_Get")

-    MEDIAINFOLIST_ASSIGN(State_Get,"State_Get")

-    MEDIAINFO_ASSIGN    (Count_Get,"Count_Get")

-    MEDIAINFOLIST_ASSIGN(Count_Get,"Count_Get")

-    MEDIAINFOLIST_ASSIGN(Count_Get_Files,"Count_Get_Files")

-    if (Errors>0)

-    {

+        if (!MediaInfo_Module)

+            return (size_t) - 1;

+

+        /* Load methods */

+        MEDIAINFO_ASSIGN(New, "New")

+        MEDIAINFOLIST_ASSIGN(New, "New")

+        MEDIAINFO_ASSIGN(Delete, "Delete")

+        MEDIAINFOLIST_ASSIGN(Delete, "Delete")

+        MEDIAINFO_ASSIGN(Open, "Open")

+        MEDIAINFOLIST_ASSIGN(Open, "Open")

+        MEDIAINFO_ASSIGN(Open_Buffer_Init, "Open_Buffer_Init")

+        MEDIAINFO_ASSIGN(Open_Buffer_Continue, "Open_Buffer_Continue")

+        MEDIAINFO_ASSIGN(Open_Buffer_Continue_GoTo_Get, "Open_Buffer_Continue_GoTo_Get")

+        MEDIAINFO_ASSIGN(Open_Buffer_Finalize, "Open_Buffer_Finalize")

+        MEDIAINFO_ASSIGN(Open_NextPacket, "Open_NextPacket")

+        MEDIAINFO_ASSIGN(Close, "Close")

+        MEDIAINFOLIST_ASSIGN(Close, "Close")

+        MEDIAINFO_ASSIGN(Inform, "Inform")

+        MEDIAINFOLIST_ASSIGN(Inform, "Inform")

+        MEDIAINFO_ASSIGN(GetI, "GetI")

+        MEDIAINFOLIST_ASSIGN(GetI, "GetI")

+        MEDIAINFO_ASSIGN(Get, "Get")

+        MEDIAINFOLIST_ASSIGN(Get, "Get")

+        MEDIAINFO_ASSIGN(Output_Buffer_Get, "Output_Buffer_Get")

+        MEDIAINFO_ASSIGN(Output_Buffer_GetI, "Output_Buffer_GetI")

+        MEDIAINFO_ASSIGN(Option, "Option")

+        MEDIAINFOLIST_ASSIGN(Option, "Option")

+        MEDIAINFO_ASSIGN(State_Get, "State_Get")

+        MEDIAINFOLIST_ASSIGN(State_Get, "State_Get")

+        MEDIAINFO_ASSIGN(Count_Get, "Count_Get")

+        MEDIAINFOLIST_ASSIGN(Count_Get, "Count_Get")

+        MEDIAINFOLIST_ASSIGN(Count_Get_Files, "Count_Get_Files")

+        if (Errors > 0) {

         // Unload DLL with errors

         #ifdef MEDIAINFO_GLIBC

             g_module_close(MediaInfo_Module);

@@ -373,27 +396,27 @@ static size_t MediaInfoDLL_Load()
         #else

             dlclose(MediaInfo_Module);

        #endif

-       MediaInfo_Module=NULL;

-       return (size_t)-1;

-    }

+            MediaInfo_Module = NULL;

+            return (size_t) - 1;

+        }

 

-    Module_Count++;

-    return (size_t)1;

-}

+        Module_Count++;

+        return (size_t)1;

+    }

 

-static size_t MediaInfoDLL_IsLoaded()

-{

-    if (MediaInfo_Module)

-        return 1;

-    else

-        return 0;

-}

+    static size_t MediaInfoDLL_IsLoaded()

+    {

+        if (MediaInfo_Module)

+            return 1;

+        else

+            return 0;

+    }

 

-static void MediaInfoDLL_UnLoad()

-{

-    Module_Count--;

-    if (Module_Count>0)

-        return;

+    static void MediaInfoDLL_UnLoad()

+    {

+        Module_Count--;

+        if (Module_Count > 0)

+            return;

 

     #ifdef MEDIAINFO_GLIBC

         g_module_close(MediaInfo_Module);

@@ -402,8 +425,8 @@ static void MediaInfoDLL_UnLoad()
     #else

         dlclose(MediaInfo_Module);

     #endif

-    MediaInfo_Module=NULL;

-}

+        MediaInfo_Module = NULL;

+    }

 

 #ifdef __cplusplus

 }

@@ -424,10 +447,10 @@ static void MediaInfoDLL_UnLoad()
 namespace MediaInfoDLL

 {

 

-//---------------------------------------------------------------------------

-//MediaInfo_Char types

+    //---------------------------------------------------------------------------

+    //MediaInfo_Char types

 #undef  __T

-#define __T(__x)     __T(__x)

+#define __T(__x)    __T(__x)

 #if defined(UNICODE) || defined (_UNICODE)

     typedef wchar_t Char;

     #undef  __T

@@ -437,66 +460,62 @@ namespace MediaInfoDLL
     #undef  __T

     #define __T(__x) __x

 #endif

-typedef std::basic_string<Char>        String;

-typedef std::basic_stringstream<Char>  StringStream;

-typedef std::basic_istringstream<Char> iStringStream;

-typedef std::basic_ostringstream<Char> oStringStream;

-typedef std::basic_istringstream<Char> tiStringStream; // Legacy

-typedef std::basic_ostringstream<Char> toStringStream; //Legacy

-const size_t Error=(size_t)(-1);

-//---------------------------------------------------------------------------

-

-//---------------------------------------------------------------------------

-/// @brief Kinds of Stream

-enum stream_t

-{

-    Stream_General,                 ///< StreamKind = General

-    Stream_Video,                   ///< StreamKind = Video

-    Stream_Audio,                   ///< StreamKind = Audio

-    Stream_Text,                    ///< StreamKind = Text

-    Stream_Chapters,                ///< StreamKind = Chapters

-    Stream_Image,                   ///< StreamKind = Image

-    Stream_Menu,                    ///< StreamKind = Menu

-    Stream_Max,

-};

-

-/// @brief Kind of information

-enum info_t

-{

-    Info_Name,                      ///< InfoKind = Unique name of parameter

-    Info_Text,                      ///< InfoKind = Value of parameter

-    Info_Measure,                   ///< InfoKind = Unique name of measure unit of parameter

-    Info_Options,                   ///< InfoKind = See infooptions_t

-    Info_Name_Text,                 ///< InfoKind = Translated name of parameter

-    Info_Measure_Text,              ///< InfoKind = Translated name of measure unit

-    Info_Info,                      ///< InfoKind = More information about the parameter

-    Info_HowTo,                     ///< InfoKind = Information : how data is found

-    Info_Max

-};

-

-/// Get(...)[infooptions_t] return a string like "YNYN..." \n

-/// Use this enum to know at what correspond the Y (Yes) or N (No)

-/// If Get(...)[0]==Y, then :

-/// @brief Option if InfoKind = Info_Options

-enum infooptions_t

-{

-    InfoOption_ShowInInform,        ///< Show this parameter in Inform()

-    InfoOption_Reserved,            ///<

-    InfoOption_ShowInSupported,     ///< Internal use only (info : Must be showed in Info_Capacities() )

-    InfoOption_TypeOfValue,         ///< Value return by a standard Get() can be : T (Text), I (Integer, warning up to 64 bits), F (Float), D (Date), B (Binary datas coded Base64) (Numbers are in Base 10)

-    InfoOption_Max

-};

-

-/// @brief File opening options

-enum fileoptions_t

-{

-    FileOption_Nothing      =0x00,

-    FileOption_NoRecursive  =0x01,  ///< Do not browse folders recursively

-    FileOption_CloseAll     =0x02,  ///< Close all files before open

-    FileOption_Max          =0x04

-};

-

-const String Unable_Load_DLL=__T("Unable to load ")MEDIAINFODLL_NAME;

+    typedef std::basic_string<Char>        String;

+    typedef std::basic_stringstream<Char>  StringStream;

+    typedef std::basic_istringstream<Char> iStringStream;

+    typedef std::basic_ostringstream<Char> oStringStream;

+    typedef std::basic_istringstream<Char> tiStringStream; // Legacy

+    typedef std::basic_ostringstream<Char> toStringStream; //Legacy

+    const size_t Error = (size_t)(-1);

+    //---------------------------------------------------------------------------

+

+    //---------------------------------------------------------------------------

+    /// @brief Kinds of Stream

+    enum stream_t {

+        Stream_General,                 ///< StreamKind = General

+        Stream_Video,                   ///< StreamKind = Video

+        Stream_Audio,                   ///< StreamKind = Audio

+        Stream_Text,                    ///< StreamKind = Text

+        Stream_Chapters,                ///< StreamKind = Chapters

+        Stream_Image,                   ///< StreamKind = Image

+        Stream_Menu,                    ///< StreamKind = Menu

+        Stream_Max

+    };

+

+    /// @brief Kind of information

+    enum info_t {

+        Info_Name,                      ///< InfoKind = Unique name of parameter

+        Info_Text,                      ///< InfoKind = Value of parameter

+        Info_Measure,                   ///< InfoKind = Unique name of measure unit of parameter

+        Info_Options,                   ///< InfoKind = See infooptions_t

+        Info_Name_Text,                 ///< InfoKind = Translated name of parameter

+        Info_Measure_Text,              ///< InfoKind = Translated name of measure unit

+        Info_Info,                      ///< InfoKind = More information about the parameter

+        Info_HowTo,                     ///< InfoKind = Information : how data is found

+        Info_Max

+    };

+

+    /// Get(...)[infooptions_t] return a string like "YNYN..." \n

+    /// Use this enum to know at what correspond the Y (Yes) or N (No)

+    /// If Get(...)[0]==Y, then :

+    /// @brief Option if InfoKind = Info_Options

+    enum infooptions_t {

+        InfoOption_ShowInInform,        ///< Show this parameter in Inform()

+        InfoOption_Reserved,            ///<

+        InfoOption_ShowInSupported,     ///< Internal use only (info : Must be showed in Info_Capacities() )

+        InfoOption_TypeOfValue,         ///< Value return by a standard Get() can be : T (Text), I (Integer, warning up to 64 bits), F (Float), D (Date), B (Binary datas coded Base64) (Numbers are in Base 10)

+        InfoOption_Max

+    };

+

+    /// @brief File opening options

+    enum fileoptions_t {

+        FileOption_Nothing      = 0x00,

+        FileOption_NoRecursive  = 0x01, ///< Do not browse folders recursively

+        FileOption_CloseAll     = 0x02, ///< Close all files before open

+        FileOption_Max          = 0x04

+    };

+

+    const String Unable_Load_DLL = __T("Unable to load ")MEDIAINFODLL_NAME;

 #define MEDIAINFO_TEST_VOID \

     if (!IsReady()) return

 #define MEDIAINFO_TEST_INT \

@@ -506,70 +525,70 @@ const String Unable_Load_DLL=__T("Unable to load ")MEDIAINFODLL_NAME;
 #define MEDIAINFO_TEST_STRING_STATIC \

     if (!MediaInfo_Module) return Unable_Load_DLL

 

-//---------------------------------------------------------------------------

-class MediaInfo

-{

-public :

-    MediaInfo ()                {if (!MediaInfo_Module) MediaInfoDLL_Load(); if (!MediaInfo_Module) {Handle=NULL; return;}; Handle=MediaInfo_New();};

-    ~MediaInfo ()               {MEDIAINFO_TEST_VOID; MediaInfo_Delete(Handle);};

-

-    //File

-    size_t Open (const String &File) {MEDIAINFO_TEST_INT; return MediaInfo_Open(Handle, File.c_str());};

-    size_t Open_Buffer_Init (MediaInfo_int64u File_Size=(MediaInfo_int64u)-1, MediaInfo_int64u File_Offset=0) {MEDIAINFO_TEST_INT; return MediaInfo_Open_Buffer_Init(Handle, File_Size, File_Offset);};

-    size_t Open_Buffer_Continue (MediaInfo_int8u* Buffer, size_t Buffer_Size) {MEDIAINFO_TEST_INT; return MediaInfo_Open_Buffer_Continue(Handle, Buffer, Buffer_Size);};

-    MediaInfo_int64u Open_Buffer_Continue_GoTo_Get () {MEDIAINFO_TEST_INT; return MediaInfo_Open_Buffer_Continue_GoTo_Get(Handle);};

-    size_t Open_Buffer_Finalize () {MEDIAINFO_TEST_INT; return MediaInfo_Open_Buffer_Finalize(Handle);};

-    size_t Open_NextPacket () {MEDIAINFO_TEST_INT; return MediaInfo_Open_NextPacket(Handle);};

-    //size_t Save () {MEDIAINFO_TEST_INT; return MediaInfo_Save(Handle);};

-    void Close () {MEDIAINFO_TEST_VOID; return MediaInfo_Close(Handle);};

-

-    //General information

-    String Inform ()  {MEDIAINFO_TEST_STRING; return MediaInfo_Inform(Handle, 0);};

-    String Get (stream_t StreamKind, size_t StreamNumber, size_t Parameter, info_t InfoKind=Info_Text)  {MEDIAINFO_TEST_STRING; return MediaInfo_GetI (Handle, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, (MediaInfo_info_C)InfoKind);};

-    String Get (stream_t StreamKind, size_t StreamNumber, const String &Parameter, info_t InfoKind=Info_Text, info_t SearchKind=Info_Name)  {MEDIAINFO_TEST_STRING; return MediaInfo_Get (Handle, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), (MediaInfo_info_C)InfoKind, (MediaInfo_info_C)SearchKind);};

-    //size_t Set (const String &ToSet, stream_t StreamKind, size_t StreamNumber, size_t Parameter, const String &OldValue=__T(""))  {MEDIAINFO_TEST_INT; return MediaInfo_SetI (Handle, ToSet.c_str(), (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, OldValue.c_str());};

-    //size_t Set (const String &ToSet, stream_t StreamKind, size_t StreamNumber, const String &Parameter, const String &OldValue=__T(""))  {MEDIAINFO_TEST_INT; return MediaInfo_Set (Handle, ToSet.c_str(), (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), OldValue.c_str());};

-    size_t Output_Buffer_Get (const String &Value) {return MediaInfo_Output_Buffer_Get(Handle, Value.c_str());}

-    size_t Output_Buffer_Get (size_t Pos) {return MediaInfo_Output_Buffer_GetI(Handle, Pos);}

-    String        Option (const String &Option, const String &Value=__T(""))  {MEDIAINFO_TEST_STRING; return MediaInfo_Option (Handle, Option.c_str(), Value.c_str());};

-    static String Option_Static (const String &Option, const String &Value=__T(""))  {if (!MediaInfo_Module) MediaInfoDLL_Load(); MEDIAINFO_TEST_STRING_STATIC; return MediaInfo_Option (NULL, Option.c_str(), Value.c_str());};

-    size_t                  State_Get ()  {MEDIAINFO_TEST_INT; return MediaInfo_State_Get(Handle);};

-    size_t                  Count_Get (stream_t StreamKind, size_t StreamNumber=(size_t)-1)  {MEDIAINFO_TEST_INT; return MediaInfo_Count_Get(Handle, (MediaInfo_stream_C)StreamKind, StreamNumber);};

-

-    bool IsReady() {return (Handle && MediaInfo_Module)?true:false;}

-

-private :

-    void* Handle;

-};

-

-class MediaInfoList

-{

-public :

-    MediaInfoList ()                {MediaInfoDLL_Load(); if (!MediaInfoDLL_IsLoaded()) {Handle=NULL; return;}; Handle=MediaInfoList_New();};

-    ~MediaInfoList ()               {MEDIAINFO_TEST_VOID; MediaInfoList_Delete(Handle); MediaInfoDLL_UnLoad();};

-

-    //File

-    size_t Open (const String &File, const fileoptions_t Options=FileOption_Nothing) {MEDIAINFO_TEST_INT; return MediaInfoList_Open(Handle, File.c_str(), (MediaInfo_fileoptions_C)Options);};

-    //size_t Save (size_t FilePos) {MEDIAINFO_TEST_INT; return MediaInfoList_Save(Handle, FilePos);};

-    void Close (size_t FilePos=(size_t)-1) {MEDIAINFO_TEST_VOID; return MediaInfoList_Close(Handle, FilePos);};

-

-    //General information

-    String Inform (size_t FilePos=(size_t)-1)  {MEDIAINFO_TEST_STRING; return MediaInfoList_Inform(Handle, FilePos, 0);};

-    String Get (size_t FilePos, stream_t StreamKind, size_t StreamNumber, size_t Parameter, info_t InfoKind=Info_Text)  {MEDIAINFO_TEST_STRING; return MediaInfoList_GetI (Handle, FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, (MediaInfo_info_C)InfoKind);};

-    String Get (size_t FilePos, stream_t StreamKind, size_t StreamNumber, const String &Parameter, info_t InfoKind=Info_Text, info_t SearchKind=Info_Name)  {MEDIAINFO_TEST_STRING; return MediaInfoList_Get (Handle, FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), (MediaInfo_info_C)InfoKind, (MediaInfo_info_C)SearchKind);};

-    //size_t Set (const String &ToSet, size_t FilePos, stream_t StreamKind, size_t StreamNumber, size_t Parameter, const String &OldValue=__T(""))  {MEDIAINFO_TEST_INT; return MediaInfoList_SetI (Handle, ToSet.c_str(), FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, OldValue.c_str());};

-    //size_t Set (const String &ToSet, size_t FilePos, stream_t StreamKind, size_t StreamNumber, const String &Parameter, const String &OldValue=__T(""))  {MEDIAINFO_TEST_INT; return MediaInfoList_Set (Handle, ToSet.c_str(), FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), OldValue.c_str());};

-    String        Option (const String &Option, const String &Value=__T(""))  {MEDIAINFO_TEST_STRING; return MediaInfoList_Option (Handle, Option.c_str(), Value.c_str());};

-    static String Option_Static (const String &Option, const String &Value=__T(""))  {MEDIAINFO_TEST_STRING_STATIC; return MediaInfoList_Option (NULL, Option.c_str(), Value.c_str());};

-    size_t        State_Get ()  {MEDIAINFO_TEST_INT; return MediaInfoList_State_Get(Handle);};

-    size_t        Count_Get (size_t FilePos, stream_t StreamKind, size_t StreamNumber=(size_t)-1)  {MEDIAINFO_TEST_INT; return MediaInfoList_Count_Get(Handle, FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber);};

-    size_t        Count_Get ()  {MEDIAINFO_TEST_INT; return MediaInfoList_Count_Get_Files(Handle);};

-

-    bool IsReady() {return (Handle && MediaInfo_Module)?true:false;}

-

-private :

-    void* Handle;

-};

+    //---------------------------------------------------------------------------

+    class MediaInfo

+    {

+    public :

+        MediaInfo()        {if (!MediaInfo_Module) MediaInfoDLL_Load(); if (!MediaInfo_Module) {Handle = NULL; return;}; Handle = MediaInfo_New();};

+        ~MediaInfo()       {MEDIAINFO_TEST_VOID; MediaInfo_Delete(Handle);};

+

+        //File

+        size_t Open(const String &File) {MEDIAINFO_TEST_INT; return MediaInfo_Open(Handle, File.c_str());};

+        size_t Open_Buffer_Init(MediaInfo_int64u File_Size = (MediaInfo_int64u) - 1, MediaInfo_int64u File_Offset = 0) {MEDIAINFO_TEST_INT; return MediaInfo_Open_Buffer_Init(Handle, File_Size, File_Offset);};

+        size_t Open_Buffer_Continue(MediaInfo_int8u* Buffer, size_t Buffer_Size) {MEDIAINFO_TEST_INT; return MediaInfo_Open_Buffer_Continue(Handle, Buffer, Buffer_Size);};

+        MediaInfo_int64u Open_Buffer_Continue_GoTo_Get() {MEDIAINFO_TEST_INT; return MediaInfo_Open_Buffer_Continue_GoTo_Get(Handle);};

+        size_t Open_Buffer_Finalize() {MEDIAINFO_TEST_INT; return MediaInfo_Open_Buffer_Finalize(Handle);};

+        size_t Open_NextPacket() {MEDIAINFO_TEST_INT; return MediaInfo_Open_NextPacket(Handle);};

+        //size_t Save () {MEDIAINFO_TEST_INT; return MediaInfo_Save(Handle);};

+        void Close() {MEDIAINFO_TEST_VOID; return MediaInfo_Close(Handle);};

+

+        //General information

+        String Inform()  {MEDIAINFO_TEST_STRING; return MediaInfo_Inform(Handle, 0);};

+        String Get(stream_t StreamKind, size_t StreamNumber, size_t Parameter, info_t InfoKind = Info_Text)  {MEDIAINFO_TEST_STRING; return MediaInfo_GetI(Handle, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, (MediaInfo_info_C)InfoKind);};

+        String Get(stream_t StreamKind, size_t StreamNumber, const String &Parameter, info_t InfoKind = Info_Text, info_t SearchKind = Info_Name)  {MEDIAINFO_TEST_STRING; return MediaInfo_Get(Handle, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), (MediaInfo_info_C)InfoKind, (MediaInfo_info_C)SearchKind);};

+        //size_t Set (const String &ToSet, stream_t StreamKind, size_t StreamNumber, size_t Parameter, const String &OldValue=__T(""))  {MEDIAINFO_TEST_INT; return MediaInfo_SetI (Handle, ToSet.c_str(), (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, OldValue.c_str());};

+        //size_t Set (const String &ToSet, stream_t StreamKind, size_t StreamNumber, const String &Parameter, const String &OldValue=__T(""))  {MEDIAINFO_TEST_INT; return MediaInfo_Set (Handle, ToSet.c_str(), (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), OldValue.c_str());};

+        size_t Output_Buffer_Get(const String &Value) {return MediaInfo_Output_Buffer_Get(Handle, Value.c_str());}

+        size_t Output_Buffer_Get(size_t Pos) {return MediaInfo_Output_Buffer_GetI(Handle, Pos);}

+        String        Option(const String &Option, const String &Value = __T(""))  {MEDIAINFO_TEST_STRING; return MediaInfo_Option(Handle, Option.c_str(), Value.c_str());};

+        static String Option_Static(const String &Option, const String &Value = __T(""))  {if (!MediaInfo_Module) MediaInfoDLL_Load(); MEDIAINFO_TEST_STRING_STATIC; return MediaInfo_Option(NULL, Option.c_str(), Value.c_str());};

+        size_t        State_Get() {MEDIAINFO_TEST_INT; return MediaInfo_State_Get(Handle);};

+        size_t        Count_Get(stream_t StreamKind, size_t StreamNumber = (size_t) - 1)  {MEDIAINFO_TEST_INT; return MediaInfo_Count_Get(Handle, (MediaInfo_stream_C)StreamKind, StreamNumber);};

+

+        bool IsReady() {return (Handle && MediaInfo_Module) ? true : false;}

+

+    private :

+        void* Handle;

+    };

+

+    class MediaInfoList

+    {

+    public :

+        MediaInfoList()        {MediaInfoDLL_Load(); if (!MediaInfoDLL_IsLoaded()) {Handle = NULL; return;}; Handle = MediaInfoList_New();};

+        ~MediaInfoList()       {MEDIAINFO_TEST_VOID; MediaInfoList_Delete(Handle); MediaInfoDLL_UnLoad();};

+

+        //File

+        size_t Open(const String &File, const fileoptions_t Options = FileOption_Nothing) {MEDIAINFO_TEST_INT; return MediaInfoList_Open(Handle, File.c_str(), (MediaInfo_fileoptions_C)Options);};

+        //size_t Save (size_t FilePos) {MEDIAINFO_TEST_INT; return MediaInfoList_Save(Handle, FilePos);};

+        void Close(size_t FilePos = (size_t) - 1) {MEDIAINFO_TEST_VOID; return MediaInfoList_Close(Handle, FilePos);};

+

+        //General information

+        String Inform(size_t FilePos = (size_t) - 1)  {MEDIAINFO_TEST_STRING; return MediaInfoList_Inform(Handle, FilePos, 0);};

+        String Get(size_t FilePos, stream_t StreamKind, size_t StreamNumber, size_t Parameter, info_t InfoKind = Info_Text)  {MEDIAINFO_TEST_STRING; return MediaInfoList_GetI(Handle, FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, (MediaInfo_info_C)InfoKind);};

+        String Get(size_t FilePos, stream_t StreamKind, size_t StreamNumber, const String &Parameter, info_t InfoKind = Info_Text, info_t SearchKind = Info_Name)  {MEDIAINFO_TEST_STRING; return MediaInfoList_Get(Handle, FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), (MediaInfo_info_C)InfoKind, (MediaInfo_info_C)SearchKind);};

+        //size_t Set (const String &ToSet, size_t FilePos, stream_t StreamKind, size_t StreamNumber, size_t Parameter, const String &OldValue=__T(""))  {MEDIAINFO_TEST_INT; return MediaInfoList_SetI (Handle, ToSet.c_str(), FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, OldValue.c_str());};

+        //size_t Set (const String &ToSet, size_t FilePos, stream_t StreamKind, size_t StreamNumber, const String &Parameter, const String &OldValue=__T(""))  {MEDIAINFO_TEST_INT; return MediaInfoList_Set (Handle, ToSet.c_str(), FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), OldValue.c_str());};

+        String        Option(const String &Option, const String &Value = __T(""))  {MEDIAINFO_TEST_STRING; return MediaInfoList_Option(Handle, Option.c_str(), Value.c_str());};

+        static String Option_Static(const String &Option, const String &Value = __T(""))  {MEDIAINFO_TEST_STRING_STATIC; return MediaInfoList_Option(NULL, Option.c_str(), Value.c_str());};

+        size_t        State_Get()  {MEDIAINFO_TEST_INT; return MediaInfoList_State_Get(Handle);};

+        size_t        Count_Get(size_t FilePos, stream_t StreamKind, size_t StreamNumber = (size_t) - 1)  {MEDIAINFO_TEST_INT; return MediaInfoList_Count_Get(Handle, FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber);};

+        size_t        Count_Get()  {MEDIAINFO_TEST_INT; return MediaInfoList_Count_Get_Files(Handle);};

+

+        bool IsReady() {return (Handle && MediaInfo_Module) ? true : false;}

+

+    private :

+        void* Handle;

+    };

 

 } //NameSpace

 #endif /*__cplusplus*/