Merge pull request MediaArea#880 from g-maxime/mpeg-7

Add JNI interface to MediaInfoLib
g-maxime · Aug 23, 2018 · 73b9fb0 · 73b9fb0
2 parents 639e0f6 + e96eb72
commit 73b9fb0
Show file tree

Hide file tree

Showing 36 changed files with 1,986 additions and 300 deletions.
diff --git a/Project/BCB/Dll/MediaInfo.cbproj b/Project/BCB/Dll/MediaInfo.cbproj
@@ -96,6 +96,10 @@
 				<DependentOn>..\..\..\Source\MediaInfoDLL\MediaInfoDLL.h</DependentOn>
 				<BuildOrder>0</BuildOrder>
 			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfoDLL\MediaInfoJNI.cpp">
+				<DependentOn>..\..\..\Source\ThirdParty\jni\jni.h</DependentOn>
+				<BuildOrder>1</BuildOrder>
+			</CppCompile>
 			<BuildConfiguration Include="Release">
 				<Key>Cfg_2</Key>
 				<CfgParent>Base</CfgParent>

diff --git a/Project/BCB/Dll/MediaInfo_i386.cbproj b/Project/BCB/Dll/MediaInfo_i386.cbproj
@@ -132,6 +132,10 @@
             <DependentOn>..\..\..\Source\MediaInfoDLL\MediaInfoDLL.h</DependentOn>
             <BuildOrder>0</BuildOrder>
         </CppCompile>
+        <CppCompile Include="..\..\..\Source\MediaInfoDLL\MediaInfoJNI.cpp">
+            <DependentOn>..\..\..\Source\ThirdParty\jni\jni.h</DependentOn>
+            <BuildOrder>1</BuildOrder>
+        </CppCompile>
         <LibFiles Include="..\..\..\..\ZenLib\Project\BCB\Library\Win32\Release\ZenLib.lib" Condition="'$(Platform)'=='Win32'">
             <BuildOrder>2</BuildOrder>
             <IgnorePath>true</IgnorePath>

diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt
@@ -36,8 +36,10 @@ configure_file(
   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
   IMMEDIATE @ONLY)
 
-add_custom_target(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+if(NOT TARGET uninstall)
+    add_custom_target(uninstall
+   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+endif()
 
 if (NOT BUILD_ZENLIB)
   find_package(ZenLib REQUIRED)
@@ -336,6 +338,7 @@ set(MediaInfoLib_SRCS
   ${MediaInfoLib_SOURCES_PATH}/MediaInfo/Video/File_Y4m.cpp
   ${MediaInfoLib_SOURCES_PATH}/MediaInfo/XmlUtils.cpp
   ${MediaInfoLib_SOURCES_PATH}/MediaInfo/OutputHelpers.cpp
+  ${MediaInfoLib_SOURCES_PATH}/MediaInfoDLL/MediaInfoJNI.cpp
   ${MediaInfoLib_SOURCES_PATH}/MediaInfoDLL/MediaInfoDLL.cpp
   ${MediaInfoLib_SOURCES_PATH}/MediaInfoDLL/MediaInfoDLL.def
 )

diff --git a/Project/GNU/Library/AddThisToRoot_DLL_compile.sh b/Project/GNU/Library/AddThisToRoot_DLL_compile.sh
@@ -56,7 +56,7 @@ if [ "$1" = "--emscripten-lib" ]; then
     CXXFLAGS="$CXXFLAGS -Oz -DUNICODE -fno-exceptions"
     MediaInfoLib_CXXFLAGS="-I ../../../Source -I ../../../../ZenLib/Source -s USE_ZLIB=1 \
     -DMEDIAINFO_ADVANCED_NO -DMEDIAINFO_REFERENCES_NO -DMEDIAINFO_FILTER_NO -DMEDIAINFO_DUPLICATE_NO -DMEDIAINFO_MACROBLOCKS_NO \
-    -DMEDIAINFO_TRACE_NO -DMEDIAINFO_TRACE_FFV1CONTENT_NO -DMEDIAINFO_IBI_NO -DMEDIAINFO_DIRECTORY_NO \
+    -DMEDIAINFO_TRACE_NO -DMEDIAINFO_TRACE_FFV1CONTENT_NO -DMEDIAINFO_IBI_NO -DMEDIAINFO_DIRECTORY_NO -DMEDIAINFO_JNI_NO\
     -DMEDIAINFO_LIBCURL_NO -DMEDIAINFO_LIBMMS_NO -DMEDIAINFO_DVDIF_ANALYZE_NO -DMEDIAINFO_MPEGTS_DUPLICATE_NO \
     -DMEDIAINFO_READTHREAD_NO -DMEDIAINFO_MD5_NO -DMEDIAINFO_SHA1_NO -DMEDIAINFO_SHA2_NO -DMEDIAINFO_EVENTS_NO \
     -DMEDIAINFO_DEMUX_NO -DMEDIAINFO_AES_NO -DMEDIAINFO_FIXITY_NO -DMEDIAINFO_READER_NO -DMEDIAINFO_NEXTPACKET_NO"

diff --git a/Project/GNU/Library/Makefile.am b/Project/GNU/Library/Makefile.am
@@ -231,6 +231,7 @@ lib@MediaInfoLib_LibName@_la_SOURCES = \
 
 if COMPILE_DLL
 lib@MediaInfoLib_LibName@_la_SOURCES += \
+                       ../../../Source/MediaInfoDLL/MediaInfoJNI.cpp \
                        ../../../Source/MediaInfoDLL/MediaInfoDLL.cpp
 
 @MediaInfoLib_LibName@DLLincludedir = $(includedir)/MediaInfoDLL

diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
@@ -63,6 +63,7 @@ AC_ARG_ENABLE(events,    		AC_HELP_STRING([--enable-events],    		[Enable events
 AC_ARG_ENABLE(demux,    		AC_HELP_STRING([--enable-demux],    		[Enable demux management]),                   MediaInfoDemux=$enableval,   MediaInfoDemux=depend)
 AC_ARG_ENABLE(libmms-describe-support, AC_HELP_STRING([--enable-libmms-describe-support], [Enable customized libmms describe support]), MediaInfoLibmmsDescribeSupport=$enableval, MediaInfoLibmmsDescribeSupport=depend)
 AC_ARG_ENABLE(dll,     AC_HELP_STRING([--disable-dll],     [Disable dll iterface]),                                       MediaInfoDll=$enableval,     MediaInfoDll=depend)
+AC_ARG_ENABLE(jni,     AC_HELP_STRING([--disable-jni],     [Disable jni iterface]),                                       MediaInfoJni=$enableval,     MediaInfoJni=depend)
 AC_ARG_ENABLE(all,     AC_HELP_STRING([--disable-all],     [Disable all parsers]),                                        MediaInfoAll=$enableval,     MediaInfoAll=depend)
 AC_ARG_ENABLE(archive, AC_HELP_STRING([--disable-archive], [Disable all archive parsers]),                                MediaInfoArchive=$enableval, MediaInfoArchive=depend)
 AC_ARG_ENABLE(audio,   AC_HELP_STRING([--disable-audio],   [Disable all audio parsers]),                                  MediaInfoAudio=$enableval,   MediaInfoAudio=depend)
@@ -223,6 +224,7 @@ if test "$MediaInfoMinimal" = "no";  then AC_DEFINE(MEDIAINFO_MINIMAL_NO) fi; if
 if test "$MediaInfoTrace"   = "no";  then AC_DEFINE(MEDIAINFO_TRACE_NO)   fi; if test "$MediaInfoTrace"   = "yes"; then AC_DEFINE(MEDIAINFO_TRACE_YES)   fi
 if test "$MediaInfoEvents"  = "no";  then AC_DEFINE(MEDIAINFO_EVENTS_NO)  fi; if test "$MediaInfoEvents"  = "yes"; then AC_DEFINE(MEDIAINFO_EVENTS_YES)  fi
 if test "$MediaInfoDemux"   = "no";  then AC_DEFINE(MEDIAINFO_DEMUX_NO)   fi; if test "$MediaInfoDemux"   = "yes"; then AC_DEFINE(MEDIAINFO_DEMUX_YES)   fi
+if test "$MediaInfoJni"     = "no";  then AC_DEFINE(MEDIAINFO_JNI_NO)     fi; if test "$MediaInfoJni"     = "yes"; then AC_DEFINE(MEDIAINFO_JNI_YES)   fi
 if test "$MediaInfoLibmmsDescribeSupport" = "yes"; then AC_DEFINE(MEDIAINFO_LIBMMS_DESCRIBE_SUPPORT)   fi
 if test "$MediaInfoAll"     = "no";  then AC_DEFINE(MEDIAINFO_ALL_NO)     fi
 if test "$MediaInfoArchive" = "no";  then AC_DEFINE(MEDIAINFO_ARCHIVE_NO) fi

diff --git a/Project/GNU/libmediainfo.spec b/Project/GNU/libmediainfo.spec
@@ -249,6 +249,7 @@ install -m 644 Source/MediaInfoDLL/MediaInfoDLL.cs %{buildroot}%{_includedir}/Me
 install -m 644 Source/MediaInfoDLL/MediaInfoDLL.h %{buildroot}%{_includedir}/MediaInfoDLL
 install -m 644 Source/MediaInfoDLL/MediaInfoDLL_Static.h %{buildroot}%{_includedir}/MediaInfoDLL
 install -m 644 Source/MediaInfoDLL/MediaInfoDLL.JNA.java %{buildroot}%{_includedir}/MediaInfoDLL
+install -m 644 Source/MediaInfoDLL/MediaInfoDLL.JNI.java %{buildroot}%{_includedir}/MediaInfoDLL
 install -m 644 Source/MediaInfoDLL/MediaInfoDLL.JNative.java %{buildroot}%{_includedir}/MediaInfoDLL
 install -m 644 Source/MediaInfoDLL/MediaInfoDLL.py %{buildroot}%{_includedir}/MediaInfoDLL
 install -m 644 Source/MediaInfoDLL/MediaInfoDLL3.py %{buildroot}%{_includedir}/MediaInfoDLL

diff --git a/Project/Java/Example.JNA/Compile.bat b/Project/Java/Example.JNA/Compile.bat
@@ -1 +1 @@
-javac -d . -classpath .;jna.jar ..\..\..\Source\MediaInfoDLL\MediaInfoDLL.JNA.java ..\..\..\Source\Example\HowToUse_Dll.JNA.java
+javac -d . -classpath .;jna.jar ..\..\..\Source\MediaInfoDLL\MediaInfoDLL.JNA.java ..\..\..\Source\Example\HowToUse_Dll.java
diff --git a/Project/Java/Example.JNA/Compile.sh b/Project/Java/Example.JNA/Compile.sh
@@ -1 +1 @@
-javac -d . -cp .:jna.jar ../../../Source/MediaInfoDLL/MediaInfoDLL.JNA.java ../../../Source/Example/HowToUse_Dll.JNA.java
+javac -d . -cp .:jna.jar ../../../Source/MediaInfoDLL/MediaInfoDLL.JNA.java ../../../Source/Example/HowToUse_Dll.java
diff --git a/Project/Java/Example.JNI/Compile.bat b/Project/Java/Example.JNI/Compile.bat
@@ -0,0 +1 @@
+javac -d . -classpath .;JNI.jar ..\..\..\Source\MediaInfoDLL\MediaInfoDLL.JNI.java ..\..\..\Source\Example\HowToUse_Dll.java
diff --git a/Project/Java/Example.JNI/Compile.sh b/Project/Java/Example.JNI/Compile.sh
@@ -0,0 +1 @@
+javac -d . -cp .:JNI.jar ../../../Source/MediaInfoDLL/MediaInfoDLL.JNI.java ../../../Source/Example/HowToUse_Dll.java
diff --git a/Project/Java/Example.JNI/MakeJavaDoc.bat b/Project/Java/Example.JNI/MakeJavaDoc.bat
@@ -0,0 +1,2 @@
+md javadoc
+javadoc -d .\javadoc -private -classpath JNI.jar ..\..\..\Source\MediaInfoDLL\MediaInfoDLL.JNI.java
diff --git a/Project/Java/Example.JNI/MakeJavaDoc.sh b/Project/Java/Example.JNI/MakeJavaDoc.sh
@@ -0,0 +1,2 @@
+mkdir javadoc
+javadoc -d ./javadoc -classpath JNI.jar ../../../Source/MediaInfoDLL/MediaInfoDLL.JNI.java
diff --git a/Project/Java/Example.JNI/Run.bat b/Project/Java/Example.JNI/Run.bat
@@ -0,0 +1 @@
+java -cp .;JNI.jar HowToUse_Dll %1
diff --git a/Project/Java/Example.JNI/Run.sh b/Project/Java/Example.JNI/Run.sh
@@ -0,0 +1 @@
+java -cp .:JNI.jar HowToUse_Dll $1
diff --git a/Project/Java/ReadMe.txt b/Project/Java/ReadMe.txt
@@ -1,5 +1,6 @@
 Java binding for MediaInfo DLL/SO
 
-Two alternatives are possible depends on which "binding interface" you desire:
+Three alternatives are possible depends on which "binding interface" you desire:
+- JNI     (Java built in)
 - JNA     http://jna.dev.java.net
-- JNAtive http://jnative.sourceforge.net
+- JNAtive http://jnative.sourceforge.net
diff --git a/Project/MSVC2013/Dll/MediaInfoDll.vcxproj b/Project/MSVC2013/Dll/MediaInfoDll.vcxproj
@@ -136,8 +136,12 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\Source\MediaInfoDLL\MediaInfoJNI.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfoDLL\MediaInfoDLL.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Source\ThirdParty\jni\jni.h" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\Source\MediaInfoDLL\MediaInfoDLL.def" />
   </ItemGroup>

diff --git a/Project/MSVC2013/Dll/MediaInfoDll.vcxproj.filters b/Project/MSVC2013/Dll/MediaInfoDll.vcxproj.filters
@@ -11,10 +11,16 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\Source\MediaInfoDLL\MediaInfoJNI.cpp">
     <ClCompile Include="..\..\..\Source\MediaInfoDLL\MediaInfoDLL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Source\ThirdParty\jni\jni.h">
+      <Filter>ThirdParty\jni</Filter>
+    </ClInclude>
+  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="MediaInfo.rc">
       <Filter>Resource Files</Filter>

diff --git a/Project/MSVC2015/Dll/MediaInfoDll.vcxproj b/Project/MSVC2015/Dll/MediaInfoDll.vcxproj
@@ -137,6 +137,10 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Source\MediaInfoDLL\MediaInfoDLL.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfoDLL\MediaInfoJNI.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Source\ThirdParty\jni\jni.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\Source\MediaInfoDLL\MediaInfoDLL.def" />

diff --git a/Project/MSVC2015/Dll/MediaInfoDll.vcxproj.filters b/Project/MSVC2015/Dll/MediaInfoDll.vcxproj.filters
@@ -12,9 +12,15 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Source\MediaInfoDLL\MediaInfoDLL.cpp">
+    <ClCompile Include="..\..\..\Source\MediaInfoDLL\MediaInfoJNI.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Source\ThirdParty\jni\jni.h">
+      <Filter>ThirdParty\jni</Filter>
+    </ClInclude>
+  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="MediaInfo.rc">
       <Filter>Resource Files</Filter>

diff --git a/Project/MSVC2017/Dll/MediaInfoDll.vcxproj b/Project/MSVC2017/Dll/MediaInfoDll.vcxproj
@@ -137,6 +137,10 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Source\MediaInfoDLL\MediaInfoDLL.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfoDLL\MediaInfoJNI.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Source\ThirdParty\jni\jni.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\Source\MediaInfoDLL\MediaInfoDLL.def" />

diff --git a/Project/MSVC2017/Dll/MediaInfoDll.vcxproj.filters b/Project/MSVC2017/Dll/MediaInfoDll.vcxproj.filters
@@ -12,9 +12,15 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Source\MediaInfoDLL\MediaInfoDLL.cpp">
+    <ClCompile Include="..\..\..\Source\MediaInfoDLL\MediaInfoJNI.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Source\ThirdParty\jni\jni.h">
+      <Filter>ThirdParty\jni</Filter>
+    </ClInclude>
+  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="MediaInfo.rc">
       <Filter>Resource Files</Filter>

diff --git a/Project/Mac/Make_tarball.sh b/Project/Mac/Make_tarball.sh
@@ -44,6 +44,7 @@ cp ../../Source/MediaInfoDLL/MediaInfoDLL.h MediaInfoLib/Developpers/Include/Med
 cp ../../Source/MediaInfoDLL/MediaInfoDLL_Static.h MediaInfoLib/Developpers/Include/MediaInfoDLL
 cp ../../Source/MediaInfoDLL/MediaInfoDLL.cs MediaInfoLib/Developpers/Include/MediaInfoDLL
 cp ../../Source/MediaInfoDLL/MediaInfoDLL.JNA.java MediaInfoLib/Developpers/Include/MediaInfoDLL
+cp ../../Source/MediaInfoDLL/MediaInfoDLL.JNI.java MediaInfoLib/Developpers/Include/MediaInfoDLL
 cp ../../Source/MediaInfoDLL/MediaInfoDLL.JNative.java MediaInfoLib/Developpers/Include/MediaInfoDLL
 cp ../../Source/MediaInfoDLL/MediaInfoDLL.py MediaInfoLib/Developpers/Include/MediaInfoDLL
 cp ../../Source/MediaInfoDLL/MediaInfoDLL3.py MediaInfoLib/Developpers/Include/MediaInfoDLL

diff --git a/Project/Solaris/mkpkg b/Project/Solaris/mkpkg
@@ -80,6 +80,7 @@ cp ../../Source/MediaInfoDLL/MediaInfoDLL.cs ${install_prefix}/include/MediaInfo
 cp ../../Source/MediaInfoDLL/MediaInfoDLL.h ${install_prefix}/include/MediaInfoDLL/
 cp ../../Source/MediaInfoDLL/MediaInfoDLL_Static.h ${install_prefix}/include/MediaInfoDLL/
 cp ../../Source/MediaInfoDLL/MediaInfoDLL.JNA.java ${install_prefix}/include/MediaInfoDLL/
+cp ../../Source/MediaInfoDLL/MediaInfoDLL.JNI.java ${install_prefix}/include/MediaInfoDLL/
 cp ../../Source/MediaInfoDLL/MediaInfoDLL.JNative.java ${install_prefix}/include/MediaInfoDLL/
 cp ../../Source/MediaInfoDLL/MediaInfoDLL.py ${install_prefix}/include/MediaInfoDLL/
 cp ../../Source/MediaInfoDLL/MediaInfoDLL3.py ${install_prefix}/include/MediaInfoDLL/

diff --git a/Release/Release_DLL_GNU.sub b/Release/Release_DLL_GNU.sub
@@ -57,6 +57,7 @@ cp ../Source/MediaInfoDLL/MediaInfoDLL.h MediaInfo_DLL_$1_$2/Developpers/Include
 cp ../Source/MediaInfoDLL/MediaInfoDLL_Static.h MediaInfo_DLL_$1_$2/Developpers/Include/MediaInfoDLL/
 cp ../Source/MediaInfoDLL/MediaInfoDLL.cs MediaInfo_DLL_$1_$2/Developpers/Include/MediaInfoDLL/
 cp ../Source/MediaInfoDLL/MediaInfoDLL.JNA.java MediaInfo_DLL_$1_$2/Developpers/Include/MediaInfoDLL/
+cp ../Source/MediaInfoDLL/MediaInfoDLL.JNI.java MediaInfo_DLL_$1_$2/Developpers/Include/MediaInfoDLL/
 cp ../Source/MediaInfoDLL/MediaInfoDLL.JNative.java MediaInfo_DLL_$1_$2/Developpers/Include/MediaInfoDLL/
 cp ../Source/MediaInfoDLL/MediaInfoDLL.py MediaInfo_DLL_$1_$2/Developpers/Include/MediaInfoDLL/
 cp ../Source/MediaInfoDLL/MediaInfoDLL3.py MediaInfo_DLL_$1_$2/Developpers/Include/MediaInfoDLL/

diff --git a/Release/Release_DLL_GNU_FromSource.sh b/Release/Release_DLL_GNU_FromSource.sh
@@ -37,6 +37,7 @@ cp ../Source/MediaInfoDLL/MediaInfoDLL.h MediaInfo_DLL_GNU_FromSource/Source/Med
 cp ../Source/MediaInfoDLL/MediaInfoDLL_Static.h MediaInfo_DLL_GNU_FromSource/Source/MediaInfoDLL/
 cp ../Source/MediaInfoDLL/MediaInfoDLL.cs MediaInfo_DLL_GNU_FromSource/Source/MediaInfoDLL/
 cp ../Source/MediaInfoDLL/MediaInfoDLL.JNA.java MediaInfo_DLL_GNU_FromSource/Source/MediaInfoDLL/
+cp ../Source/MediaInfoDLL/MediaInfoDLL.JNI.java MediaInfo_DLL_GNU_FromSource/Source/MediaInfoDLL/
 cp ../Source/MediaInfoDLL/MediaInfoDLL.JNative.java MediaInfo_DLL_GNU_FromSource/Source/MediaInfoDLL/
 cp ../Source/MediaInfoDLL/MediaInfoDLL.py MediaInfo_DLL_GNU_FromSource/Source/MediaInfoDLL/
 cp ../Source/MediaInfoDLL/MediaInfoDLL3.py MediaInfo_DLL_GNU_FromSource/Source/MediaInfoDLL/

diff --git a/Release/Release_DLL_GNU_Prepare.bat b/Release/Release_DLL_GNU_Prepare.bat
@@ -42,6 +42,7 @@ xcopy ..\Source\Doc\Documentation.html MediaInfo_DLL_GNU_Prepare\Source\Doc\ /S
 xcopy ..\Source\Example\HowToUse* MediaInfo_DLL_GNU_Prepare\Source\Example\ /S
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.cs MediaInfo_DLL_GNU_Prepare\Source\MediaInfoDLL\ /S
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.JNA.java MediaInfo_DLL_GNU_Prepare\Source\MediaInfoDLL\ /S
+xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.JNI.java MediaInfo_DLL_GNU_Prepare\Source\MediaInfoDLL\ /S
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.JNative.java MediaInfo_DLL_GNU_Prepare\Source\MediaInfoDLL\ /S
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.py MediaInfo_DLL_GNU_Prepare\Source\MediaInfoDLL\ /S
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL3.py MediaInfo_DLL_GNU_Prepare\Source\MediaInfoDLL\ /S

diff --git a/Release/Release_DLL_Windows_i386.bat b/Release/Release_DLL_Windows_i386.bat
@@ -43,6 +43,7 @@ xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.cs MediaInfoDLL_Windows_i386\Developer
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.jsl MediaInfoDLL_Windows_i386\Developers\Source\MediaInfoDLL\
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.vb MediaInfoDLL_Windows_i386\Developers\Source\MediaInfoDLL\
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.JNA.java MediaInfoDLL_Windows_i386\Developers\Source\MediaInfoDLL\
+xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.JNI.java MediaInfoDLL_Windows_i386\Developers\Source\MediaInfoDLL\
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.JNative.java MediaInfoDLL_Windows_i386\Developers\Source\MediaInfoDLL\
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.py MediaInfoDLL_Windows_i386\Developers\Source\MediaInfoDLL\
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL3.py MediaInfoDLL_Windows_i386\Developers\Source\MediaInfoDLL\
@@ -106,6 +107,8 @@ xcopy ..\Project\Java\Example.JNA\*.java MediaInfoDLL_Windows_i386\Developers\Pr
 xcopy ..\Project\Java\Example.JNA\*.txt MediaInfoDLL_Windows_i386\Developers\Project\Java\Example.JNA\
 xcopy ..\Project\Java\Example.JNA\*.bat MediaInfoDLL_Windows_i386\Developers\Project\Java\Example.JNA\
 xcopy ..\Project\Java\Example.JNA\*.sh MediaInfoDLL_Windows_i386\Developers\Project\Java\Example.JNA\
+xcopy ..\Project\Java\Example.JNI\*.bat MediaInfoDLL_Windows_i386\Developers\Project\Java\Example.JNI\
+xcopy ..\Project\Java\Example.JNI\*.sh MediaInfoDLL_Windows_i386\Developers\Project\Java\Example.JNI\
 xcopy ..\Project\Java\Example.JNative\*.java MediaInfoDLL_Windows_i386\Developers\Project\Java\Example.JNative\
 xcopy ..\Project\Java\Example.JNative\*.txt MediaInfoDLL_Windows_i386\Developers\Project\Java\Example.JNative\
 xcopy ..\Project\Java\Example.JNative\*.bat MediaInfoDLL_Windows_i386\Developers\Project\Java\Example.JNative\

diff --git a/Release/Release_DLL_Windows_x64.bat b/Release/Release_DLL_Windows_x64.bat
@@ -43,6 +43,7 @@ xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.cs MediaInfoDLL_Windows_x64\Developers
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.jsl MediaInfoDLL_Windows_x64\Developers\Source\MediaInfoDLL\
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.vb MediaInfoDLL_Windows_x64\Developers\Source\MediaInfoDLL\
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.JNA.java MediaInfoDLL_Windows_x64\Developers\Source\MediaInfoDLL\
+xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.JNI.java MediaInfoDLL_Windows_x64\Developers\Source\MediaInfoDLL\
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.JNative.java MediaInfoDLL_Windows_x64\Developers\Source\MediaInfoDLL\
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.py MediaInfoDLL_Windows_x64\Developers\Source\MediaInfoDLL\
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL3.py MediaInfoDLL_Windows_x64\Developers\Source\MediaInfoDLL\
@@ -106,6 +107,8 @@ xcopy ..\Project\Java\Example.JNA\*.java MediaInfoDLL_Windows_x64\Developers\Pro
 xcopy ..\Project\Java\Example.JNA\*.txt MediaInfoDLL_Windows_x64\Developers\Project\Java\Example.JNA\
 xcopy ..\Project\Java\Example.JNA\*.bat MediaInfoDLL_Windows_x64\Developers\Project\Java\Example.JNA\
 xcopy ..\Project\Java\Example.JNA\*.sh MediaInfoDLL_Windows_x64\Developers\Project\Java\Example.JNA\
+xcopy ..\Project\Java\Example.JNI\*.bat MediaInfoDLL_Windows_x64\Developers\Project\Java\Example.JNI\
+xcopy ..\Project\Java\Example.JNI\*.sh MediaInfoDLL_Windows_x64\Developers\Project\Java\Example.JNI\
 xcopy ..\Project\Java\Example.JNative\*.java MediaInfoDLL_Windows_x64\Developers\Project\Java\Example.JNative\
 xcopy ..\Project\Java\Example.JNative\*.txt MediaInfoDLL_Windows_x64\Developers\Project\Java\Example.JNative\
 xcopy ..\Project\Java\Example.JNative\*.bat MediaInfoDLL_Windows_x64\Developers\Project\Java\Example.JNative\

diff --git a/Release/Release_Source.bat b/Release/Release_Source.bat
@@ -101,6 +101,8 @@ xcopy ..\Project\Java\Example.JNA\*.bat MediaInfo_Lib_Source\Project\Java\Exampl
 xcopy ..\Project\Java\Example.JNA\*.sh MediaInfo_Lib_Source\Project\Java\Example.JNA\ /S
 xcopy ..\Project\Java\Example.JNA\*.java MediaInfo_Lib_Source\Project\Java\Example.JNA\ /S
 xcopy ..\Project\Java\Example.JNA\*.txt MediaInfo_Lib_Source\Project\Java\Example.JNA\ /S
+xcopy ..\Project\Java\Example.JNI\*.bat MediaInfo_Lib_Source\Project\Java\Example.JNI\ /S
+xcopy ..\Project\Java\Example.JNI\*.sh MediaInfo_Lib_Source\Project\Java\Example.JNI\ /S
 xcopy ..\Project\Java\Example.JNative\*.bat MediaInfo_Lib_Source\Project\Java\Example.JNative\ /S
 xcopy ..\Project\Java\Example.JNative\*.sh MediaInfo_Lib_Source\Project\Java\Example.JNative\ /S
 xcopy ..\Project\Java\Example.JNative\*.java MediaInfo_Lib_Source\Project\Java\Example.JNative\ /S
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		javac -d . -classpath .;jna.jar ..\..\..\Source\MediaInfoDLL\MediaInfoDLL.JNA.java ..\..\..\Source\Example\HowToUse_Dll.JNA.java
		javac -d . -classpath .;jna.jar ..\..\..\Source\MediaInfoDLL\MediaInfoDLL.JNA.java ..\..\..\Source\Example\HowToUse_Dll.java
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		javac -d . -cp .:jna.jar ../../../Source/MediaInfoDLL/MediaInfoDLL.JNA.java ../../../Source/Example/HowToUse_Dll.JNA.java
		javac -d . -cp .:jna.jar ../../../Source/MediaInfoDLL/MediaInfoDLL.JNA.java ../../../Source/Example/HowToUse_Dll.java
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		javac -d . -classpath .;JNI.jar ..\..\..\Source\MediaInfoDLL\MediaInfoDLL.JNI.java ..\..\..\Source\Example\HowToUse_Dll.java
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		javac -d . -cp .:JNI.jar ../../../Source/MediaInfoDLL/MediaInfoDLL.JNI.java ../../../Source/Example/HowToUse_Dll.java
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		md javadoc
		javadoc -d .\javadoc -private -classpath JNI.jar ..\..\..\Source\MediaInfoDLL\MediaInfoDLL.JNI.java
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		mkdir javadoc
		javadoc -d ./javadoc -classpath JNI.jar ../../../Source/MediaInfoDLL/MediaInfoDLL.JNI.java