diff --git a/.gitignore b/.gitignore
index d7157b6..46355f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -199,3 +199,5 @@ ModelManifest.xml
 
 # LocalHistory VS extension
 .localhistory/
+
+libvlc
\ No newline at end of file
diff --git a/LibVlc/libvlc.dll b/LibVlc/libvlc.dll
deleted file mode 100644
index ac48126..0000000
Binary files a/LibVlc/libvlc.dll and /dev/null differ
diff --git a/LibVlc/libvlccore.dll b/LibVlc/libvlccore.dll
deleted file mode 100644
index 3ac2a67..0000000
Binary files a/LibVlc/libvlccore.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libaccess_bd_plugin.dll b/LibVlc/plugins/access/libaccess_bd_plugin.dll
deleted file mode 100644
index 5c041e8..0000000
Binary files a/LibVlc/plugins/access/libaccess_bd_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libaccess_mms_plugin.dll b/LibVlc/plugins/access/libaccess_mms_plugin.dll
deleted file mode 100644
index 16ced56..0000000
Binary files a/LibVlc/plugins/access/libaccess_mms_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libaccess_realrtsp_plugin.dll b/LibVlc/plugins/access/libaccess_realrtsp_plugin.dll
deleted file mode 100644
index 30a05d1..0000000
Binary files a/LibVlc/plugins/access/libaccess_realrtsp_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libattachment_plugin.dll b/LibVlc/plugins/access/libattachment_plugin.dll
deleted file mode 100644
index 2b1305f..0000000
Binary files a/LibVlc/plugins/access/libattachment_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libbluray-j2se-0.7.0.jar b/LibVlc/plugins/access/libbluray-j2se-0.7.0.jar
deleted file mode 100644
index 9975812..0000000
Binary files a/LibVlc/plugins/access/libbluray-j2se-0.7.0.jar and /dev/null differ
diff --git a/LibVlc/plugins/access/libcdda_plugin.dll b/LibVlc/plugins/access/libcdda_plugin.dll
deleted file mode 100644
index ff43c9e..0000000
Binary files a/LibVlc/plugins/access/libcdda_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libdshow_plugin.dll b/LibVlc/plugins/access/libdshow_plugin.dll
deleted file mode 100644
index fe71ac2..0000000
Binary files a/LibVlc/plugins/access/libdshow_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libdtv_plugin.dll b/LibVlc/plugins/access/libdtv_plugin.dll
deleted file mode 100644
index 5574cec..0000000
Binary files a/LibVlc/plugins/access/libdtv_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libdvdnav_plugin.dll b/LibVlc/plugins/access/libdvdnav_plugin.dll
deleted file mode 100644
index e786461..0000000
Binary files a/LibVlc/plugins/access/libdvdnav_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libdvdread_plugin.dll b/LibVlc/plugins/access/libdvdread_plugin.dll
deleted file mode 100644
index b51a0d1..0000000
Binary files a/LibVlc/plugins/access/libdvdread_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libfilesystem_plugin.dll b/LibVlc/plugins/access/libfilesystem_plugin.dll
deleted file mode 100644
index b679fa6..0000000
Binary files a/LibVlc/plugins/access/libfilesystem_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libftp_plugin.dll b/LibVlc/plugins/access/libftp_plugin.dll
deleted file mode 100644
index 30b34fd..0000000
Binary files a/LibVlc/plugins/access/libftp_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libhttp_plugin.dll b/LibVlc/plugins/access/libhttp_plugin.dll
deleted file mode 100644
index 9351f93..0000000
Binary files a/LibVlc/plugins/access/libhttp_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libidummy_plugin.dll b/LibVlc/plugins/access/libidummy_plugin.dll
deleted file mode 100644
index 9829b31..0000000
Binary files a/LibVlc/plugins/access/libidummy_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libimem_plugin.dll b/LibVlc/plugins/access/libimem_plugin.dll
deleted file mode 100644
index ed1da25..0000000
Binary files a/LibVlc/plugins/access/libimem_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/liblibbluray_plugin.dll b/LibVlc/plugins/access/liblibbluray_plugin.dll
deleted file mode 100644
index 6c53d20..0000000
Binary files a/LibVlc/plugins/access/liblibbluray_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/liblive555_plugin.dll b/LibVlc/plugins/access/liblive555_plugin.dll
deleted file mode 100644
index 58c1ae2..0000000
Binary files a/LibVlc/plugins/access/liblive555_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/librar_plugin.dll b/LibVlc/plugins/access/librar_plugin.dll
deleted file mode 100644
index ab20e31..0000000
Binary files a/LibVlc/plugins/access/librar_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/librtp_plugin.dll b/LibVlc/plugins/access/librtp_plugin.dll
deleted file mode 100644
index ac5f147..0000000
Binary files a/LibVlc/plugins/access/librtp_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libscreen_plugin.dll b/LibVlc/plugins/access/libscreen_plugin.dll
deleted file mode 100644
index 38702b3..0000000
Binary files a/LibVlc/plugins/access/libscreen_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libsdp_plugin.dll b/LibVlc/plugins/access/libsdp_plugin.dll
deleted file mode 100644
index d95b6af..0000000
Binary files a/LibVlc/plugins/access/libsdp_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libsftp_plugin.dll b/LibVlc/plugins/access/libsftp_plugin.dll
deleted file mode 100644
index c1241e6..0000000
Binary files a/LibVlc/plugins/access/libsftp_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libshm_plugin.dll b/LibVlc/plugins/access/libshm_plugin.dll
deleted file mode 100644
index b66a5cf..0000000
Binary files a/LibVlc/plugins/access/libshm_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libsmb_plugin.dll b/LibVlc/plugins/access/libsmb_plugin.dll
deleted file mode 100644
index 0d75cfd..0000000
Binary files a/LibVlc/plugins/access/libsmb_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libtcp_plugin.dll b/LibVlc/plugins/access/libtcp_plugin.dll
deleted file mode 100644
index e3e53e3..0000000
Binary files a/LibVlc/plugins/access/libtcp_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libtimecode_plugin.dll b/LibVlc/plugins/access/libtimecode_plugin.dll
deleted file mode 100644
index f872136..0000000
Binary files a/LibVlc/plugins/access/libtimecode_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libudp_plugin.dll b/LibVlc/plugins/access/libudp_plugin.dll
deleted file mode 100644
index 124d79d..0000000
Binary files a/LibVlc/plugins/access/libudp_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libvcd_plugin.dll b/LibVlc/plugins/access/libvcd_plugin.dll
deleted file mode 100644
index f9f1877..0000000
Binary files a/LibVlc/plugins/access/libvcd_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libvdr_plugin.dll b/LibVlc/plugins/access/libvdr_plugin.dll
deleted file mode 100644
index 3f88eb1..0000000
Binary files a/LibVlc/plugins/access/libvdr_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access/libzip_plugin.dll b/LibVlc/plugins/access/libzip_plugin.dll
deleted file mode 100644
index 2fa305f..0000000
Binary files a/LibVlc/plugins/access/libzip_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access_output/libaccess_output_dummy_plugin.dll b/LibVlc/plugins/access_output/libaccess_output_dummy_plugin.dll
deleted file mode 100644
index a04331c..0000000
Binary files a/LibVlc/plugins/access_output/libaccess_output_dummy_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access_output/libaccess_output_file_plugin.dll b/LibVlc/plugins/access_output/libaccess_output_file_plugin.dll
deleted file mode 100644
index 5e058f0..0000000
Binary files a/LibVlc/plugins/access_output/libaccess_output_file_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access_output/libaccess_output_http_plugin.dll b/LibVlc/plugins/access_output/libaccess_output_http_plugin.dll
deleted file mode 100644
index d764eb6..0000000
Binary files a/LibVlc/plugins/access_output/libaccess_output_http_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access_output/libaccess_output_livehttp_plugin.dll b/LibVlc/plugins/access_output/libaccess_output_livehttp_plugin.dll
deleted file mode 100644
index 0a77afd..0000000
Binary files a/LibVlc/plugins/access_output/libaccess_output_livehttp_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access_output/libaccess_output_shout_plugin.dll b/LibVlc/plugins/access_output/libaccess_output_shout_plugin.dll
deleted file mode 100644
index 594ddd4..0000000
Binary files a/LibVlc/plugins/access_output/libaccess_output_shout_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/access_output/libaccess_output_udp_plugin.dll b/LibVlc/plugins/access_output/libaccess_output_udp_plugin.dll
deleted file mode 100644
index b3d62e3..0000000
Binary files a/LibVlc/plugins/access_output/libaccess_output_udp_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/liba52tofloat32_plugin.dll b/LibVlc/plugins/audio_filter/liba52tofloat32_plugin.dll
deleted file mode 100644
index 2e3b579..0000000
Binary files a/LibVlc/plugins/audio_filter/liba52tofloat32_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/liba52tospdif_plugin.dll b/LibVlc/plugins/audio_filter/liba52tospdif_plugin.dll
deleted file mode 100644
index 22fa6ca..0000000
Binary files a/LibVlc/plugins/audio_filter/liba52tospdif_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libaudio_format_plugin.dll b/LibVlc/plugins/audio_filter/libaudio_format_plugin.dll
deleted file mode 100644
index af5ac2b..0000000
Binary files a/LibVlc/plugins/audio_filter/libaudio_format_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libaudiobargraph_a_plugin.dll b/LibVlc/plugins/audio_filter/libaudiobargraph_a_plugin.dll
deleted file mode 100644
index d6d949a..0000000
Binary files a/LibVlc/plugins/audio_filter/libaudiobargraph_a_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libchorus_flanger_plugin.dll b/LibVlc/plugins/audio_filter/libchorus_flanger_plugin.dll
deleted file mode 100644
index 258a6dd..0000000
Binary files a/LibVlc/plugins/audio_filter/libchorus_flanger_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libcompressor_plugin.dll b/LibVlc/plugins/audio_filter/libcompressor_plugin.dll
deleted file mode 100644
index 3c7ba87..0000000
Binary files a/LibVlc/plugins/audio_filter/libcompressor_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libdolby_surround_decoder_plugin.dll b/LibVlc/plugins/audio_filter/libdolby_surround_decoder_plugin.dll
deleted file mode 100644
index 6cd58e5..0000000
Binary files a/LibVlc/plugins/audio_filter/libdolby_surround_decoder_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libdtstofloat32_plugin.dll b/LibVlc/plugins/audio_filter/libdtstofloat32_plugin.dll
deleted file mode 100644
index 7795608..0000000
Binary files a/LibVlc/plugins/audio_filter/libdtstofloat32_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libdtstospdif_plugin.dll b/LibVlc/plugins/audio_filter/libdtstospdif_plugin.dll
deleted file mode 100644
index 7382756..0000000
Binary files a/LibVlc/plugins/audio_filter/libdtstospdif_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libequalizer_plugin.dll b/LibVlc/plugins/audio_filter/libequalizer_plugin.dll
deleted file mode 100644
index ea66005..0000000
Binary files a/LibVlc/plugins/audio_filter/libequalizer_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libgain_plugin.dll b/LibVlc/plugins/audio_filter/libgain_plugin.dll
deleted file mode 100644
index 28cec14..0000000
Binary files a/LibVlc/plugins/audio_filter/libgain_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libheadphone_channel_mixer_plugin.dll b/LibVlc/plugins/audio_filter/libheadphone_channel_mixer_plugin.dll
deleted file mode 100644
index 7b3a6c2..0000000
Binary files a/LibVlc/plugins/audio_filter/libheadphone_channel_mixer_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libkaraoke_plugin.dll b/LibVlc/plugins/audio_filter/libkaraoke_plugin.dll
deleted file mode 100644
index df9a34a..0000000
Binary files a/LibVlc/plugins/audio_filter/libkaraoke_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libmono_plugin.dll b/LibVlc/plugins/audio_filter/libmono_plugin.dll
deleted file mode 100644
index 4defb14..0000000
Binary files a/LibVlc/plugins/audio_filter/libmono_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libmpgatofixed32_plugin.dll b/LibVlc/plugins/audio_filter/libmpgatofixed32_plugin.dll
deleted file mode 100644
index 0b3f7c3..0000000
Binary files a/LibVlc/plugins/audio_filter/libmpgatofixed32_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libnormvol_plugin.dll b/LibVlc/plugins/audio_filter/libnormvol_plugin.dll
deleted file mode 100644
index 4a47aad..0000000
Binary files a/LibVlc/plugins/audio_filter/libnormvol_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libparam_eq_plugin.dll b/LibVlc/plugins/audio_filter/libparam_eq_plugin.dll
deleted file mode 100644
index 1181369..0000000
Binary files a/LibVlc/plugins/audio_filter/libparam_eq_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libremap_plugin.dll b/LibVlc/plugins/audio_filter/libremap_plugin.dll
deleted file mode 100644
index 4687acf..0000000
Binary files a/LibVlc/plugins/audio_filter/libremap_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libsamplerate_plugin.dll b/LibVlc/plugins/audio_filter/libsamplerate_plugin.dll
deleted file mode 100644
index 078b4d1..0000000
Binary files a/LibVlc/plugins/audio_filter/libsamplerate_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libscaletempo_plugin.dll b/LibVlc/plugins/audio_filter/libscaletempo_plugin.dll
deleted file mode 100644
index 9d81ca3..0000000
Binary files a/LibVlc/plugins/audio_filter/libscaletempo_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libsimple_channel_mixer_plugin.dll b/LibVlc/plugins/audio_filter/libsimple_channel_mixer_plugin.dll
deleted file mode 100644
index 007750b..0000000
Binary files a/LibVlc/plugins/audio_filter/libsimple_channel_mixer_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libspatializer_plugin.dll b/LibVlc/plugins/audio_filter/libspatializer_plugin.dll
deleted file mode 100644
index d97479a..0000000
Binary files a/LibVlc/plugins/audio_filter/libspatializer_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libspeex_resampler_plugin.dll b/LibVlc/plugins/audio_filter/libspeex_resampler_plugin.dll
deleted file mode 100644
index 05b76d7..0000000
Binary files a/LibVlc/plugins/audio_filter/libspeex_resampler_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libstereo_widen_plugin.dll b/LibVlc/plugins/audio_filter/libstereo_widen_plugin.dll
deleted file mode 100644
index ef43ac6..0000000
Binary files a/LibVlc/plugins/audio_filter/libstereo_widen_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libtrivial_channel_mixer_plugin.dll b/LibVlc/plugins/audio_filter/libtrivial_channel_mixer_plugin.dll
deleted file mode 100644
index 4cb6877..0000000
Binary files a/LibVlc/plugins/audio_filter/libtrivial_channel_mixer_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_filter/libugly_resampler_plugin.dll b/LibVlc/plugins/audio_filter/libugly_resampler_plugin.dll
deleted file mode 100644
index 278795d..0000000
Binary files a/LibVlc/plugins/audio_filter/libugly_resampler_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_mixer/libfloat_mixer_plugin.dll b/LibVlc/plugins/audio_mixer/libfloat_mixer_plugin.dll
deleted file mode 100644
index 41b8c4a..0000000
Binary files a/LibVlc/plugins/audio_mixer/libfloat_mixer_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_mixer/libinteger_mixer_plugin.dll b/LibVlc/plugins/audio_mixer/libinteger_mixer_plugin.dll
deleted file mode 100644
index ea1c64f..0000000
Binary files a/LibVlc/plugins/audio_mixer/libinteger_mixer_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_output/libadummy_plugin.dll b/LibVlc/plugins/audio_output/libadummy_plugin.dll
deleted file mode 100644
index eccc48a..0000000
Binary files a/LibVlc/plugins/audio_output/libadummy_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_output/libafile_plugin.dll b/LibVlc/plugins/audio_output/libafile_plugin.dll
deleted file mode 100644
index 47bfee3..0000000
Binary files a/LibVlc/plugins/audio_output/libafile_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_output/libamem_plugin.dll b/LibVlc/plugins/audio_output/libamem_plugin.dll
deleted file mode 100644
index e383b20..0000000
Binary files a/LibVlc/plugins/audio_output/libamem_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_output/libdirectsound_plugin.dll b/LibVlc/plugins/audio_output/libdirectsound_plugin.dll
deleted file mode 100644
index 5cc1f2d..0000000
Binary files a/LibVlc/plugins/audio_output/libdirectsound_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_output/libmmdevice_plugin.dll b/LibVlc/plugins/audio_output/libmmdevice_plugin.dll
deleted file mode 100644
index ec2bd68..0000000
Binary files a/LibVlc/plugins/audio_output/libmmdevice_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_output/libwasapi_plugin.dll b/LibVlc/plugins/audio_output/libwasapi_plugin.dll
deleted file mode 100644
index 06e98b6..0000000
Binary files a/LibVlc/plugins/audio_output/libwasapi_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/audio_output/libwaveout_plugin.dll b/LibVlc/plugins/audio_output/libwaveout_plugin.dll
deleted file mode 100644
index ec0de1f..0000000
Binary files a/LibVlc/plugins/audio_output/libwaveout_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/liba52_plugin.dll b/LibVlc/plugins/codec/liba52_plugin.dll
deleted file mode 100644
index a316ff1..0000000
Binary files a/LibVlc/plugins/codec/liba52_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libadpcm_plugin.dll b/LibVlc/plugins/codec/libadpcm_plugin.dll
deleted file mode 100644
index fc9a4f5..0000000
Binary files a/LibVlc/plugins/codec/libadpcm_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libaes3_plugin.dll b/LibVlc/plugins/codec/libaes3_plugin.dll
deleted file mode 100644
index fc622cb..0000000
Binary files a/LibVlc/plugins/codec/libaes3_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libaraw_plugin.dll b/LibVlc/plugins/codec/libaraw_plugin.dll
deleted file mode 100644
index a03ba55..0000000
Binary files a/LibVlc/plugins/codec/libaraw_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libavcodec_plugin.dll b/LibVlc/plugins/codec/libavcodec_plugin.dll
deleted file mode 100644
index f97cdc7..0000000
Binary files a/LibVlc/plugins/codec/libavcodec_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libcc_plugin.dll b/LibVlc/plugins/codec/libcc_plugin.dll
deleted file mode 100644
index 391b655..0000000
Binary files a/LibVlc/plugins/codec/libcc_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libcdg_plugin.dll b/LibVlc/plugins/codec/libcdg_plugin.dll
deleted file mode 100644
index 020937a..0000000
Binary files a/LibVlc/plugins/codec/libcdg_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libcrystalhd_plugin.dll b/LibVlc/plugins/codec/libcrystalhd_plugin.dll
deleted file mode 100644
index 34df51f..0000000
Binary files a/LibVlc/plugins/codec/libcrystalhd_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libcvdsub_plugin.dll b/LibVlc/plugins/codec/libcvdsub_plugin.dll
deleted file mode 100644
index 457740a..0000000
Binary files a/LibVlc/plugins/codec/libcvdsub_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libddummy_plugin.dll b/LibVlc/plugins/codec/libddummy_plugin.dll
deleted file mode 100644
index 00530d1..0000000
Binary files a/LibVlc/plugins/codec/libddummy_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libdmo_plugin.dll b/LibVlc/plugins/codec/libdmo_plugin.dll
deleted file mode 100644
index f79a9ab..0000000
Binary files a/LibVlc/plugins/codec/libdmo_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libdts_plugin.dll b/LibVlc/plugins/codec/libdts_plugin.dll
deleted file mode 100644
index bf0e4c3..0000000
Binary files a/LibVlc/plugins/codec/libdts_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libdvbsub_plugin.dll b/LibVlc/plugins/codec/libdvbsub_plugin.dll
deleted file mode 100644
index 1485b05..0000000
Binary files a/LibVlc/plugins/codec/libdvbsub_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libdxva2_plugin.dll b/LibVlc/plugins/codec/libdxva2_plugin.dll
deleted file mode 100644
index 2fce8be..0000000
Binary files a/LibVlc/plugins/codec/libdxva2_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libedummy_plugin.dll b/LibVlc/plugins/codec/libedummy_plugin.dll
deleted file mode 100644
index e2c2a8e..0000000
Binary files a/LibVlc/plugins/codec/libedummy_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libfaad_plugin.dll b/LibVlc/plugins/codec/libfaad_plugin.dll
deleted file mode 100644
index 7a06bbc..0000000
Binary files a/LibVlc/plugins/codec/libfaad_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libflac_plugin.dll b/LibVlc/plugins/codec/libflac_plugin.dll
deleted file mode 100644
index c1bcbd0..0000000
Binary files a/LibVlc/plugins/codec/libflac_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libg711_plugin.dll b/LibVlc/plugins/codec/libg711_plugin.dll
deleted file mode 100644
index 76f0756..0000000
Binary files a/LibVlc/plugins/codec/libg711_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libjpeg_plugin.dll b/LibVlc/plugins/codec/libjpeg_plugin.dll
deleted file mode 100644
index cb31365..0000000
Binary files a/LibVlc/plugins/codec/libjpeg_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libkate_plugin.dll b/LibVlc/plugins/codec/libkate_plugin.dll
deleted file mode 100644
index fcc53e0..0000000
Binary files a/LibVlc/plugins/codec/libkate_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/liblibass_plugin.dll b/LibVlc/plugins/codec/liblibass_plugin.dll
deleted file mode 100644
index 87a27e8..0000000
Binary files a/LibVlc/plugins/codec/liblibass_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/liblibmpeg2_plugin.dll b/LibVlc/plugins/codec/liblibmpeg2_plugin.dll
deleted file mode 100644
index 69dc1ac..0000000
Binary files a/LibVlc/plugins/codec/liblibmpeg2_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/liblpcm_plugin.dll b/LibVlc/plugins/codec/liblpcm_plugin.dll
deleted file mode 100644
index d22319a..0000000
Binary files a/LibVlc/plugins/codec/liblpcm_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libmft_plugin.dll b/LibVlc/plugins/codec/libmft_plugin.dll
deleted file mode 100644
index a33fef7..0000000
Binary files a/LibVlc/plugins/codec/libmft_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libmpeg_audio_plugin.dll b/LibVlc/plugins/codec/libmpeg_audio_plugin.dll
deleted file mode 100644
index d01cb8a..0000000
Binary files a/LibVlc/plugins/codec/libmpeg_audio_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libopus_plugin.dll b/LibVlc/plugins/codec/libopus_plugin.dll
deleted file mode 100644
index 42017ee..0000000
Binary files a/LibVlc/plugins/codec/libopus_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libpng_plugin.dll b/LibVlc/plugins/codec/libpng_plugin.dll
deleted file mode 100644
index 595974a..0000000
Binary files a/LibVlc/plugins/codec/libpng_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libqsv_plugin.dll b/LibVlc/plugins/codec/libqsv_plugin.dll
deleted file mode 100644
index c78ea10..0000000
Binary files a/LibVlc/plugins/codec/libqsv_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libquicktime_plugin.dll b/LibVlc/plugins/codec/libquicktime_plugin.dll
deleted file mode 100644
index 77fad0a..0000000
Binary files a/LibVlc/plugins/codec/libquicktime_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/librawvideo_plugin.dll b/LibVlc/plugins/codec/librawvideo_plugin.dll
deleted file mode 100644
index ffb2202..0000000
Binary files a/LibVlc/plugins/codec/librawvideo_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libschroedinger_plugin.dll b/LibVlc/plugins/codec/libschroedinger_plugin.dll
deleted file mode 100644
index f021cf6..0000000
Binary files a/LibVlc/plugins/codec/libschroedinger_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libscte27_plugin.dll b/LibVlc/plugins/codec/libscte27_plugin.dll
deleted file mode 100644
index 77ad2d8..0000000
Binary files a/LibVlc/plugins/codec/libscte27_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libspeex_plugin.dll b/LibVlc/plugins/codec/libspeex_plugin.dll
deleted file mode 100644
index ebdc391..0000000
Binary files a/LibVlc/plugins/codec/libspeex_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libspudec_plugin.dll b/LibVlc/plugins/codec/libspudec_plugin.dll
deleted file mode 100644
index 84fa644..0000000
Binary files a/LibVlc/plugins/codec/libspudec_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libstl_plugin.dll b/LibVlc/plugins/codec/libstl_plugin.dll
deleted file mode 100644
index a54b595..0000000
Binary files a/LibVlc/plugins/codec/libstl_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libsubsdec_plugin.dll b/LibVlc/plugins/codec/libsubsdec_plugin.dll
deleted file mode 100644
index c7150b7..0000000
Binary files a/LibVlc/plugins/codec/libsubsdec_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libsubstx3g_plugin.dll b/LibVlc/plugins/codec/libsubstx3g_plugin.dll
deleted file mode 100644
index eccf252..0000000
Binary files a/LibVlc/plugins/codec/libsubstx3g_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libsubsusf_plugin.dll b/LibVlc/plugins/codec/libsubsusf_plugin.dll
deleted file mode 100644
index 579d22d..0000000
Binary files a/LibVlc/plugins/codec/libsubsusf_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libsvcdsub_plugin.dll b/LibVlc/plugins/codec/libsvcdsub_plugin.dll
deleted file mode 100644
index 82a7bd2..0000000
Binary files a/LibVlc/plugins/codec/libsvcdsub_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libt140_plugin.dll b/LibVlc/plugins/codec/libt140_plugin.dll
deleted file mode 100644
index 10460fb..0000000
Binary files a/LibVlc/plugins/codec/libt140_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libtheora_plugin.dll b/LibVlc/plugins/codec/libtheora_plugin.dll
deleted file mode 100644
index c0ce09f..0000000
Binary files a/LibVlc/plugins/codec/libtheora_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libtwolame_plugin.dll b/LibVlc/plugins/codec/libtwolame_plugin.dll
deleted file mode 100644
index 7ca7e99..0000000
Binary files a/LibVlc/plugins/codec/libtwolame_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libuleaddvaudio_plugin.dll b/LibVlc/plugins/codec/libuleaddvaudio_plugin.dll
deleted file mode 100644
index be10d56..0000000
Binary files a/LibVlc/plugins/codec/libuleaddvaudio_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libvorbis_plugin.dll b/LibVlc/plugins/codec/libvorbis_plugin.dll
deleted file mode 100644
index 882ba0f..0000000
Binary files a/LibVlc/plugins/codec/libvorbis_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libvpx_plugin.dll b/LibVlc/plugins/codec/libvpx_plugin.dll
deleted file mode 100644
index 3fde78a..0000000
Binary files a/LibVlc/plugins/codec/libvpx_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libx264_plugin.dll b/LibVlc/plugins/codec/libx264_plugin.dll
deleted file mode 100644
index 72c6d1c..0000000
Binary files a/LibVlc/plugins/codec/libx264_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libx265_plugin.dll b/LibVlc/plugins/codec/libx265_plugin.dll
deleted file mode 100644
index b26a3b6..0000000
Binary files a/LibVlc/plugins/codec/libx265_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/codec/libzvbi_plugin.dll b/LibVlc/plugins/codec/libzvbi_plugin.dll
deleted file mode 100644
index 514da95..0000000
Binary files a/LibVlc/plugins/codec/libzvbi_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/control/libdummy_plugin.dll b/LibVlc/plugins/control/libdummy_plugin.dll
deleted file mode 100644
index f2f14b6..0000000
Binary files a/LibVlc/plugins/control/libdummy_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/control/libgestures_plugin.dll b/LibVlc/plugins/control/libgestures_plugin.dll
deleted file mode 100644
index beac62e..0000000
Binary files a/LibVlc/plugins/control/libgestures_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/control/libhotkeys_plugin.dll b/LibVlc/plugins/control/libhotkeys_plugin.dll
deleted file mode 100644
index 0d16e31..0000000
Binary files a/LibVlc/plugins/control/libhotkeys_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/control/libnetsync_plugin.dll b/LibVlc/plugins/control/libnetsync_plugin.dll
deleted file mode 100644
index 6fc5d96..0000000
Binary files a/LibVlc/plugins/control/libnetsync_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/control/libntservice_plugin.dll b/LibVlc/plugins/control/libntservice_plugin.dll
deleted file mode 100644
index c903b7a..0000000
Binary files a/LibVlc/plugins/control/libntservice_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/control/liboldrc_plugin.dll b/LibVlc/plugins/control/liboldrc_plugin.dll
deleted file mode 100644
index c30ad96..0000000
Binary files a/LibVlc/plugins/control/liboldrc_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/control/libwin_hotkeys_plugin.dll b/LibVlc/plugins/control/libwin_hotkeys_plugin.dll
deleted file mode 100644
index e4faca1..0000000
Binary files a/LibVlc/plugins/control/libwin_hotkeys_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/control/libwin_msg_plugin.dll b/LibVlc/plugins/control/libwin_msg_plugin.dll
deleted file mode 100644
index ed34de3..0000000
Binary files a/LibVlc/plugins/control/libwin_msg_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libaiff_plugin.dll b/LibVlc/plugins/demux/libaiff_plugin.dll
deleted file mode 100644
index 26d1944..0000000
Binary files a/LibVlc/plugins/demux/libaiff_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libasf_plugin.dll b/LibVlc/plugins/demux/libasf_plugin.dll
deleted file mode 100644
index 55a1a39..0000000
Binary files a/LibVlc/plugins/demux/libasf_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libau_plugin.dll b/LibVlc/plugins/demux/libau_plugin.dll
deleted file mode 100644
index 254ba38..0000000
Binary files a/LibVlc/plugins/demux/libau_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libavi_plugin.dll b/LibVlc/plugins/demux/libavi_plugin.dll
deleted file mode 100644
index 3589036..0000000
Binary files a/LibVlc/plugins/demux/libavi_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libcaf_plugin.dll b/LibVlc/plugins/demux/libcaf_plugin.dll
deleted file mode 100644
index 6722af7..0000000
Binary files a/LibVlc/plugins/demux/libcaf_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libdemux_cdg_plugin.dll b/LibVlc/plugins/demux/libdemux_cdg_plugin.dll
deleted file mode 100644
index 4c58a66..0000000
Binary files a/LibVlc/plugins/demux/libdemux_cdg_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libdemux_stl_plugin.dll b/LibVlc/plugins/demux/libdemux_stl_plugin.dll
deleted file mode 100644
index c7a455d..0000000
Binary files a/LibVlc/plugins/demux/libdemux_stl_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libdemuxdump_plugin.dll b/LibVlc/plugins/demux/libdemuxdump_plugin.dll
deleted file mode 100644
index 1d59701..0000000
Binary files a/LibVlc/plugins/demux/libdemuxdump_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libdiracsys_plugin.dll b/LibVlc/plugins/demux/libdiracsys_plugin.dll
deleted file mode 100644
index 9d6fb8f..0000000
Binary files a/LibVlc/plugins/demux/libdiracsys_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libes_plugin.dll b/LibVlc/plugins/demux/libes_plugin.dll
deleted file mode 100644
index d48e265..0000000
Binary files a/LibVlc/plugins/demux/libes_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libflacsys_plugin.dll b/LibVlc/plugins/demux/libflacsys_plugin.dll
deleted file mode 100644
index da00efa..0000000
Binary files a/LibVlc/plugins/demux/libflacsys_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libgme_plugin.dll b/LibVlc/plugins/demux/libgme_plugin.dll
deleted file mode 100644
index 5d7ec4e..0000000
Binary files a/LibVlc/plugins/demux/libgme_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libh264_plugin.dll b/LibVlc/plugins/demux/libh264_plugin.dll
deleted file mode 100644
index 03f6648..0000000
Binary files a/LibVlc/plugins/demux/libh264_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libhevc_plugin.dll b/LibVlc/plugins/demux/libhevc_plugin.dll
deleted file mode 100644
index e362e4c..0000000
Binary files a/LibVlc/plugins/demux/libhevc_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libimage_plugin.dll b/LibVlc/plugins/demux/libimage_plugin.dll
deleted file mode 100644
index 2314bb2..0000000
Binary files a/LibVlc/plugins/demux/libimage_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libmjpeg_plugin.dll b/LibVlc/plugins/demux/libmjpeg_plugin.dll
deleted file mode 100644
index d8bbe96..0000000
Binary files a/LibVlc/plugins/demux/libmjpeg_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libmkv_plugin.dll b/LibVlc/plugins/demux/libmkv_plugin.dll
deleted file mode 100644
index 5a1553f..0000000
Binary files a/LibVlc/plugins/demux/libmkv_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libmod_plugin.dll b/LibVlc/plugins/demux/libmod_plugin.dll
deleted file mode 100644
index 3eb3c4b..0000000
Binary files a/LibVlc/plugins/demux/libmod_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libmp4_plugin.dll b/LibVlc/plugins/demux/libmp4_plugin.dll
deleted file mode 100644
index 9bb662a..0000000
Binary files a/LibVlc/plugins/demux/libmp4_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libmpc_plugin.dll b/LibVlc/plugins/demux/libmpc_plugin.dll
deleted file mode 100644
index 012600b..0000000
Binary files a/LibVlc/plugins/demux/libmpc_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libmpgv_plugin.dll b/LibVlc/plugins/demux/libmpgv_plugin.dll
deleted file mode 100644
index 88b78e1..0000000
Binary files a/LibVlc/plugins/demux/libmpgv_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libnsc_plugin.dll b/LibVlc/plugins/demux/libnsc_plugin.dll
deleted file mode 100644
index 00b02e6..0000000
Binary files a/LibVlc/plugins/demux/libnsc_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libnsv_plugin.dll b/LibVlc/plugins/demux/libnsv_plugin.dll
deleted file mode 100644
index a9e3158..0000000
Binary files a/LibVlc/plugins/demux/libnsv_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libnuv_plugin.dll b/LibVlc/plugins/demux/libnuv_plugin.dll
deleted file mode 100644
index 5f79056..0000000
Binary files a/LibVlc/plugins/demux/libnuv_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libogg_plugin.dll b/LibVlc/plugins/demux/libogg_plugin.dll
deleted file mode 100644
index 20e1017..0000000
Binary files a/LibVlc/plugins/demux/libogg_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libplaylist_plugin.dll b/LibVlc/plugins/demux/libplaylist_plugin.dll
deleted file mode 100644
index 7f29f5e..0000000
Binary files a/LibVlc/plugins/demux/libplaylist_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libps_plugin.dll b/LibVlc/plugins/demux/libps_plugin.dll
deleted file mode 100644
index 6411732..0000000
Binary files a/LibVlc/plugins/demux/libps_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libpva_plugin.dll b/LibVlc/plugins/demux/libpva_plugin.dll
deleted file mode 100644
index 352d6a7..0000000
Binary files a/LibVlc/plugins/demux/libpva_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/librawaud_plugin.dll b/LibVlc/plugins/demux/librawaud_plugin.dll
deleted file mode 100644
index 7c286c5..0000000
Binary files a/LibVlc/plugins/demux/librawaud_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/librawdv_plugin.dll b/LibVlc/plugins/demux/librawdv_plugin.dll
deleted file mode 100644
index 9b1a1b8..0000000
Binary files a/LibVlc/plugins/demux/librawdv_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/librawvid_plugin.dll b/LibVlc/plugins/demux/librawvid_plugin.dll
deleted file mode 100644
index e84f2a3..0000000
Binary files a/LibVlc/plugins/demux/librawvid_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libreal_plugin.dll b/LibVlc/plugins/demux/libreal_plugin.dll
deleted file mode 100644
index b6332a2..0000000
Binary files a/LibVlc/plugins/demux/libreal_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libsid_plugin.dll b/LibVlc/plugins/demux/libsid_plugin.dll
deleted file mode 100644
index f96f3d3..0000000
Binary files a/LibVlc/plugins/demux/libsid_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libsmf_plugin.dll b/LibVlc/plugins/demux/libsmf_plugin.dll
deleted file mode 100644
index 297c2d1..0000000
Binary files a/LibVlc/plugins/demux/libsmf_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libsubtitle_plugin.dll b/LibVlc/plugins/demux/libsubtitle_plugin.dll
deleted file mode 100644
index 82e6769..0000000
Binary files a/LibVlc/plugins/demux/libsubtitle_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libts_plugin.dll b/LibVlc/plugins/demux/libts_plugin.dll
deleted file mode 100644
index 7ac96f7..0000000
Binary files a/LibVlc/plugins/demux/libts_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libtta_plugin.dll b/LibVlc/plugins/demux/libtta_plugin.dll
deleted file mode 100644
index 93a67ec..0000000
Binary files a/LibVlc/plugins/demux/libtta_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libty_plugin.dll b/LibVlc/plugins/demux/libty_plugin.dll
deleted file mode 100644
index 9d7bb47..0000000
Binary files a/LibVlc/plugins/demux/libty_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libvc1_plugin.dll b/LibVlc/plugins/demux/libvc1_plugin.dll
deleted file mode 100644
index a5c1c92..0000000
Binary files a/LibVlc/plugins/demux/libvc1_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libvobsub_plugin.dll b/LibVlc/plugins/demux/libvobsub_plugin.dll
deleted file mode 100644
index d0c9cb5..0000000
Binary files a/LibVlc/plugins/demux/libvobsub_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libvoc_plugin.dll b/LibVlc/plugins/demux/libvoc_plugin.dll
deleted file mode 100644
index 60ae7fe..0000000
Binary files a/LibVlc/plugins/demux/libvoc_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libwav_plugin.dll b/LibVlc/plugins/demux/libwav_plugin.dll
deleted file mode 100644
index 9528908..0000000
Binary files a/LibVlc/plugins/demux/libwav_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/demux/libxa_plugin.dll b/LibVlc/plugins/demux/libxa_plugin.dll
deleted file mode 100644
index 20e73f9..0000000
Binary files a/LibVlc/plugins/demux/libxa_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/gui/libqt4_plugin.dll b/LibVlc/plugins/gui/libqt4_plugin.dll
deleted file mode 100644
index 5c4f40c..0000000
Binary files a/LibVlc/plugins/gui/libqt4_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/gui/libskins2_plugin.dll b/LibVlc/plugins/gui/libskins2_plugin.dll
deleted file mode 100644
index 66786c4..0000000
Binary files a/LibVlc/plugins/gui/libskins2_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/lua/liblua_plugin.dll b/LibVlc/plugins/lua/liblua_plugin.dll
deleted file mode 100644
index 2e5902a..0000000
Binary files a/LibVlc/plugins/lua/liblua_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/meta_engine/libfolder_plugin.dll b/LibVlc/plugins/meta_engine/libfolder_plugin.dll
deleted file mode 100644
index 981d66c..0000000
Binary files a/LibVlc/plugins/meta_engine/libfolder_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/meta_engine/libtaglib_plugin.dll b/LibVlc/plugins/meta_engine/libtaglib_plugin.dll
deleted file mode 100644
index a49eab9..0000000
Binary files a/LibVlc/plugins/meta_engine/libtaglib_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/misc/libaddonsfsstorage_plugin.dll b/LibVlc/plugins/misc/libaddonsfsstorage_plugin.dll
deleted file mode 100644
index 06f3cec..0000000
Binary files a/LibVlc/plugins/misc/libaddonsfsstorage_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/misc/libaddonsvorepository_plugin.dll b/LibVlc/plugins/misc/libaddonsvorepository_plugin.dll
deleted file mode 100644
index 27fe1f8..0000000
Binary files a/LibVlc/plugins/misc/libaddonsvorepository_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/misc/libaudioscrobbler_plugin.dll b/LibVlc/plugins/misc/libaudioscrobbler_plugin.dll
deleted file mode 100644
index 95da766..0000000
Binary files a/LibVlc/plugins/misc/libaudioscrobbler_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/misc/libexport_plugin.dll b/LibVlc/plugins/misc/libexport_plugin.dll
deleted file mode 100644
index 5459ebc..0000000
Binary files a/LibVlc/plugins/misc/libexport_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/misc/libfingerprinter_plugin.dll b/LibVlc/plugins/misc/libfingerprinter_plugin.dll
deleted file mode 100644
index 09b3ab2..0000000
Binary files a/LibVlc/plugins/misc/libfingerprinter_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/misc/libgnutls_plugin.dll b/LibVlc/plugins/misc/libgnutls_plugin.dll
deleted file mode 100644
index e944961..0000000
Binary files a/LibVlc/plugins/misc/libgnutls_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/misc/liblogger_plugin.dll b/LibVlc/plugins/misc/liblogger_plugin.dll
deleted file mode 100644
index b204d9b..0000000
Binary files a/LibVlc/plugins/misc/liblogger_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/misc/libstats_plugin.dll b/LibVlc/plugins/misc/libstats_plugin.dll
deleted file mode 100644
index 4ea1ddb..0000000
Binary files a/LibVlc/plugins/misc/libstats_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/misc/libvod_rtsp_plugin.dll b/LibVlc/plugins/misc/libvod_rtsp_plugin.dll
deleted file mode 100644
index ddc4f6e..0000000
Binary files a/LibVlc/plugins/misc/libvod_rtsp_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/misc/libxml_plugin.dll b/LibVlc/plugins/misc/libxml_plugin.dll
deleted file mode 100644
index f3c92d2..0000000
Binary files a/LibVlc/plugins/misc/libxml_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/mux/libmux_asf_plugin.dll b/LibVlc/plugins/mux/libmux_asf_plugin.dll
deleted file mode 100644
index 8e02087..0000000
Binary files a/LibVlc/plugins/mux/libmux_asf_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/mux/libmux_avi_plugin.dll b/LibVlc/plugins/mux/libmux_avi_plugin.dll
deleted file mode 100644
index fc688d9..0000000
Binary files a/LibVlc/plugins/mux/libmux_avi_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/mux/libmux_dummy_plugin.dll b/LibVlc/plugins/mux/libmux_dummy_plugin.dll
deleted file mode 100644
index 2a35ddf..0000000
Binary files a/LibVlc/plugins/mux/libmux_dummy_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/mux/libmux_mp4_plugin.dll b/LibVlc/plugins/mux/libmux_mp4_plugin.dll
deleted file mode 100644
index d59c43f..0000000
Binary files a/LibVlc/plugins/mux/libmux_mp4_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/mux/libmux_mpjpeg_plugin.dll b/LibVlc/plugins/mux/libmux_mpjpeg_plugin.dll
deleted file mode 100644
index 30763a2..0000000
Binary files a/LibVlc/plugins/mux/libmux_mpjpeg_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/mux/libmux_ogg_plugin.dll b/LibVlc/plugins/mux/libmux_ogg_plugin.dll
deleted file mode 100644
index f24ce2d..0000000
Binary files a/LibVlc/plugins/mux/libmux_ogg_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/mux/libmux_ps_plugin.dll b/LibVlc/plugins/mux/libmux_ps_plugin.dll
deleted file mode 100644
index 7809690..0000000
Binary files a/LibVlc/plugins/mux/libmux_ps_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/mux/libmux_ts_plugin.dll b/LibVlc/plugins/mux/libmux_ts_plugin.dll
deleted file mode 100644
index 0082693..0000000
Binary files a/LibVlc/plugins/mux/libmux_ts_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/mux/libmux_wav_plugin.dll b/LibVlc/plugins/mux/libmux_wav_plugin.dll
deleted file mode 100644
index 2f3d0bc..0000000
Binary files a/LibVlc/plugins/mux/libmux_wav_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/packetizer/libpacketizer_copy_plugin.dll b/LibVlc/plugins/packetizer/libpacketizer_copy_plugin.dll
deleted file mode 100644
index f7adaf9..0000000
Binary files a/LibVlc/plugins/packetizer/libpacketizer_copy_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/packetizer/libpacketizer_dirac_plugin.dll b/LibVlc/plugins/packetizer/libpacketizer_dirac_plugin.dll
deleted file mode 100644
index 4d8414d..0000000
Binary files a/LibVlc/plugins/packetizer/libpacketizer_dirac_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/packetizer/libpacketizer_flac_plugin.dll b/LibVlc/plugins/packetizer/libpacketizer_flac_plugin.dll
deleted file mode 100644
index 6b81aac..0000000
Binary files a/LibVlc/plugins/packetizer/libpacketizer_flac_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/packetizer/libpacketizer_h264_plugin.dll b/LibVlc/plugins/packetizer/libpacketizer_h264_plugin.dll
deleted file mode 100644
index 658691b..0000000
Binary files a/LibVlc/plugins/packetizer/libpacketizer_h264_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/packetizer/libpacketizer_hevc_plugin.dll b/LibVlc/plugins/packetizer/libpacketizer_hevc_plugin.dll
deleted file mode 100644
index 3454269..0000000
Binary files a/LibVlc/plugins/packetizer/libpacketizer_hevc_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/packetizer/libpacketizer_mlp_plugin.dll b/LibVlc/plugins/packetizer/libpacketizer_mlp_plugin.dll
deleted file mode 100644
index b721922..0000000
Binary files a/LibVlc/plugins/packetizer/libpacketizer_mlp_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/packetizer/libpacketizer_mpeg4audio_plugin.dll b/LibVlc/plugins/packetizer/libpacketizer_mpeg4audio_plugin.dll
deleted file mode 100644
index e4f1200..0000000
Binary files a/LibVlc/plugins/packetizer/libpacketizer_mpeg4audio_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/packetizer/libpacketizer_mpeg4video_plugin.dll b/LibVlc/plugins/packetizer/libpacketizer_mpeg4video_plugin.dll
deleted file mode 100644
index 891f46a..0000000
Binary files a/LibVlc/plugins/packetizer/libpacketizer_mpeg4video_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/packetizer/libpacketizer_mpegvideo_plugin.dll b/LibVlc/plugins/packetizer/libpacketizer_mpegvideo_plugin.dll
deleted file mode 100644
index 979f7fb..0000000
Binary files a/LibVlc/plugins/packetizer/libpacketizer_mpegvideo_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/packetizer/libpacketizer_vc1_plugin.dll b/LibVlc/plugins/packetizer/libpacketizer_vc1_plugin.dll
deleted file mode 100644
index 5de725b..0000000
Binary files a/LibVlc/plugins/packetizer/libpacketizer_vc1_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/plugins.dat.46032 b/LibVlc/plugins/plugins.dat.46032
deleted file mode 100644
index 45a3185..0000000
Binary files a/LibVlc/plugins/plugins.dat.46032 and /dev/null differ
diff --git a/LibVlc/plugins/services_discovery/libmediadirs_plugin.dll b/LibVlc/plugins/services_discovery/libmediadirs_plugin.dll
deleted file mode 100644
index e817086..0000000
Binary files a/LibVlc/plugins/services_discovery/libmediadirs_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/services_discovery/libpodcast_plugin.dll b/LibVlc/plugins/services_discovery/libpodcast_plugin.dll
deleted file mode 100644
index 048119a..0000000
Binary files a/LibVlc/plugins/services_discovery/libpodcast_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/services_discovery/libsap_plugin.dll b/LibVlc/plugins/services_discovery/libsap_plugin.dll
deleted file mode 100644
index 7f02e2b..0000000
Binary files a/LibVlc/plugins/services_discovery/libsap_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/services_discovery/libupnp_plugin.dll b/LibVlc/plugins/services_discovery/libupnp_plugin.dll
deleted file mode 100644
index b037684..0000000
Binary files a/LibVlc/plugins/services_discovery/libupnp_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/services_discovery/libwindrive_plugin.dll b/LibVlc/plugins/services_discovery/libwindrive_plugin.dll
deleted file mode 100644
index eb56f3c..0000000
Binary files a/LibVlc/plugins/services_discovery/libwindrive_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_filter/libdash_plugin.dll b/LibVlc/plugins/stream_filter/libdash_plugin.dll
deleted file mode 100644
index df0ac6d..0000000
Binary files a/LibVlc/plugins/stream_filter/libdash_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_filter/libhttplive_plugin.dll b/LibVlc/plugins/stream_filter/libhttplive_plugin.dll
deleted file mode 100644
index 417928f..0000000
Binary files a/LibVlc/plugins/stream_filter/libhttplive_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_filter/librecord_plugin.dll b/LibVlc/plugins/stream_filter/librecord_plugin.dll
deleted file mode 100644
index bda036c..0000000
Binary files a/LibVlc/plugins/stream_filter/librecord_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_filter/libsmooth_plugin.dll b/LibVlc/plugins/stream_filter/libsmooth_plugin.dll
deleted file mode 100644
index 95e8203..0000000
Binary files a/LibVlc/plugins/stream_filter/libsmooth_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_autodel_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_autodel_plugin.dll
deleted file mode 100644
index f2f5e89..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_autodel_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_bridge_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_bridge_plugin.dll
deleted file mode 100644
index 525ff6d..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_bridge_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_chromaprint_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_chromaprint_plugin.dll
deleted file mode 100644
index 0a9802a..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_chromaprint_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_delay_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_delay_plugin.dll
deleted file mode 100644
index 63800fe..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_delay_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_description_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_description_plugin.dll
deleted file mode 100644
index 3a7ef81..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_description_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_display_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_display_plugin.dll
deleted file mode 100644
index 1548452..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_display_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_dummy_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_dummy_plugin.dll
deleted file mode 100644
index 14364f4..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_dummy_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_duplicate_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_duplicate_plugin.dll
deleted file mode 100644
index 9dc7127..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_duplicate_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_es_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_es_plugin.dll
deleted file mode 100644
index 9cfe068..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_es_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_gather_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_gather_plugin.dll
deleted file mode 100644
index 5a7993e..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_gather_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_langfromtelx_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_langfromtelx_plugin.dll
deleted file mode 100644
index f362be9..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_langfromtelx_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_mosaic_bridge_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_mosaic_bridge_plugin.dll
deleted file mode 100644
index 183f18c..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_mosaic_bridge_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_raop_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_raop_plugin.dll
deleted file mode 100644
index aafb9de..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_raop_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_record_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_record_plugin.dll
deleted file mode 100644
index 96b529f..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_record_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_rtp_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_rtp_plugin.dll
deleted file mode 100644
index 29a5934..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_rtp_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_setid_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_setid_plugin.dll
deleted file mode 100644
index 72b86a3..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_setid_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_smem_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_smem_plugin.dll
deleted file mode 100644
index f490431..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_smem_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_standard_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_standard_plugin.dll
deleted file mode 100644
index 99a7e0a..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_standard_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_stats_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_stats_plugin.dll
deleted file mode 100644
index fb649cd..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_stats_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/stream_out/libstream_out_transcode_plugin.dll b/LibVlc/plugins/stream_out/libstream_out_transcode_plugin.dll
deleted file mode 100644
index 38db605..0000000
Binary files a/LibVlc/plugins/stream_out/libstream_out_transcode_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/text_renderer/libfreetype_plugin.dll b/LibVlc/plugins/text_renderer/libfreetype_plugin.dll
deleted file mode 100644
index 751ca9d..0000000
Binary files a/LibVlc/plugins/text_renderer/libfreetype_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/text_renderer/libtdummy_plugin.dll b/LibVlc/plugins/text_renderer/libtdummy_plugin.dll
deleted file mode 100644
index 0c22fa4..0000000
Binary files a/LibVlc/plugins/text_renderer/libtdummy_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_chroma/libchain_plugin.dll b/LibVlc/plugins/video_chroma/libchain_plugin.dll
deleted file mode 100644
index c30b5d7..0000000
Binary files a/LibVlc/plugins/video_chroma/libchain_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_chroma/libgrey_yuv_plugin.dll b/LibVlc/plugins/video_chroma/libgrey_yuv_plugin.dll
deleted file mode 100644
index 7d1e04d..0000000
Binary files a/LibVlc/plugins/video_chroma/libgrey_yuv_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_chroma/libi420_rgb_mmx_plugin.dll b/LibVlc/plugins/video_chroma/libi420_rgb_mmx_plugin.dll
deleted file mode 100644
index a8cbd28..0000000
Binary files a/LibVlc/plugins/video_chroma/libi420_rgb_mmx_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_chroma/libi420_rgb_plugin.dll b/LibVlc/plugins/video_chroma/libi420_rgb_plugin.dll
deleted file mode 100644
index b91af2b..0000000
Binary files a/LibVlc/plugins/video_chroma/libi420_rgb_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_chroma/libi420_rgb_sse2_plugin.dll b/LibVlc/plugins/video_chroma/libi420_rgb_sse2_plugin.dll
deleted file mode 100644
index 34fa2a8..0000000
Binary files a/LibVlc/plugins/video_chroma/libi420_rgb_sse2_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_chroma/libi420_yuy2_mmx_plugin.dll b/LibVlc/plugins/video_chroma/libi420_yuy2_mmx_plugin.dll
deleted file mode 100644
index bf8c45a..0000000
Binary files a/LibVlc/plugins/video_chroma/libi420_yuy2_mmx_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_chroma/libi420_yuy2_plugin.dll b/LibVlc/plugins/video_chroma/libi420_yuy2_plugin.dll
deleted file mode 100644
index e80b156..0000000
Binary files a/LibVlc/plugins/video_chroma/libi420_yuy2_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_chroma/libi420_yuy2_sse2_plugin.dll b/LibVlc/plugins/video_chroma/libi420_yuy2_sse2_plugin.dll
deleted file mode 100644
index 9b50595..0000000
Binary files a/LibVlc/plugins/video_chroma/libi420_yuy2_sse2_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_chroma/libi422_i420_plugin.dll b/LibVlc/plugins/video_chroma/libi422_i420_plugin.dll
deleted file mode 100644
index 8635c97..0000000
Binary files a/LibVlc/plugins/video_chroma/libi422_i420_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_chroma/libi422_yuy2_mmx_plugin.dll b/LibVlc/plugins/video_chroma/libi422_yuy2_mmx_plugin.dll
deleted file mode 100644
index 87fb117..0000000
Binary files a/LibVlc/plugins/video_chroma/libi422_yuy2_mmx_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_chroma/libi422_yuy2_plugin.dll b/LibVlc/plugins/video_chroma/libi422_yuy2_plugin.dll
deleted file mode 100644
index c74bcae..0000000
Binary files a/LibVlc/plugins/video_chroma/libi422_yuy2_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_chroma/libi422_yuy2_sse2_plugin.dll b/LibVlc/plugins/video_chroma/libi422_yuy2_sse2_plugin.dll
deleted file mode 100644
index c8628ea..0000000
Binary files a/LibVlc/plugins/video_chroma/libi422_yuy2_sse2_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_chroma/librv32_plugin.dll b/LibVlc/plugins/video_chroma/librv32_plugin.dll
deleted file mode 100644
index 96f21ba..0000000
Binary files a/LibVlc/plugins/video_chroma/librv32_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_chroma/libswscale_plugin.dll b/LibVlc/plugins/video_chroma/libswscale_plugin.dll
deleted file mode 100644
index a66a12a..0000000
Binary files a/LibVlc/plugins/video_chroma/libswscale_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_chroma/libyuy2_i420_plugin.dll b/LibVlc/plugins/video_chroma/libyuy2_i420_plugin.dll
deleted file mode 100644
index 6967d5c..0000000
Binary files a/LibVlc/plugins/video_chroma/libyuy2_i420_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_chroma/libyuy2_i422_plugin.dll b/LibVlc/plugins/video_chroma/libyuy2_i422_plugin.dll
deleted file mode 100644
index 33257e9..0000000
Binary files a/LibVlc/plugins/video_chroma/libyuy2_i422_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libadjust_plugin.dll b/LibVlc/plugins/video_filter/libadjust_plugin.dll
deleted file mode 100644
index 9396e94..0000000
Binary files a/LibVlc/plugins/video_filter/libadjust_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libalphamask_plugin.dll b/LibVlc/plugins/video_filter/libalphamask_plugin.dll
deleted file mode 100644
index ad7a774..0000000
Binary files a/LibVlc/plugins/video_filter/libalphamask_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libanaglyph_plugin.dll b/LibVlc/plugins/video_filter/libanaglyph_plugin.dll
deleted file mode 100644
index 5f795b7..0000000
Binary files a/LibVlc/plugins/video_filter/libanaglyph_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libantiflicker_plugin.dll b/LibVlc/plugins/video_filter/libantiflicker_plugin.dll
deleted file mode 100644
index 7a021ab..0000000
Binary files a/LibVlc/plugins/video_filter/libantiflicker_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libatmo_plugin.dll b/LibVlc/plugins/video_filter/libatmo_plugin.dll
deleted file mode 100644
index 89dea55..0000000
Binary files a/LibVlc/plugins/video_filter/libatmo_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libaudiobargraph_v_plugin.dll b/LibVlc/plugins/video_filter/libaudiobargraph_v_plugin.dll
deleted file mode 100644
index 7b003f4..0000000
Binary files a/LibVlc/plugins/video_filter/libaudiobargraph_v_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libball_plugin.dll b/LibVlc/plugins/video_filter/libball_plugin.dll
deleted file mode 100644
index 2ac143a..0000000
Binary files a/LibVlc/plugins/video_filter/libball_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libblend_plugin.dll b/LibVlc/plugins/video_filter/libblend_plugin.dll
deleted file mode 100644
index 5153e84..0000000
Binary files a/LibVlc/plugins/video_filter/libblend_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libblendbench_plugin.dll b/LibVlc/plugins/video_filter/libblendbench_plugin.dll
deleted file mode 100644
index a37b030..0000000
Binary files a/LibVlc/plugins/video_filter/libblendbench_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libbluescreen_plugin.dll b/LibVlc/plugins/video_filter/libbluescreen_plugin.dll
deleted file mode 100644
index 113ed05..0000000
Binary files a/LibVlc/plugins/video_filter/libbluescreen_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libcanvas_plugin.dll b/LibVlc/plugins/video_filter/libcanvas_plugin.dll
deleted file mode 100644
index 047fa3f..0000000
Binary files a/LibVlc/plugins/video_filter/libcanvas_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libcolorthres_plugin.dll b/LibVlc/plugins/video_filter/libcolorthres_plugin.dll
deleted file mode 100644
index edea1b4..0000000
Binary files a/LibVlc/plugins/video_filter/libcolorthres_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libcroppadd_plugin.dll b/LibVlc/plugins/video_filter/libcroppadd_plugin.dll
deleted file mode 100644
index 051fde8..0000000
Binary files a/LibVlc/plugins/video_filter/libcroppadd_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libdeinterlace_plugin.dll b/LibVlc/plugins/video_filter/libdeinterlace_plugin.dll
deleted file mode 100644
index afe9f46..0000000
Binary files a/LibVlc/plugins/video_filter/libdeinterlace_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/liberase_plugin.dll b/LibVlc/plugins/video_filter/liberase_plugin.dll
deleted file mode 100644
index 602a2f3..0000000
Binary files a/LibVlc/plugins/video_filter/liberase_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libextract_plugin.dll b/LibVlc/plugins/video_filter/libextract_plugin.dll
deleted file mode 100644
index 4a1f02f..0000000
Binary files a/LibVlc/plugins/video_filter/libextract_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libfreeze_plugin.dll b/LibVlc/plugins/video_filter/libfreeze_plugin.dll
deleted file mode 100644
index ea52c54..0000000
Binary files a/LibVlc/plugins/video_filter/libfreeze_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libgaussianblur_plugin.dll b/LibVlc/plugins/video_filter/libgaussianblur_plugin.dll
deleted file mode 100644
index 2b8d376..0000000
Binary files a/LibVlc/plugins/video_filter/libgaussianblur_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libgradfun_plugin.dll b/LibVlc/plugins/video_filter/libgradfun_plugin.dll
deleted file mode 100644
index dd9ee51..0000000
Binary files a/LibVlc/plugins/video_filter/libgradfun_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libgradient_plugin.dll b/LibVlc/plugins/video_filter/libgradient_plugin.dll
deleted file mode 100644
index cc8aabd..0000000
Binary files a/LibVlc/plugins/video_filter/libgradient_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libgrain_plugin.dll b/LibVlc/plugins/video_filter/libgrain_plugin.dll
deleted file mode 100644
index e05e573..0000000
Binary files a/LibVlc/plugins/video_filter/libgrain_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libhqdn3d_plugin.dll b/LibVlc/plugins/video_filter/libhqdn3d_plugin.dll
deleted file mode 100644
index de34012..0000000
Binary files a/LibVlc/plugins/video_filter/libhqdn3d_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libinvert_plugin.dll b/LibVlc/plugins/video_filter/libinvert_plugin.dll
deleted file mode 100644
index 3ff5412..0000000
Binary files a/LibVlc/plugins/video_filter/libinvert_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/liblogo_plugin.dll b/LibVlc/plugins/video_filter/liblogo_plugin.dll
deleted file mode 100644
index 08b54cc..0000000
Binary files a/LibVlc/plugins/video_filter/liblogo_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libmagnify_plugin.dll b/LibVlc/plugins/video_filter/libmagnify_plugin.dll
deleted file mode 100644
index a5d8d73..0000000
Binary files a/LibVlc/plugins/video_filter/libmagnify_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libmarq_plugin.dll b/LibVlc/plugins/video_filter/libmarq_plugin.dll
deleted file mode 100644
index 2483630..0000000
Binary files a/LibVlc/plugins/video_filter/libmarq_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libmirror_plugin.dll b/LibVlc/plugins/video_filter/libmirror_plugin.dll
deleted file mode 100644
index 1ce80a9..0000000
Binary files a/LibVlc/plugins/video_filter/libmirror_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libmosaic_plugin.dll b/LibVlc/plugins/video_filter/libmosaic_plugin.dll
deleted file mode 100644
index a0ee451..0000000
Binary files a/LibVlc/plugins/video_filter/libmosaic_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libmotionblur_plugin.dll b/LibVlc/plugins/video_filter/libmotionblur_plugin.dll
deleted file mode 100644
index b8b2fe1..0000000
Binary files a/LibVlc/plugins/video_filter/libmotionblur_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libmotiondetect_plugin.dll b/LibVlc/plugins/video_filter/libmotiondetect_plugin.dll
deleted file mode 100644
index bac2036..0000000
Binary files a/LibVlc/plugins/video_filter/libmotiondetect_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/liboldmovie_plugin.dll b/LibVlc/plugins/video_filter/liboldmovie_plugin.dll
deleted file mode 100644
index 3545dc5..0000000
Binary files a/LibVlc/plugins/video_filter/liboldmovie_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libposterize_plugin.dll b/LibVlc/plugins/video_filter/libposterize_plugin.dll
deleted file mode 100644
index cf76860..0000000
Binary files a/LibVlc/plugins/video_filter/libposterize_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libpostproc_plugin.dll b/LibVlc/plugins/video_filter/libpostproc_plugin.dll
deleted file mode 100644
index bfff6c4..0000000
Binary files a/LibVlc/plugins/video_filter/libpostproc_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libpsychedelic_plugin.dll b/LibVlc/plugins/video_filter/libpsychedelic_plugin.dll
deleted file mode 100644
index 30de976..0000000
Binary files a/LibVlc/plugins/video_filter/libpsychedelic_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libpuzzle_plugin.dll b/LibVlc/plugins/video_filter/libpuzzle_plugin.dll
deleted file mode 100644
index f5e1a9e..0000000
Binary files a/LibVlc/plugins/video_filter/libpuzzle_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libremoteosd_plugin.dll b/LibVlc/plugins/video_filter/libremoteosd_plugin.dll
deleted file mode 100644
index a47a0a3..0000000
Binary files a/LibVlc/plugins/video_filter/libremoteosd_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libripple_plugin.dll b/LibVlc/plugins/video_filter/libripple_plugin.dll
deleted file mode 100644
index 57a252d..0000000
Binary files a/LibVlc/plugins/video_filter/libripple_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/librotate_plugin.dll b/LibVlc/plugins/video_filter/librotate_plugin.dll
deleted file mode 100644
index dfefc6f..0000000
Binary files a/LibVlc/plugins/video_filter/librotate_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/librss_plugin.dll b/LibVlc/plugins/video_filter/librss_plugin.dll
deleted file mode 100644
index 8b40843..0000000
Binary files a/LibVlc/plugins/video_filter/librss_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libscale_plugin.dll b/LibVlc/plugins/video_filter/libscale_plugin.dll
deleted file mode 100644
index fede15f..0000000
Binary files a/LibVlc/plugins/video_filter/libscale_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libscene_plugin.dll b/LibVlc/plugins/video_filter/libscene_plugin.dll
deleted file mode 100644
index 806aa43..0000000
Binary files a/LibVlc/plugins/video_filter/libscene_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libsepia_plugin.dll b/LibVlc/plugins/video_filter/libsepia_plugin.dll
deleted file mode 100644
index 9434b73..0000000
Binary files a/LibVlc/plugins/video_filter/libsepia_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libsharpen_plugin.dll b/LibVlc/plugins/video_filter/libsharpen_plugin.dll
deleted file mode 100644
index 9c46480..0000000
Binary files a/LibVlc/plugins/video_filter/libsharpen_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libsubsdelay_plugin.dll b/LibVlc/plugins/video_filter/libsubsdelay_plugin.dll
deleted file mode 100644
index f2a5df2..0000000
Binary files a/LibVlc/plugins/video_filter/libsubsdelay_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libtransform_plugin.dll b/LibVlc/plugins/video_filter/libtransform_plugin.dll
deleted file mode 100644
index b881011..0000000
Binary files a/LibVlc/plugins/video_filter/libtransform_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libvhs_plugin.dll b/LibVlc/plugins/video_filter/libvhs_plugin.dll
deleted file mode 100644
index 461ac62..0000000
Binary files a/LibVlc/plugins/video_filter/libvhs_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libwave_plugin.dll b/LibVlc/plugins/video_filter/libwave_plugin.dll
deleted file mode 100644
index 93f3c42..0000000
Binary files a/LibVlc/plugins/video_filter/libwave_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_filter/libyuvp_plugin.dll b/LibVlc/plugins/video_filter/libyuvp_plugin.dll
deleted file mode 100644
index c4afd5d..0000000
Binary files a/LibVlc/plugins/video_filter/libyuvp_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_output/libcaca_plugin.dll b/LibVlc/plugins/video_output/libcaca_plugin.dll
deleted file mode 100644
index 76e9194..0000000
Binary files a/LibVlc/plugins/video_output/libcaca_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_output/libdirect2d_plugin.dll b/LibVlc/plugins/video_output/libdirect2d_plugin.dll
deleted file mode 100644
index 3259910..0000000
Binary files a/LibVlc/plugins/video_output/libdirect2d_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_output/libdirect3d_plugin.dll b/LibVlc/plugins/video_output/libdirect3d_plugin.dll
deleted file mode 100644
index d67c606..0000000
Binary files a/LibVlc/plugins/video_output/libdirect3d_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_output/libdirectdraw_plugin.dll b/LibVlc/plugins/video_output/libdirectdraw_plugin.dll
deleted file mode 100644
index d8bee82..0000000
Binary files a/LibVlc/plugins/video_output/libdirectdraw_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_output/libdrawable_plugin.dll b/LibVlc/plugins/video_output/libdrawable_plugin.dll
deleted file mode 100644
index 9fe3b82..0000000
Binary files a/LibVlc/plugins/video_output/libdrawable_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_output/libgl_plugin.dll b/LibVlc/plugins/video_output/libgl_plugin.dll
deleted file mode 100644
index 1a5cd91..0000000
Binary files a/LibVlc/plugins/video_output/libgl_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_output/libglwin32_plugin.dll b/LibVlc/plugins/video_output/libglwin32_plugin.dll
deleted file mode 100644
index c39003c..0000000
Binary files a/LibVlc/plugins/video_output/libglwin32_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_output/libvdummy_plugin.dll b/LibVlc/plugins/video_output/libvdummy_plugin.dll
deleted file mode 100644
index d0beab7..0000000
Binary files a/LibVlc/plugins/video_output/libvdummy_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_output/libvmem_plugin.dll b/LibVlc/plugins/video_output/libvmem_plugin.dll
deleted file mode 100644
index c577dc4..0000000
Binary files a/LibVlc/plugins/video_output/libvmem_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_output/libwingdi_plugin.dll b/LibVlc/plugins/video_output/libwingdi_plugin.dll
deleted file mode 100644
index dd76831..0000000
Binary files a/LibVlc/plugins/video_output/libwingdi_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_output/libyuv_plugin.dll b/LibVlc/plugins/video_output/libyuv_plugin.dll
deleted file mode 100644
index ae734d1..0000000
Binary files a/LibVlc/plugins/video_output/libyuv_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_splitter/libclone_plugin.dll b/LibVlc/plugins/video_splitter/libclone_plugin.dll
deleted file mode 100644
index 521e4b8..0000000
Binary files a/LibVlc/plugins/video_splitter/libclone_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_splitter/libpanoramix_plugin.dll b/LibVlc/plugins/video_splitter/libpanoramix_plugin.dll
deleted file mode 100644
index 4d89d8a..0000000
Binary files a/LibVlc/plugins/video_splitter/libpanoramix_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/video_splitter/libwall_plugin.dll b/LibVlc/plugins/video_splitter/libwall_plugin.dll
deleted file mode 100644
index 90acb88..0000000
Binary files a/LibVlc/plugins/video_splitter/libwall_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/visualization/libglspectrum_plugin.dll b/LibVlc/plugins/visualization/libglspectrum_plugin.dll
deleted file mode 100644
index 0961c64..0000000
Binary files a/LibVlc/plugins/visualization/libglspectrum_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/visualization/libgoom_plugin.dll b/LibVlc/plugins/visualization/libgoom_plugin.dll
deleted file mode 100644
index 61a2444..0000000
Binary files a/LibVlc/plugins/visualization/libgoom_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/visualization/libprojectm_plugin.dll b/LibVlc/plugins/visualization/libprojectm_plugin.dll
deleted file mode 100644
index e4a06e3..0000000
Binary files a/LibVlc/plugins/visualization/libprojectm_plugin.dll and /dev/null differ
diff --git a/LibVlc/plugins/visualization/libvisual_plugin.dll b/LibVlc/plugins/visualization/libvisual_plugin.dll
deleted file mode 100644
index b55a3f7..0000000
Binary files a/LibVlc/plugins/visualization/libvisual_plugin.dll and /dev/null differ
diff --git a/Meta.Vlc.Wpf.Sample/MainWindow.xaml b/Meta.Vlc.Wpf.Sample/MainWindow.xaml
index aa757d3..889a18f 100644
--- a/Meta.Vlc.Wpf.Sample/MainWindow.xaml
+++ b/Meta.Vlc.Wpf.Sample/MainWindow.xaml
@@ -37,7 +37,7 @@ Version: 20160109
         <!--<wpf:VlcPlayer x:Name="Player" EndBehavior="Nothing" Stretch="Fill"/>-->
 
         <!--You can also ignore the VLcOption field and it will take the default values-->
-        <wpf:VlcPlayer x:Name="Player" VlcOption="{StaticResource VlcOptions}" LibVlcPath="..\..\libvlc" EndBehavior="Nothing" Stretch="Fill"/>
+        <wpf:VlcPlayer x:Name="Player" VlcOption="{StaticResource VlcOptions}" LibVlcPath="..\..\..\libvlc" EndBehavior="Nothing" Stretch="Fill"/>
 
         <!--You can use Image and ThreadSeparatedImage to render video-->
         <!--<Image x:Name="DisplayImage"></Image>-->
diff --git a/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 3.5.csproj b/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 3.5.csproj
index 74d9617..3bd3dd3 100644
--- a/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 3.5.csproj	
+++ b/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 3.5.csproj	
@@ -39,6 +39,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -48,6 +50,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>Meta.Vlc.Wpf.Sample.App</StartupObject>
@@ -145,10 +148,6 @@
       <Project>{f4026089-4dbe-4c6e-b3fd-9153a5925feb}</Project>
       <Name>Meta.Vlc.Wpf - .Net 3.5</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Meta.Vlc\Meta.Vlc - .Net 3.5.csproj">
-      <Project>{6f34ca47-d818-42b2-9c41-2fadeb7024cf}</Project>
-      <Name>Meta.Vlc - .Net 3.5</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
diff --git a/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 3.5.csproj.DotSettings b/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 3.5.csproj.DotSettings
new file mode 100644
index 0000000..195c460
--- /dev/null
+++ b/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 3.5.csproj.DotSettings	
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">Latest</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 4.0.csproj b/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 4.0.csproj
index c91090e..a6f5964 100644
--- a/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 4.0.csproj	
+++ b/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 4.0.csproj	
@@ -24,6 +24,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,6 +35,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>Meta.Vlc.Wpf.Sample.App</StartupObject>
diff --git a/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 4.0.csproj.DotSettings b/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 4.0.csproj.DotSettings
new file mode 100644
index 0000000..195c460
--- /dev/null
+++ b/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 4.0.csproj.DotSettings	
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">Latest</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 4.5.csproj b/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 4.5.csproj
index 7b5525e..43d0ea1 100644
--- a/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 4.5.csproj	
+++ b/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 4.5.csproj	
@@ -24,6 +24,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,6 +35,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>Meta.Vlc.Wpf.Sample.App</StartupObject>
@@ -46,6 +49,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>..\x64\Release\.NET 4.5\</OutputPath>
@@ -56,6 +60,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -66,6 +71,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\x86\Release\.NET 4.5\</OutputPath>
@@ -76,6 +82,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 4.5.csproj.DotSettings b/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 4.5.csproj.DotSettings
new file mode 100644
index 0000000..195c460
--- /dev/null
+++ b/Meta.Vlc.Wpf.Sample/Meta.Vlc.Wpf.Sample - .Net 4.5.csproj.DotSettings	
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">Latest</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Meta.Vlc.Wpf.Sample/Properties/AssemblyInfo.cs b/Meta.Vlc.Wpf.Sample/Properties/AssemblyInfo.cs
index 06bd78d..78f09e7 100644
--- a/Meta.Vlc.Wpf.Sample/Properties/AssemblyInfo.cs
+++ b/Meta.Vlc.Wpf.Sample/Properties/AssemblyInfo.cs
@@ -15,7 +15,7 @@
 [assembly: AssemblyCopyright("Copyright ©  2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: VlcSettings(@"..\..\libvlc", "-I", "--dummy-quiet", "--ignore-config", "--no-video-title", "--no-sub-autodetect-file")]
+[assembly: VlcSettings(@"..\..\..\libvlc", "-I", "--dummy-quiet", "--ignore-config", "--no-video-title", "--no-sub-autodetect-file")]
 //[assembly: VlcSettings(@"..\..\libvlc", "-I dummy", "--ignore-config", "--no-video-title", "--file-logging", "--logfile=log.txt", "--verbose=2", "--no-sub-autodetect-file" //,"--rtsp-tcp"
 //    )]
 //note: you may need to add the option --rtsp-tcp to pass RTSP through a VPN (e.g if you want to access some IP Camera behind a firewall by tunneling to its local network via VPN)
diff --git a/Meta.Vlc.Wpf/ApiManager.cs b/Meta.Vlc.Wpf/ApiManager.cs
index 0c9abbb..e6184e8 100644
--- a/Meta.Vlc.Wpf/ApiManager.cs
+++ b/Meta.Vlc.Wpf/ApiManager.cs
@@ -1,10 +1,11 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: ApiManager.cs
-// Version: 20160214
+// Version: 20181231
 
-using System;
-using System.Linq;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
 
 namespace Meta.Vlc.Wpf
 {
@@ -27,10 +28,7 @@ public static class ApiManager
         public static void ReleaseAll()
         {
             if (Vlcs == null) return;
-            foreach (var vlc in Vlcs)
-            {
-                vlc.Dispose();
-            }
+            foreach (var vlc in Vlcs) vlc.Dispose();
             Vlcs.Clear();
         }
 
@@ -41,12 +39,12 @@ public static void ReleaseAll()
         /// <summary>
         ///     The path of LibVlc dlls.
         /// </summary>
-        public static String LibVlcPath { get; private set; }
+        public static string LibVlcPath { get; private set; }
 
         /// <summary>
         ///     The options when initialize LibVlc.
         /// </summary>
-        public static IList<String> VlcOption { get; private set; }
+        public static IList<string> VlcOption { get; private set; }
 
         /// <summary>
         ///     The list of VLC.
@@ -60,10 +58,7 @@ public static Vlc DefaultVlc
         {
             get
             {
-                if (_defaultVlc == null)
-                {
-                    Vlcs.Add(_defaultVlc = new Vlc(VlcOption.ToArray()));
-                }
+                if (_defaultVlc == null) Vlcs.Add(_defaultVlc = new Vlc(VlcOption.ToArray()));
 
                 return _defaultVlc;
             }
@@ -82,7 +77,7 @@ static ApiManager()
         {
             IsInitialized = false;
             LibVlcPath =
-                System.IO.Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName) +
+                Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName) +
                 @"\LibVlc\";
         }
 
@@ -98,7 +93,7 @@ private static void Initialize()
         ///     Initialize the VLC with path of LibVlc.
         /// </summary>
         /// <param name="libVlcPath"></param>
-        public static void Initialize(String libVlcPath)
+        public static void Initialize(string libVlcPath)
         {
             LibVlcPath = libVlcPath;
             Initialize();
@@ -109,7 +104,7 @@ public static void Initialize(String libVlcPath)
         /// </summary>
         /// <param name="libVlcPath"></param>
         /// <param name="vlcOption"></param>
-        public static void Initialize(String libVlcPath, params String[] vlcOption)
+        public static void Initialize(string libVlcPath, params string[] vlcOption)
         {
             LibVlcPath = libVlcPath;
             VlcOption = vlcOption;
diff --git a/Meta.Vlc.Wpf/AspectRatio.cs b/Meta.Vlc.Wpf/AspectRatio.cs
index dfb15cd..7839d83 100644
--- a/Meta.Vlc.Wpf/AspectRatio.cs
+++ b/Meta.Vlc.Wpf/AspectRatio.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: AspectRatio.cs
-// Version: 20160214
+// Version: 20181231
 
 namespace Meta.Vlc.Wpf
 {
diff --git a/Meta.Vlc.Wpf/ChromaType.cs b/Meta.Vlc.Wpf/ChromaType.cs
index 576c298..ed82090 100644
--- a/Meta.Vlc.Wpf/ChromaType.cs
+++ b/Meta.Vlc.Wpf/ChromaType.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: ChromaType.cs
-// Version: 20160214
+// Version: 20181231
 
 namespace Meta.Vlc.Wpf
 {
diff --git a/Meta.Vlc.Wpf/EndBehavior.cs b/Meta.Vlc.Wpf/EndBehavior.cs
index a919be3..4c25de1 100644
--- a/Meta.Vlc.Wpf/EndBehavior.cs
+++ b/Meta.Vlc.Wpf/EndBehavior.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: EndBehavior.cs
-// Version: 20160214
+// Version: 20181231
 
 namespace Meta.Vlc.Wpf
 {
diff --git a/Meta.Vlc.Wpf/Extension.cs b/Meta.Vlc.Wpf/Extension.cs
index af8187e..debdc89 100644
--- a/Meta.Vlc.Wpf/Extension.cs
+++ b/Meta.Vlc.Wpf/Extension.cs
@@ -1,10 +1,9 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: Extension.cs
-// Version: 20160312
+// Version: 20181231
 
 using System;
 using System.IO;
-using System.Text;
 using System.Windows.Media;
 
 namespace Meta.Vlc.Wpf
@@ -24,12 +23,12 @@ public static class Extension
         /// <param name="defaultValue"></param>
         /// <returns></returns>
         public static TRet DefaultValueWhenNull<T, TRet>(this T value, Func<T, TRet> selector,
-            TRet defaultValue = default(TRet))
+            TRet defaultValue = default)
         {
             return value == null ? defaultValue : selector(value);
         }
 
-        public static T DefaultValueWhenTrue<T>(this T value, bool boolean, T defaultValue = default(T))
+        public static T DefaultValueWhenTrue<T>(this T value, bool boolean, T defaultValue = default)
         {
             return boolean ? defaultValue : value;
         }
@@ -42,7 +41,7 @@ public static TRet DefaultValueWhenNull<T, TRet>(this T value, Func<T, TRet> sel
         /// <returns></returns>
         public static string CombinePath(this string srcPath, string extPath)
         {
-            DirectoryInfo dir = new DirectoryInfo(Path.Combine(srcPath, extPath));
+            var dir = new DirectoryInfo(Path.Combine(srcPath, extPath));
             return dir.FullName;
         }
 
@@ -53,13 +52,14 @@ public static string CombinePath(this string srcPath, string extPath)
         /// <returns></returns>
         public static bool IsDriveRootDirectory(this string path)
         {
-            Uri uri = path.ToUri();
+            var uri = path.ToUri();
             if (uri != null && uri.IsFile)
             {
-                DirectoryInfo dir = new DirectoryInfo(uri.LocalPath);
+                var dir = new DirectoryInfo(uri.LocalPath);
 
                 return dir.Root.FullName == dir.FullName;
             }
+
             return false;
         }
 
@@ -83,10 +83,7 @@ public static Uri ToUri(this string str)
         public static string FormatPath(this string path)
         {
             path = path.Replace('\\', '/');
-            if (!path.EndsWith("/"))
-            {
-                path += '/';
-            }
+            if (!path.EndsWith("/")) path += '/';
             return path;
         }
 
@@ -110,7 +107,7 @@ public static PixelFormat GetPixelFormat(this ChromaType chroma)
                     return PixelFormats.Bgra32;
 
                 default:
-                    throw new NotSupportedException(String.Format("Not support pixel format: {0}", chroma));
+                    throw new NotSupportedException($"Not support pixel format: {chroma}");
             }
         }
 
diff --git a/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 3.5.csproj b/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 3.5.csproj
index 1bb8397..8b25b4d 100644
--- a/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 3.5.csproj	
+++ b/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 3.5.csproj	
@@ -23,6 +23,8 @@
     <DefineConstants>TRACE;DEBUG;DotNet35</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,6 +34,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\Release\.NET 3.5\Meta.Vlc.Wpf.XML</DocumentationFile>
+    <LangVersion>latest</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -41,6 +45,8 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>..\x64\Release\.NET 3.5\</OutputPath>
@@ -51,6 +57,8 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -60,6 +68,8 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\x86\Release\.NET 3.5\</OutputPath>
@@ -70,6 +80,8 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>
@@ -135,7 +147,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Meta.Vlc\Meta.Vlc - .Net 3.5.csproj">
-      <Project>{6f34ca47-d818-42b2-9c41-2fadeb7024cf}</Project>
+      <Project>{966c7e4a-c5be-411c-b822-a17e9fca0b69}</Project>
       <Name>Meta.Vlc - .Net 3.5</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 3.5.csproj.DotSettings b/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 3.5.csproj.DotSettings
new file mode 100644
index 0000000..195c460
--- /dev/null
+++ b/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 3.5.csproj.DotSettings	
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">Latest</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 4.0.csproj b/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 4.0.csproj
index 6932f89..8f6ed9f 100644
--- a/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 4.0.csproj	
+++ b/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 4.0.csproj	
@@ -24,6 +24,8 @@
     <DefineConstants>TRACE;DEBUG;DotNet40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,6 +35,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\Release\.NET 4.0\Meta.Vlc.Wpf.XML</DocumentationFile>
+    <LangVersion>latest</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -42,6 +46,8 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>..\x64\Release\.NET 4.0\</OutputPath>
@@ -52,6 +58,8 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -61,6 +69,8 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\x86\Release\.NET 4.0\</OutputPath>
@@ -71,6 +81,8 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>
diff --git a/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 4.0.csproj.DotSettings b/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 4.0.csproj.DotSettings
new file mode 100644
index 0000000..195c460
--- /dev/null
+++ b/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 4.0.csproj.DotSettings	
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">Latest</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 4.5.csproj b/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 4.5.csproj
index 3852f6b..9d9f85c 100644
--- a/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 4.5.csproj	
+++ b/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 4.5.csproj	
@@ -25,6 +25,8 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -35,6 +37,8 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <DocumentationFile>..\Release\.NET 4.5\Meta.Vlc.Wpf.XML</DocumentationFile>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -44,6 +48,8 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>..\x64\Release\.NET 4.5\</OutputPath>
@@ -54,6 +60,8 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -63,6 +71,8 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\x86\Release\.NET 4.5\</OutputPath>
@@ -73,6 +83,8 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>
diff --git a/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 4.5.csproj.DotSettings b/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 4.5.csproj.DotSettings
index 662f956..195c460 100644
--- a/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 4.5.csproj.DotSettings	
+++ b/Meta.Vlc.Wpf/Meta.Vlc.Wpf - .Net 4.5.csproj.DotSettings	
@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp50</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">Latest</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Meta.Vlc.Wpf/Properties/Annotations.cs b/Meta.Vlc.Wpf/Properties/Annotations.cs
index f50144a..b9201cb 100644
--- a/Meta.Vlc.Wpf/Properties/Annotations.cs
+++ b/Meta.Vlc.Wpf/Properties/Annotations.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: Annotations.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
 
@@ -103,7 +103,7 @@ public StringFormatMethodAttribute(string formatParameterName)
             FormatParameterName = formatParameterName;
         }
 
-        public string FormatParameterName { get; private set; }
+        public string FormatParameterName { get; }
     }
 
     /// <summary>
@@ -118,8 +118,7 @@ public ValueProviderAttribute(string name)
             Name = name;
         }
 
-        [NotNull]
-        public string Name { get; private set; }
+        [NotNull] public string Name { get; }
     }
 
     /// <summary>
@@ -131,7 +130,7 @@ public ValueProviderAttribute(string name)
     ///     <code>
     /// public void Foo(string param) {
     ///   if (param == null)
-    ///     throw new ArgumentNullException("par"); // Warning: Cannot resolve symbol
+    /// throw new ArgumentNullException("par"); // Warning: Cannot resolve symbol
     /// }
     /// </code>
     /// </example>
@@ -167,18 +166,18 @@ public sealed class InvokerParameterNameAttribute : Attribute
     /// </remarks>
     /// <example>
     ///     <code>
-    ///  public class Foo : INotifyPropertyChanged {
-    ///    public event PropertyChangedEventHandler PropertyChanged;
-    ///    [NotifyPropertyChangedInvocator]
-    ///    protected virtual void NotifyChanged(string propertyName) { ... }
-    ///
-    ///    private string _name;
-    ///    public string Name {
-    ///      get { return _name; }
-    ///      set { _name = value; NotifyChanged("LastName"); /* Warning */ }
-    ///    }
-    ///  }
-    ///  </code>
+    ///   public class Foo : INotifyPropertyChanged {
+    ///     public event PropertyChangedEventHandler PropertyChanged;
+    ///     [NotifyPropertyChangedInvocator]
+    ///     protected virtual void NotifyChanged(string propertyName) { ... }
+    /// 
+    ///     private string _name;
+    ///     public string Name {
+    ///   get { return _name; }
+    ///   set { _name = value; NotifyChanged("LastName"); /* Warning */ }
+    ///     }
+    ///   }
+    ///   </code>
     ///     Examples of generated notifications:
     ///     <list>
     ///         <item>
@@ -207,7 +206,7 @@ public NotifyPropertyChangedInvocatorAttribute(string parameterName)
             ParameterName = parameterName;
         }
 
-        public string ParameterName { get; private set; }
+        public string ParameterName { get; }
     }
 
     /// <summary>
@@ -279,8 +278,8 @@ public ContractAnnotationAttribute([NotNull] string contract, bool forceFullStat
             ForceFullStates = forceFullStates;
         }
 
-        public string Contract { get; private set; }
-        public bool ForceFullStates { get; private set; }
+        public string Contract { get; }
+        public bool ForceFullStates { get; }
     }
 
     /// <summary>
@@ -306,7 +305,7 @@ public LocalizationRequiredAttribute(bool required)
             Required = required;
         }
 
-        public bool Required { get; private set; }
+        public bool Required { get; }
     }
 
     /// <summary>
@@ -321,11 +320,11 @@ public LocalizationRequiredAttribute(bool required)
     /// class NoEquality { }
     /// class UsesNoEquality {
     ///   public void Test() {
-    ///     var ca1 = new NoEquality();
-    ///     var ca2 = new NoEquality();
-    ///     if (ca1 != null) { // OK
-    ///       bool condition = ca1 == ca2; // Warning
-    ///     }
+    /// var ca1 = new NoEquality();
+    /// var ca2 = new NoEquality();
+    /// if (ca1 != null) { // OK
+    ///   bool condition = ca1 == ca2; // Warning
+    /// }
     ///   }
     /// }
     /// </code>
@@ -348,7 +347,7 @@ public sealed class CannotApplyEqualityOperatorAttribute : Attribute
     /// </code>
     /// </example>
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-    [BaseTypeRequired(typeof (Attribute))]
+    [BaseTypeRequired(typeof(Attribute))]
     public sealed class BaseTypeRequiredAttribute : Attribute
     {
         public BaseTypeRequiredAttribute([NotNull] Type baseType)
@@ -356,8 +355,7 @@ public BaseTypeRequiredAttribute([NotNull] Type baseType)
             BaseType = baseType;
         }
 
-        [NotNull]
-        public Type BaseType { get; private set; }
+        [NotNull] public Type BaseType { get; }
     }
 
     /// <summary>
@@ -388,8 +386,8 @@ public UsedImplicitlyAttribute(ImplicitUseKindFlags useKindFlags, ImplicitUseTar
             TargetFlags = targetFlags;
         }
 
-        public ImplicitUseKindFlags UseKindFlags { get; private set; }
-        public ImplicitUseTargetFlags TargetFlags { get; private set; }
+        public ImplicitUseKindFlags UseKindFlags { get; }
+        public ImplicitUseTargetFlags TargetFlags { get; }
     }
 
     /// <summary>
@@ -420,11 +418,9 @@ public MeansImplicitUseAttribute(ImplicitUseKindFlags useKindFlags, ImplicitUseT
             TargetFlags = targetFlags;
         }
 
-        [UsedImplicitly]
-        public ImplicitUseKindFlags UseKindFlags { get; private set; }
+        [UsedImplicitly] public ImplicitUseKindFlags UseKindFlags { get; }
 
-        [UsedImplicitly]
-        public ImplicitUseTargetFlags TargetFlags { get; private set; }
+        [UsedImplicitly] public ImplicitUseTargetFlags TargetFlags { get; }
     }
 
     [Flags]
@@ -481,7 +477,7 @@ public PublicAPIAttribute([NotNull] string comment)
             Comment = comment;
         }
 
-        public string Comment { get; private set; }
+        public string Comment { get; }
     }
 
     /// <summary>
@@ -528,7 +524,7 @@ public PathReferenceAttribute([PathReference] string basePath)
             BasePath = basePath;
         }
 
-        public string BasePath { get; private set; }
+        public string BasePath { get; }
     }
 
     /// <summary>
@@ -549,7 +545,7 @@ public PathReferenceAttribute([PathReference] string basePath)
     /// [SourceTemplate]
     /// public static void forEach&lt;T&gt;(this IEnumerable&lt;T&gt; xs) {
     ///   foreach (var x in xs) {
-    ///      //$ $END$
+    ///  //$ $END$
     ///   }
     /// }
     /// </code>
@@ -574,7 +570,7 @@ public sealed class SourceTemplateAttribute : Attribute
     /// [SourceTemplate, Macro(Target = "item", Expression = "suggestVariableName()")]
     /// public static void forEach&lt;T&gt;(this IEnumerable&lt;T&gt; collection) {
     ///   foreach (var item in collection) {
-    ///     //$ $END$
+    /// //$ $END$
     ///   }
     /// }
     /// </code>
@@ -622,7 +618,7 @@ public AspMvcAreaMasterLocationFormatAttribute(string format)
             Format = format;
         }
 
-        public string Format { get; private set; }
+        public string Format { get; }
     }
 
     [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
@@ -633,7 +629,7 @@ public AspMvcAreaPartialViewLocationFormatAttribute(string format)
             Format = format;
         }
 
-        public string Format { get; private set; }
+        public string Format { get; }
     }
 
     [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
@@ -644,7 +640,7 @@ public AspMvcAreaViewLocationFormatAttribute(string format)
             Format = format;
         }
 
-        public string Format { get; private set; }
+        public string Format { get; }
     }
 
     [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
@@ -655,7 +651,7 @@ public AspMvcMasterLocationFormatAttribute(string format)
             Format = format;
         }
 
-        public string Format { get; private set; }
+        public string Format { get; }
     }
 
     [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
@@ -666,7 +662,7 @@ public AspMvcPartialViewLocationFormatAttribute(string format)
             Format = format;
         }
 
-        public string Format { get; private set; }
+        public string Format { get; }
     }
 
     [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
@@ -677,7 +673,7 @@ public AspMvcViewLocationFormatAttribute(string format)
             Format = format;
         }
 
-        public string Format { get; private set; }
+        public string Format { get; }
     }
 
     /// <summary>
@@ -698,7 +694,7 @@ public AspMvcActionAttribute(string anonymousProperty)
             AnonymousProperty = anonymousProperty;
         }
 
-        public string AnonymousProperty { get; private set; }
+        public string AnonymousProperty { get; }
     }
 
     /// <summary>
@@ -718,7 +714,7 @@ public AspMvcAreaAttribute(string anonymousProperty)
             AnonymousProperty = anonymousProperty;
         }
 
-        public string AnonymousProperty { get; private set; }
+        public string AnonymousProperty { get; }
     }
 
     /// <summary>
@@ -739,7 +735,7 @@ public AspMvcControllerAttribute(string anonymousProperty)
             AnonymousProperty = anonymousProperty;
         }
 
-        public string AnonymousProperty { get; private set; }
+        public string AnonymousProperty { get; }
     }
 
     /// <summary>
@@ -850,7 +846,7 @@ public HtmlElementAttributesAttribute(string name)
             Name = name;
         }
 
-        public string Name { get; private set; }
+        public string Name { get; }
     }
 
     [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property)]
@@ -861,8 +857,7 @@ public HtmlAttributeValueAttribute([NotNull] string name)
             Name = name;
         }
 
-        [NotNull]
-        public string Name { get; private set; }
+        [NotNull] public string Name { get; }
     }
 
     /// <summary>
@@ -887,7 +882,7 @@ public CollectionAccessAttribute(CollectionAccessType collectionAccessType)
             CollectionAccessType = collectionAccessType;
         }
 
-        public CollectionAccessType CollectionAccessType { get; private set; }
+        public CollectionAccessType CollectionAccessType { get; }
     }
 
     [Flags]
@@ -929,7 +924,7 @@ public AssertionConditionAttribute(AssertionConditionType conditionType)
             ConditionType = conditionType;
         }
 
-        public AssertionConditionType ConditionType { get; private set; }
+        public AssertionConditionType ConditionType { get; }
     }
 
     /// <summary>
@@ -1019,8 +1014,8 @@ public AspChildControlTypeAttribute(string tagName, Type controlType)
             ControlType = controlType;
         }
 
-        public string TagName { get; private set; }
-        public Type ControlType { get; private set; }
+        public string TagName { get; }
+        public Type ControlType { get; }
     }
 
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Method)]
@@ -1046,7 +1041,7 @@ public AspRequiredAttributeAttribute([NotNull] string attribute)
             Attribute = attribute;
         }
 
-        public string Attribute { get; private set; }
+        public string Attribute { get; }
     }
 
     [AttributeUsage(AttributeTargets.Property)]
@@ -1057,7 +1052,7 @@ public AspTypePropertyAttribute(bool createConstructorReferences)
             CreateConstructorReferences = createConstructorReferences;
         }
 
-        public bool CreateConstructorReferences { get; private set; }
+        public bool CreateConstructorReferences { get; }
     }
 
     [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
@@ -1068,7 +1063,7 @@ public RazorImportNamespaceAttribute(string name)
             Name = name;
         }
 
-        public string Name { get; private set; }
+        public string Name { get; }
     }
 
     [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
@@ -1080,8 +1075,8 @@ public RazorInjectionAttribute(string type, string fieldName)
             FieldName = fieldName;
         }
 
-        public string Type { get; private set; }
-        public string FieldName { get; private set; }
+        public string Type { get; }
+        public string FieldName { get; }
     }
 
     [AttributeUsage(AttributeTargets.Method)]
diff --git a/Meta.Vlc.Wpf/Properties/AssemblyInfo.cs b/Meta.Vlc.Wpf/Properties/AssemblyInfo.cs
index 4c84c01..2012059 100644
--- a/Meta.Vlc.Wpf/Properties/AssemblyInfo.cs
+++ b/Meta.Vlc.Wpf/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: AssemblyInfo.cs
-// Version: 20160214
+// Version: 20181231
 
 using System.Reflection;
 using System.Runtime.InteropServices;
@@ -41,7 +41,7 @@
     ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置
     //(在页面、应用程序或任何主题特定资源词典中
     // 未找到某个资源的情况下使用)
-    )]
+)]
 
 // 程序集的版本信息由下面四个值组成:
 //
diff --git a/Meta.Vlc.Wpf/Properties/Settings.settings b/Meta.Vlc.Wpf/Properties/Settings.settings
index 033d7a5..c14891b 100644
--- a/Meta.Vlc.Wpf/Properties/Settings.settings
+++ b/Meta.Vlc.Wpf/Properties/Settings.settings
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
+
 <SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
   <Profiles>
     <Profile Name="(Default)" />
diff --git a/Meta.Vlc.Wpf/SnapshotContext.cs b/Meta.Vlc.Wpf/SnapshotContext.cs
index 7c3385f..37b1cfa 100644
--- a/Meta.Vlc.Wpf/SnapshotContext.cs
+++ b/Meta.Vlc.Wpf/SnapshotContext.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: SnapshotContext.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
 using System.IO;
@@ -18,14 +18,14 @@ internal class SnapshotContext
 
         #region --- Initialization ---
 
-        public SnapshotContext(String path, SnapshotFormat format, int quality)
+        public SnapshotContext(string path, SnapshotFormat format, int quality)
         {
             Path = path.FormatPath();
             Format = format;
             Quality = quality;
         }
 
-        public SnapshotContext(String path, int quality)
+        public SnapshotContext(string path, int quality)
         {
             Path = System.IO.Path.GetDirectoryName(path).FormatPath();
             Name = System.IO.Path.GetFileName(path);
@@ -44,6 +44,7 @@ public SnapshotContext(String path, int quality)
                 default:
                     throw new ArgumentOutOfRangeException("path", @"Screenshot format must be 'bmp', 'jpg' or 'png'.");
             }
+
             Quality = quality;
         }
 
@@ -51,31 +52,28 @@ public SnapshotContext(String path, int quality)
 
         #region --- Properties ---
 
-        public String Path { get; private set; }
-        public String Name { get; private set; }
-        public SnapshotFormat Format { get; private set; }
-        public int Quality { get; private set; }
+        public string Path { get; }
+        public string Name { get; private set; }
+        public SnapshotFormat Format { get; }
+        public int Quality { get; }
 
         #endregion --- Properties ---
 
         #region --- Methods ---
-        
+
         public void Save(VlcPlayer player, BitmapSource source)
         {
-            if (this.Name == null)
-            {
-                this.GetName(player);
-            }
+            if (Name == null) GetName(player);
 
             BitmapEncoder encoder = null;
-            switch (this.Format)
+            switch (Format)
             {
                 case SnapshotFormat.BMP:
                     encoder = new BmpBitmapEncoder();
                     break;
 
                 case SnapshotFormat.JPG:
-                    encoder = new JpegBitmapEncoder() { QualityLevel = this.Quality };
+                    encoder = new JpegBitmapEncoder {QualityLevel = Quality};
                     break;
 
                 case SnapshotFormat.PNG:
@@ -84,13 +82,13 @@ public void Save(VlcPlayer player, BitmapSource source)
             }
 
             encoder.Frames.Add(BitmapFrame.Create(source));
-            using (Stream stream = File.Create(String.Format("{0}\\{1}", this.Path, this.Name)))
+            using (Stream stream = File.Create($"{Path}\\{Name}"))
             {
                 encoder.Save(stream);
             }
         }
 
-        private static String GetMediaName(String path)
+        private static string GetMediaName(string path)
         {
             if (path.IsDriveRootDirectory())
             {
@@ -100,18 +98,20 @@ private static String GetMediaName(String path)
                         return item.VolumeLabel;
             }
             else
+            {
                 return System.IO.Path.GetFileNameWithoutExtension(path);
+            }
 
             return "Unkown";
         }
 
-        private String GetName(VlcPlayer player)
+        private string GetName(VlcPlayer player)
         {
-            Name = String.Format("{0}-{1}-{2}.{3}",
-                GetMediaName(player.VlcMediaPlayer.Media.Mrl.Replace("file:///", "")),
-                (int)(player.Time.TotalMilliseconds), _count++, Format.ToString().ToLower());
+            Name =
+                $"{GetMediaName(player.VlcMediaPlayer.Media.Mrl.Replace("file:///", ""))}-{(int) player.Time.TotalMilliseconds}-{_count++}.{Format.ToString().ToLower()}";
             return Name;
         }
+
         #endregion --- Methods ---
     }
-}
+}
\ No newline at end of file
diff --git a/Meta.Vlc.Wpf/SnapshotFormat.cs b/Meta.Vlc.Wpf/SnapshotFormat.cs
index 4421a4b..6b77c62 100644
--- a/Meta.Vlc.Wpf/SnapshotFormat.cs
+++ b/Meta.Vlc.Wpf/SnapshotFormat.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: SnapshotFormat.cs
-// Version: 20160214
+// Version: 20181231
 
 namespace Meta.Vlc.Wpf
 {
diff --git a/Meta.Vlc.Wpf/Themes/Generic.xaml b/Meta.Vlc.Wpf/Themes/Generic.xaml
index 18a821d..f6c47e8 100644
--- a/Meta.Vlc.Wpf/Themes/Generic.xaml
+++ b/Meta.Vlc.Wpf/Themes/Generic.xaml
@@ -5,12 +5,12 @@ Version: 20160404
 -->
 
 <ResourceDictionary
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:local="clr-namespace:Meta.Vlc.Wpf">
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:Meta.Vlc.Wpf">
 
     <Style TargetType="{x:Type local:VlcPlayer}">
-        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="Stretch" Value="Uniform" />
         <Setter Property="StretchDirection" Value="Both" />
 
@@ -21,10 +21,10 @@ Version: 20160404
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:VlcPlayer}">
                     <Border
-            Background="{TemplateBinding Background}"
-            BorderBrush="{TemplateBinding BorderBrush}"
-            BorderThickness="{TemplateBinding BorderThickness}">
-                        <local:ThreadSeparatedImage x:Name="Image"/>
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}">
+                        <local:ThreadSeparatedImage x:Name="Image" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/Meta.Vlc.Wpf/ThreadSeparatedControlHost.cs b/Meta.Vlc.Wpf/ThreadSeparatedControlHost.cs
index 6f4f011..6a28299 100644
--- a/Meta.Vlc.Wpf/ThreadSeparatedControlHost.cs
+++ b/Meta.Vlc.Wpf/ThreadSeparatedControlHost.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: ThreadSeparatedControlHost.cs
-// Version: 20160327
+// Version: 20181231
 
 using System;
 using System.Collections;
@@ -12,35 +12,33 @@
 
 namespace Meta.Vlc.Wpf
 {
-    class ThreadSeparatedControlLoadedRoutedEventArgs : RoutedEventArgs
+    internal class ThreadSeparatedControlLoadedRoutedEventArgs : RoutedEventArgs
     {
-        public ThreadSeparatedControlLoadedRoutedEventArgs(RoutedEvent routedEvent, object source) : base(routedEvent, source) { }
+        public ThreadSeparatedControlLoadedRoutedEventArgs(RoutedEvent routedEvent, object source) : base(routedEvent,
+            source)
+        {
+        }
     }
-    
+
     public abstract class ThreadSeparatedControlHost : FrameworkElement
     {
+        public static readonly RoutedEvent ThreadSeparatedControlLoadedEvent =
+            EventManager.RegisterRoutedEvent("ThreadSeparatedControlLoaded", RoutingStrategy.Bubble,
+                typeof(EventHandler<ThreadSeparatedControlLoadedRoutedEventArgs>), typeof(ThreadSeparatedControlHost));
+
         public FrameworkElement TargetElement { get; protected set; }
         public HostVisual HostVisual { get; protected set; }
         public VisualTargetPresentationSource VisualTarget { get; protected set; }
 
-        public Dispatcher SeparateThreadDispatcher
-        {
-            get { return TargetElement == null ? null : TargetElement.Dispatcher; }
-        }
+        public Dispatcher SeparateThreadDispatcher => TargetElement == null ? null : TargetElement.Dispatcher;
 
-        protected override int VisualChildrenCount
-        {
-            get { return HostVisual != null ? 1 : 0; }
-        }
+        protected override int VisualChildrenCount => HostVisual != null ? 1 : 0;
 
         protected override IEnumerator LogicalChildren
         {
             get
             {
-                if (HostVisual != null)
-                {
-                    yield return HostVisual;
-                }
+                if (HostVisual != null) yield return HostVisual;
             }
         }
 
@@ -50,7 +48,7 @@ protected virtual void LoadThreadSeparatedControl()
         {
             if (SeparateThreadDispatcher != null) return;
 
-            AutoResetEvent sync = new AutoResetEvent(false);
+            var sync = new AutoResetEvent(false);
             HostVisual = new HostVisual();
 
             AddLogicalChild(HostVisual);
@@ -104,7 +102,7 @@ protected override void OnInitialized(EventArgs e)
             Loaded += (sender, args) =>
             {
                 LoadThreadSeparatedControl();
-                this.RaiseEvent(new ThreadSeparatedControlLoadedRoutedEventArgs(ThreadSeparatedControlLoadedEvent, this));
+                RaiseEvent(new ThreadSeparatedControlLoadedRoutedEventArgs(ThreadSeparatedControlLoadedEvent, this));
             };
             Unloaded += (sender, args) => { UnloadThreadSeparatedControl(); };
 
@@ -128,31 +126,23 @@ protected override System.Windows.Size MeasureOverride(System.Windows.Size const
         protected override System.Windows.Size ArrangeOverride(System.Windows.Size finalSize)
         {
             if (TargetElement != null)
-            {
                 TargetElement.Dispatcher.Invoke(DispatcherPriority.Normal,
                     new Action(() => TargetElement.Arrange(new Rect(finalSize))));
-            }
 
             return finalSize;
         }
 
         protected override Visual GetVisualChild(int index)
         {
-            if (index == 0)
-            {
-                return HostVisual;
-            }
+            if (index == 0) return HostVisual;
 
             throw new IndexOutOfRangeException("index");
         }
 
-        public static readonly RoutedEvent ThreadSeparatedControlLoadedEvent =
-            EventManager.RegisterRoutedEvent("ThreadSeparatedControlLoaded", RoutingStrategy.Bubble, typeof(EventHandler<ThreadSeparatedControlLoadedRoutedEventArgs>), typeof(ThreadSeparatedControlHost));
-
         public event RoutedEventHandler ThreadSeparatedControlLoaded
         {
-            add { this.AddHandler(ThreadSeparatedControlLoadedEvent, value); }
-            remove { this.RemoveHandler(ThreadSeparatedControlLoadedEvent, value); }
+            add => AddHandler(ThreadSeparatedControlLoadedEvent, value);
+            remove => RemoveHandler(ThreadSeparatedControlLoadedEvent, value);
         }
     }
 }
\ No newline at end of file
diff --git a/Meta.Vlc.Wpf/ThreadSeparatedImage.cs b/Meta.Vlc.Wpf/ThreadSeparatedImage.cs
index 4a31426..d23c3e7 100644
--- a/Meta.Vlc.Wpf/ThreadSeparatedImage.cs
+++ b/Meta.Vlc.Wpf/ThreadSeparatedImage.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: ThreadSeparatedImage.cs
-// Version: 20160327
+// Version: 20181231
 
 using System;
 using System.ComponentModel;
@@ -15,7 +15,22 @@ namespace Meta.Vlc.Wpf
     public sealed class ThreadSeparatedImage : ThreadSeparatedControlHost
     {
         private static Dispatcher _commonDispatcher;
-        private static object _staticLock = new object();
+        private static readonly object _staticLock = new object();
+
+        private HorizontalAlignment _horizontalContentAlignment;
+
+        private readonly object _lock = new object();
+
+        private ScaleTransform _scaleTransform;
+
+        private ImageSource _source;
+
+        private Stretch _stretch = Stretch.Uniform;
+
+        private StretchDirection _stretchDirection = StretchDirection.Both;
+
+        private VerticalAlignment _verticalContentAlignment;
+
         public static Dispatcher CommonDispatcher
         {
             get
@@ -24,10 +39,7 @@ public static Dispatcher CommonDispatcher
                 {
                     if (_commonDispatcher == null)
                     {
-                        Thread separateThread = new Thread(() =>
-                        {
-                            Dispatcher.Run();
-                        })
+                        var separateThread = new Thread(() => { Dispatcher.Run(); })
                         {
                             IsBackground = true
                         };
@@ -36,34 +48,20 @@ public static Dispatcher CommonDispatcher
 
                         separateThread.Start();
 
-                        while (Dispatcher.FromThread(separateThread) == null)
-                        {
-                            Thread.Sleep(50);
-                        }
+                        while (Dispatcher.FromThread(separateThread) == null) Thread.Sleep(50);
                         _commonDispatcher = Dispatcher.FromThread(separateThread);
                     }
                 }
+
                 return _commonDispatcher;
             }
         }
 
-        private HorizontalAlignment _horizontalContentAlignment = default(HorizontalAlignment);
-
-        private ScaleTransform _scaleTransform;
-
-        private ImageSource _source;
-
-        private Stretch _stretch = Stretch.Uniform;
-
-        private StretchDirection _stretchDirection = StretchDirection.Both;
-
-        private VerticalAlignment _verticalContentAlignment = default(VerticalAlignment);
-
         public Image InternalImageControl { get; private set; }
 
         public ImageSource Source
         {
-            get { return _source; }
+            get => _source;
             set
             {
                 if (_source != value)
@@ -76,10 +74,10 @@ public ImageSource Source
                 }
             }
         }
-        
+
         public Stretch Stretch
         {
-            get { return _stretch; }
+            get => _stretch;
             set
             {
                 if (_stretch != value)
@@ -95,7 +93,7 @@ public Stretch Stretch
 
         public StretchDirection StretchDirection
         {
-            get { return _stretchDirection; }
+            get => _stretchDirection;
             set
             {
                 if (_stretchDirection != value)
@@ -111,7 +109,7 @@ public StretchDirection StretchDirection
 
         public ScaleTransform ScaleTransform
         {
-            get { return _scaleTransform; }
+            get => _scaleTransform;
             set
             {
                 if (_scaleTransform != value)
@@ -127,7 +125,7 @@ public ScaleTransform ScaleTransform
 
         public HorizontalAlignment HorizontalContentAlignment
         {
-            get { return _horizontalContentAlignment; }
+            get => _horizontalContentAlignment;
             set
             {
                 if (_horizontalContentAlignment != value)
@@ -144,7 +142,7 @@ public HorizontalAlignment HorizontalContentAlignment
 
         public VerticalAlignment VerticalContentAlignment
         {
-            get { return _verticalContentAlignment; }
+            get => _verticalContentAlignment;
             set
             {
                 if (_verticalContentAlignment != value)
@@ -171,8 +169,6 @@ protected override FrameworkElement CreateThreadSeparatedControl()
             return InternalImageControl;
         }
 
-        object _lock = new object();
-
         protected override void LoadThreadSeparatedControl()
         {
             HostVisual = new HostVisual();
@@ -190,16 +186,14 @@ protected override void LoadThreadSeparatedControl()
                     if (HostVisual == null)
                         return; // can happen if control was loaded then immediately unloaded
 
-                    if (TargetElement == null)
-                    {
-                        TargetElement = CreateThreadSeparatedControl();
-                    }
+                    if (TargetElement == null) TargetElement = CreateThreadSeparatedControl();
 
                     if (TargetElement == null) return;
 
                     VisualTarget = new VisualTargetPresentationSource(HostVisual);
                     VisualTarget.RootVisual = TargetElement;
                 }
+
                 Dispatcher.BeginInvoke(new Action(() => { InvalidateMeasure(); }));
             }));
         }
diff --git a/Meta.Vlc.Wpf/VideoDisplayContext.cs b/Meta.Vlc.Wpf/VideoDisplayContext.cs
index 78f4150..a8fba02 100644
--- a/Meta.Vlc.Wpf/VideoDisplayContext.cs
+++ b/Meta.Vlc.Wpf/VideoDisplayContext.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: VideoDisplayContext.cs
-// Version: 20160708
+// Version: 20181231
 
 using System;
 using System.Diagnostics;
@@ -38,15 +38,15 @@ public VideoDisplayContext(int width, int height, ChromaType chroma)
             ChromaType = chroma;
             PixelFormat = chroma.GetPixelFormat();
             IsAspectRatioChecked = false;
-            Size = width*height*PixelFormat.BitsPerPixel/8;
+            Size = width * height * PixelFormat.BitsPerPixel / 8;
             DisplayWidth = Width = width;
             DisplayHeight = Height = height;
-            Stride = width*PixelFormat.BitsPerPixel/8;
+            Stride = width * PixelFormat.BitsPerPixel / 8;
             FileMapping = Win32Api.CreateFileMapping(new IntPtr(-1), IntPtr.Zero, PageAccess.ReadWrite, 0, Size, null);
             MapView = Win32Api.MapViewOfFile(FileMapping, FileMapAccess.AllAccess, 0, 0, (uint) Size);
             Image =
                 (InteropBitmap)
-                    Imaging.CreateBitmapSourceFromMemorySection(FileMapping, Width, Height, PixelFormat, Stride, 0);
+                Imaging.CreateBitmapSourceFromMemorySection(FileMapping, Width, Height, PixelFormat, Stride, 0);
         }
 
         #endregion --- Initialization ---
@@ -78,8 +78,8 @@ public void Dispose()
         #region --- Properties ---
 
         public int Size { get; private set; }
-        public int Width { get; private set; }
-        public int Height { get; private set; }
+        public int Width { get; }
+        public int Height { get; }
         public double DisplayWidth { get; private set; }
         public double DisplayHeight { get; private set; }
         public int Stride { get; private set; }
@@ -97,15 +97,10 @@ public void Dispose()
         public void Display()
         {
             if (Image != null)
-            {
                 Image.Dispatcher.BeginInvoke(new Action(() =>
                 {
-                    if (Image != null)
-                    {
-                        Image.Invalidate();
-                    }
+                    if (Image != null) Image.Invalidate();
                 }));
-            }
         }
 
         public void CheckDisplaySize(VideoTrack track)
@@ -114,18 +109,18 @@ public void CheckDisplaySize(VideoTrack track)
             {
                 if (track.SarNum == 0 || track.SarDen == 0) return;
 
-                Debug.WriteLine(String.Format("Video Size:{0}x{1}\r\nSAR:{2}/{3}", track.Width, track.Height, track.SarNum, track.SarDen));
+                Debug.WriteLine($"Video Size:{track.Width}x{track.Height}\r\nSAR:{track.SarNum}/{track.SarDen}");
 
-                var sar = 1.0*track.SarNum/track.SarDen;
+                var sar = 1.0 * track.SarNum / track.SarDen;
                 if (sar > 1)
                 {
-                    DisplayWidth = sar*track.Width;
+                    DisplayWidth = sar * track.Width;
                     DisplayHeight = track.Height;
                 }
                 else
                 {
                     DisplayWidth = track.Width;
-                    DisplayHeight = track.Height/sar;
+                    DisplayHeight = track.Height / sar;
                 }
             }
         }
diff --git a/Meta.Vlc.Wpf/VisualTargetPresentationSource.cs b/Meta.Vlc.Wpf/VisualTargetPresentationSource.cs
index 873e58c..fd8f32c 100644
--- a/Meta.Vlc.Wpf/VisualTargetPresentationSource.cs
+++ b/Meta.Vlc.Wpf/VisualTargetPresentationSource.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: VisualTargetPresentationSource.cs
-// Version: 20160327
+// Version: 20181231
 
 using System;
 using System.Windows;
@@ -36,23 +36,20 @@ public override Visual RootVisual
 
             set
             {
-                Visual oldRoot = _visualTarget.RootVisual;
+                var oldRoot = _visualTarget.RootVisual;
                 _visualTarget.RootVisual = value;
                 RootChanged(oldRoot, value);
 
-                UIElement rootElement = value as UIElement;
+                var rootElement = value as UIElement;
                 if (rootElement != null)
                 {
-                    rootElement.Measure(new System.Windows.Size(Double.PositiveInfinity, Double.PositiveInfinity));
+                    rootElement.Measure(new System.Windows.Size(double.PositiveInfinity, double.PositiveInfinity));
                     rootElement.Arrange(new Rect(rootElement.DesiredSize));
                 }
             }
         }
 
-        public override bool IsDisposed
-        {
-            get { return _isDisposed; }
-        }
+        public override bool IsDisposed => _isDisposed;
 
         public void Dispose()
         {
diff --git a/Meta.Vlc.Wpf/VlcPlayer.DependencyProperties.cs b/Meta.Vlc.Wpf/VlcPlayer.DependencyProperties.cs
index 95b359d..788c7fb 100644
--- a/Meta.Vlc.Wpf/VlcPlayer.DependencyProperties.cs
+++ b/Meta.Vlc.Wpf/VlcPlayer.DependencyProperties.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: VlcPlayer.DependencyProperties.cs
-// Version: 20160327
+// Version: 20181231
 
 using System;
 using System.Collections.Generic;
@@ -17,14 +17,14 @@ public partial class VlcPlayer
         /// <summary>
         ///     The path of LibVlc, it is a DependencyProperty.
         /// </summary>
-        public String LibVlcPath
+        public string LibVlcPath
         {
-            get { return (String) GetValue(LibVlcPathProperty); }
-            set { SetValue(LibVlcPathProperty, value); }
+            get => (string) GetValue(LibVlcPathProperty);
+            set => SetValue(LibVlcPathProperty, value);
         }
 
         public static readonly DependencyProperty LibVlcPathProperty =
-            DependencyProperty.Register("LibVlcPath", typeof (String), typeof (VlcPlayer), null);
+            DependencyProperty.Register("LibVlcPath", typeof(string), typeof(VlcPlayer), null);
 
         #endregion LibVlcPath
 
@@ -33,21 +33,22 @@ public String LibVlcPath
         /// <summary>
         ///     The options of LibVlc, it is a DependencyProperty.
         /// </summary>
-        public IList<String> VlcOption
+        public IList<string> VlcOption
         {
-            get { return (IList<String>) GetValue(VlcOptionProperty); }
-            set { SetValue(VlcOptionProperty, value); }
+            get => (IList<string>) GetValue(VlcOptionProperty);
+            set => SetValue(VlcOptionProperty, value);
         }
 
         public static readonly DependencyProperty VlcOptionProperty =
-            DependencyProperty.Register("VlcOption", typeof (IList<String>), typeof (VlcPlayer), new PropertyMetadata(new List<string>()));
+            DependencyProperty.Register("VlcOption", typeof(IList<string>), typeof(VlcPlayer),
+                new PropertyMetadata(new List<string>()));
 
         #endregion VlcOption
 
         #region AspectRatio
 
         public static readonly DependencyProperty PropertyTypeProperty =
-            DependencyProperty.Register("PropertyType", typeof (AspectRatio), typeof (VlcPlayer),
+            DependencyProperty.Register("PropertyType", typeof(AspectRatio), typeof(VlcPlayer),
                 new PropertyMetadata(AspectRatio.Default, OnAspectRatioChanged));
 
         /// <summary>
@@ -55,8 +56,8 @@ public IList<String> VlcOption
         /// </summary>
         public AspectRatio AspectRatio
         {
-            get { return (AspectRatio) GetValue(PropertyTypeProperty); }
-            set { SetValue(PropertyTypeProperty, value); }
+            get => (AspectRatio) GetValue(PropertyTypeProperty);
+            set => SetValue(PropertyTypeProperty, value);
         }
 
         private static void OnAspectRatioChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
@@ -66,10 +67,8 @@ private static void OnAspectRatioChanged(DependencyObject sender, DependencyProp
             var scale = vlcPlayer.GetScaleTransform();
 
             if (vlcPlayer.DisplayThreadDispatcher != null)
-            {
                 vlcPlayer.DisplayThreadDispatcher.BeginInvoke(
                     new Action(() => { vlcPlayer.ScaleTransform = new ScaleTransform(scale.Width, scale.Height); }));
-            }
         }
 
         #endregion AspectRatio
@@ -81,21 +80,18 @@ private static void OnAspectRatioChanged(DependencyObject sender, DependencyProp
         /// </summary>
         public Stretch Stretch
         {
-            get { return (Stretch) GetValue(StretchProperty); }
-            set { SetValue(StretchProperty, value); }
+            get => (Stretch) GetValue(StretchProperty);
+            set => SetValue(StretchProperty, value);
         }
 
         public static readonly DependencyProperty StretchProperty =
-            DependencyProperty.Register("Stretch", typeof (Stretch), typeof (VlcPlayer),
+            DependencyProperty.Register("Stretch", typeof(Stretch), typeof(VlcPlayer),
                 new PropertyMetadata(Stretch.Uniform, (o, args) =>
                 {
                     var @this = o as VlcPlayer;
                     if (@this == null)
                         return;
-                    if (@this.Image != null)
-                    {
-                        @this.Image.Stretch = (Stretch) args.NewValue;
-                    }
+                    if (@this.Image != null) @this.Image.Stretch = (Stretch) args.NewValue;
                 }));
 
         /// <summary>
@@ -103,22 +99,19 @@ public Stretch Stretch
         /// </summary>
         public StretchDirection StretchDirection
         {
-            get { return (StretchDirection) GetValue(StretchDirectionProperty); }
-            set { SetValue(StretchDirectionProperty, value); }
+            get => (StretchDirection) GetValue(StretchDirectionProperty);
+            set => SetValue(StretchDirectionProperty, value);
         }
 
         public static readonly DependencyProperty StretchDirectionProperty =
-            DependencyProperty.Register("StretchDirection", typeof (StretchDirection), typeof (VlcPlayer),
+            DependencyProperty.Register("StretchDirection", typeof(StretchDirection), typeof(VlcPlayer),
                 new PropertyMetadata(StretchDirection.Both, (o, args) =>
                 {
                     var @this = o as VlcPlayer;
                     if (@this == null)
                         return;
 
-                    if (@this.Image != null)
-                    {
-                        @this.Image.StretchDirection = (StretchDirection) args.NewValue;
-                    }
+                    if (@this.Image != null) @this.Image.StretchDirection = (StretchDirection) args.NewValue;
                 }));
 
         #endregion Stretch
@@ -126,12 +119,12 @@ public StretchDirection StretchDirection
         #region EndBehavior
 
         public static readonly DependencyProperty EndBehaviorProperty = DependencyProperty.Register(
-            "EndBehavior", typeof (EndBehavior), typeof (VlcPlayer), new PropertyMetadata(EndBehavior.Default));
+            "EndBehavior", typeof(EndBehavior), typeof(VlcPlayer), new PropertyMetadata(EndBehavior.Default));
 
         public EndBehavior EndBehavior
         {
-            get { return (EndBehavior) GetValue(EndBehaviorProperty); }
-            set { SetValue(EndBehaviorProperty, value); }
+            get => (EndBehavior) GetValue(EndBehaviorProperty);
+            set => SetValue(EndBehaviorProperty, value);
         }
 
         #endregion EndBehavior
@@ -144,6 +137,6 @@ public VideoSourceChangedEventArgs(ImageSource _newVideoSource)
             NewVideoSource = _newVideoSource;
         }
 
-        public ImageSource NewVideoSource { get; private set; }
+        public ImageSource NewVideoSource { get; }
     }
 }
\ No newline at end of file
diff --git a/Meta.Vlc.Wpf/VlcPlayer.Events.cs b/Meta.Vlc.Wpf/VlcPlayer.Events.cs
index 9b18bc2..a060dac 100644
--- a/Meta.Vlc.Wpf/VlcPlayer.Events.cs
+++ b/Meta.Vlc.Wpf/VlcPlayer.Events.cs
@@ -1,20 +1,18 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: VlcPlayer.Events.cs
-// Version: 20160708
+// Version: 20181231
 
 using System;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
 using System.Windows.Threading;
-using Meta.Vlc.Interop.Media;
+using Meta.Vlc.Event;
 
 namespace Meta.Vlc.Wpf
 {
-    public partial class VlcPlayer
+    public unsafe partial class VlcPlayer
     {
         /// <summary>
         ///     <see cref="VlcPlayer.Position" />
@@ -51,7 +49,7 @@ public partial class VlcPlayer
         /// <summary>
         ///     <see cref="VlcPlayer.State" />
         /// </summary>
-        public event EventHandler<ObjectEventArgs<MediaState>> StateChanged;
+        public event EventHandler<MediaStateChangedEventArgs> StateChanged;
 
         public event EventHandler<VideoFormatChangingEventArgs> VideoFormatChanging;
 
@@ -59,8 +57,8 @@ protected override void OnMouseMove(MouseEventArgs e)
         {
             base.OnMouseMove(e);
 
-            if (_isDVD && (VlcMediaPlayer != null) && State == MediaState.Playing &&
-                (LibVlcManager.LibVlcVersion.DevString == "Meta"))
+            if (_isDVD && VlcMediaPlayer != null && State == MediaState.Playing &&
+                LibVlcManager.LibVlcVersion.DevString == "Meta")
                 VlcMediaPlayer.SetMouseCursor(0, GetVideoPositionX(e.GetPosition(this).X),
                     GetVideoPositionY(e.GetPosition(this).Y));
         }
@@ -69,23 +67,20 @@ protected override void OnMouseUp(MouseButtonEventArgs e)
         {
             base.OnMouseUp(e);
 
-            if (_isDVD && (VlcMediaPlayer != null) && State == MediaState.Playing &&
-                (LibVlcManager.LibVlcVersion.DevString == "Meta"))
+            if (_isDVD && VlcMediaPlayer != null && State == MediaState.Playing &&
+                LibVlcManager.LibVlcVersion.DevString == "Meta")
                 switch (e.ChangedButton)
                 {
-                    case MouseButton.Left:
-                        VlcMediaPlayer.SetMouseUp(0, Interop.MediaPlayer.MouseButton.Left);
+                    case System.Windows.Input.MouseButton.Left:
+                        VlcMediaPlayer.SetMouseUp(0, MouseButton.Left);
                         break;
 
-                    case MouseButton.Right:
-                        VlcMediaPlayer.SetMouseUp(0, Interop.MediaPlayer.MouseButton.Right);
+                    case System.Windows.Input.MouseButton.Right:
+                        VlcMediaPlayer.SetMouseUp(0, MouseButton.Right);
                         break;
 
-                    case MouseButton.Middle:
-                    case MouseButton.XButton1:
-                    case MouseButton.XButton2:
                     default:
-                        VlcMediaPlayer.SetMouseUp(0, Interop.MediaPlayer.MouseButton.Other);
+                        VlcMediaPlayer.SetMouseUp(0, MouseButton.Other);
                         break;
                 }
         }
@@ -94,23 +89,23 @@ protected override void OnMouseDown(MouseButtonEventArgs e)
         {
             base.OnMouseDown(e);
 
-            if (_isDVD && (VlcMediaPlayer != null) && State == MediaState.Playing &&
-                (LibVlcManager.LibVlcVersion.DevString == "Meta"))
+            if (_isDVD && VlcMediaPlayer != null && State == MediaState.Playing &&
+                LibVlcManager.LibVlcVersion.DevString == "Meta")
                 switch (e.ChangedButton)
                 {
-                    case MouseButton.Left:
-                        VlcMediaPlayer.SetMouseDown(0, Interop.MediaPlayer.MouseButton.Left);
+                    case System.Windows.Input.MouseButton.Left:
+                        VlcMediaPlayer.SetMouseDown(0, MouseButton.Left);
                         break;
 
-                    case MouseButton.Right:
-                        VlcMediaPlayer.SetMouseDown(0, Interop.MediaPlayer.MouseButton.Right);
+                    case System.Windows.Input.MouseButton.Right:
+                        VlcMediaPlayer.SetMouseDown(0, MouseButton.Right);
                         break;
 
-                    case MouseButton.Middle:
-                    case MouseButton.XButton1:
-                    case MouseButton.XButton2:
+                    case System.Windows.Input.MouseButton.Middle:
+                    case System.Windows.Input.MouseButton.XButton1:
+                    case System.Windows.Input.MouseButton.XButton2:
                     default:
-                        VlcMediaPlayer.SetMouseDown(0, Interop.MediaPlayer.MouseButton.Other);
+                        VlcMediaPlayer.SetMouseDown(0, MouseButton.Other);
                         break;
                 }
         }
@@ -124,10 +119,7 @@ private void VlcMediaPlayerPositionChanged(object sender, EventArgs e)
             Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
             {
                 OnPropertyChanged(() => Position);
-                if (PositionChanged != null)
-                {
-                    PositionChanged(this, new EventArgs());
-                }
+                PositionChanged?.Invoke(this, new EventArgs());
             }));
         }
 
@@ -138,10 +130,7 @@ private void VlcMediaPlayerTimeChanged(object sender, EventArgs e)
             Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
             {
                 OnPropertyChanged(() => Time);
-                if (TimeChanged != null)
-                {
-                    TimeChanged(this, new EventArgs());
-                }
+                TimeChanged?.Invoke(this, new EventArgs());
             }));
         }
 
@@ -152,76 +141,59 @@ private void VlcMediaPlayerSeekableChanged(object sender, EventArgs e)
             Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
             {
                 OnPropertyChanged(() => IsSeekable);
-                if (IsSeekableChanged != null)
-                {
-                    IsSeekableChanged(this, new EventArgs());
-                }
+                IsSeekableChanged?.Invoke(this, new EventArgs());
             }));
         }
 
-        private void VlcMediaPlayerEndReached(object sender, ObjectEventArgs<MediaState> e)
+        private void VlcMediaPlayerLengthChanged(object sender, EventArgs e)
         {
             if (_disposing || _isStopping) return;
 
-            Dispatcher.BeginInvoke(new Action(() =>
+            Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
             {
-                switch (EndBehavior)
-                {
-                    case EndBehavior.Nothing:
-
-                        break;
-
-                    case EndBehavior.Stop:
-                        Stop();
-                        break;
-
-                    case EndBehavior.Repeat:
-                        StopInternal();
-                        VlcMediaPlayer.Play();
-                        break;
-                }
+                OnPropertyChanged(() => Length);
+                LengthChanged?.Invoke(this, new EventArgs());
             }));
         }
 
-        private void VlcMediaPlayerLengthChanged(object sender, EventArgs e)
+        private void VlcMediaPlayerPausableChanged(object sender, MediaPlayerValueChangedEventArgs<bool> e)
         {
             if (_disposing || _isStopping) return;
 
             Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
             {
-                OnPropertyChanged(() => Length);
-                if (LengthChanged != null)
-                {
-                    LengthChanged(this, new EventArgs());
-                }
+                OnPropertyChanged(() => CanPause);
+                LengthChanged?.Invoke(this, new EventArgs());
             }));
         }
 
-        private void VlcMediaPlayerMediaChanged(object sender, MediaPlayerMediaChangedEventArgs e)
+        private void VlcMediaPlayerMediaStateChanged(object sender, MediaStateChangedEventArgs e)
         {
-            if (_oldMedia != null)
-            {
-                _oldMedia.StateChanged -= MediaStateChanged;
-            }
+            if (_disposing || _isStopping) return;
 
-            if (e.NewMedia != null)
-            {
-                e.NewMedia.StateChanged += MediaStateChanged;
-                _oldMedia = e.NewMedia;
-            }
-        }
+            Debug.WriteLine($"StateChanged : {e.State}");
 
-        private void MediaStateChanged(object sender, ObjectEventArgs<Interop.Core.Events.MediaStateChangedArgs> e)
-        {
-            if (_disposing || _isStopping) return;
+            Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() => { StateChanged?.Invoke(this, e); }));
 
-            Debug.WriteLine(String.Format("StateChanged : {0}", e.Value.NewState));
+            if (e.State == MediaState.Ended)
+                Dispatcher.BeginInvoke(new Action(() =>
+                {
+                    switch (EndBehavior)
+                    {
+                        case EndBehavior.Nothing:
 
-            Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
-            {
-                if (StateChanged != null)
-                    StateChanged(this, new ObjectEventArgs<MediaState>(e.Value.NewState));
-            }));
+                            break;
+
+                        case EndBehavior.Stop:
+                            Stop();
+                            break;
+
+                        case EndBehavior.Repeat:
+                            StopInternal();
+                            VlcMediaPlayer.Play();
+                            break;
+                    }
+                }));
         }
 
         #endregion VlcMediaPlayer event handlers
@@ -234,7 +206,7 @@ private void CheckAspectRatio()
         {
             if (!_context.IsAspectRatioChecked)
             {
-                var tracks = VlcMediaPlayer.Media.GetTracks();
+                var tracks = VlcMediaPlayer.Media.GetTrackInfo();
                 var videoMediaTracks = tracks.OfType<VideoTrack>().ToList();
                 var videoTrack = videoMediaTracks.FirstOrDefault();
 
@@ -246,24 +218,18 @@ private void CheckAspectRatio()
                     if (Math.Abs(scale.Width - 1.0) + Math.Abs(scale.Height - 1.0) > 0.0000001)
                     {
                         _context.IsAspectRatioChecked = true;
-                        Debug.WriteLine(String.Format("Scale:{0}x{1}", scale.Width, scale.Height));
-                        Debug.WriteLine(String.Format("Resize Image to {0}x{1}", _context.DisplayWidth,
-                            _context.DisplayHeight));
+                        Debug.WriteLine($"Scale:{scale.Width}x{scale.Height}");
+                        Debug.WriteLine($"Resize Image to {_context.DisplayWidth}x{_context.DisplayHeight}");
                     }
                     else
                     {
                         _checkCount++;
-                        if (_checkCount > 5)
-                        {
-                            _context.IsAspectRatioChecked = true;
-                        }
+                        if (_checkCount > 5) _context.IsAspectRatioChecked = true;
                     }
 
                     if (DisplayThreadDispatcher != null)
-                    {
                         DisplayThreadDispatcher.BeginInvoke(
                             new Action(() => { ScaleTransform = new ScaleTransform(scale.Width, scale.Height); }));
-                    }
                 }
             }
         }
@@ -274,28 +240,19 @@ private void TakeSnapshot()
             {
                 if (_snapshotContext != null)
                 {
-                    _snapshotContext.Save(this, this.VideoSource);
+                    _snapshotContext.Save(this, VideoSource);
                     _snapshotContext = null;
                 }
             }));
         }
-        
-        private IntPtr VideoLockCallback(IntPtr opaque, ref IntPtr planes)
+
+        private void* VideoLockCallback(void* opaque, void** planes)
         {
-            if (_context == null)
-            {
-                throw new NullReferenceException("Video context is null");
-            }
+            if (_context == null) throw new NullReferenceException("Video context is null");
 
-            if (VlcMediaPlayer.Volume != Volume)
-            {
-                VlcMediaPlayer.Volume = Volume;
-            }
+            if (VlcMediaPlayer.Volume != Volume) VlcMediaPlayer.Volume = Volume;
 
-            if (VideoSource == null)
-            {
-                VideoSource = _context.Image;
-            }
+            if (VideoSource == null) VideoSource = _context.Image;
 
             try
             {
@@ -306,19 +263,16 @@ private IntPtr VideoLockCallback(IntPtr opaque, ref IntPtr planes)
                 // ignored
             }
 
-            return planes = _context.MapView;
+            return *planes = _context.MapView.ToPointer();
         }
 
-        private void VideoUnlockCallback(IntPtr opaque, IntPtr picture, ref IntPtr planes)
+        private void VideoUnlockCallback(void* opaque, void* picture, void** planes)
         {
         }
 
-        private void VideoDisplayCallback(IntPtr opaque, IntPtr picture)
+        private void VideoDisplayCallback(void* opaque, void* picture)
         {
-            if (_context == null || DisplayThreadDispatcher == null)
-            {
-                return;
-            }
+            if (_context == null || DisplayThreadDispatcher == null) return;
 
             _context.Display();
 
@@ -332,46 +286,41 @@ private void VideoDisplayCallback(IntPtr opaque, IntPtr picture)
             }
         }
 
-        private uint VideoFormatCallback(ref IntPtr opaque, ref uint chroma, ref uint width, ref uint height,
-            ref uint pitches, ref uint lines)
+        private uint VideoFormatCallback(void** opaque, byte* chroma, uint* width, uint* height, uint* pitches,
+            uint* lines)
         {
-            Debug.WriteLine(String.Format("Initialize Video Content : {0}x{1}", width, height));
+            Debug.WriteLine($"Initialize Video Content : {*width}x{*height}");
 
-            var videoFormatChangingArgs = new VideoFormatChangingEventArgs(width, height, ChromaType.RV32);
+            var videoFormatChangingArgs = new VideoFormatChangingEventArgs(*width, *height, ChromaType.RV32);
 
-            if (VideoFormatChanging != null)
-            {
-                VideoFormatChanging(this, videoFormatChangingArgs);
-            }
+            VideoFormatChanging?.Invoke(this, videoFormatChangingArgs);
 
-            if (_context == null || videoFormatChangingArgs.Width != _context.Width || videoFormatChangingArgs.Height != _context.Height)
+            if (_context == null || videoFormatChangingArgs.Width != _context.Width ||
+                videoFormatChangingArgs.Height != _context.Height)
             {
                 if (DisplayThreadDispatcher == null)
-                {
-                    throw new NullReferenceException(String.Format("Image = {0}, Image.SeparateThreadDispatcher = {1}, ThreadSeparatedImage.CommonDispatcher = {2}", Image, Image.SeparateThreadDispatcher, ThreadSeparatedImage.CommonDispatcher));
-                }
+                    throw new NullReferenceException(
+                        $"Image = {Image}, Image.SeparateThreadDispatcher = {Image.SeparateThreadDispatcher}, ThreadSeparatedImage.CommonDispatcher = {ThreadSeparatedImage.CommonDispatcher}");
                 DisplayThreadDispatcher.Invoke(DispatcherPriority.Normal,
                     new Action(() =>
                     {
-                        if (_context != null)
-                        {
-                            _context.Dispose();
-                        }
-                        _context = new VideoDisplayContext(videoFormatChangingArgs.Width, videoFormatChangingArgs.Height, videoFormatChangingArgs.ChromaType);
-						VideoSource = null;
+                        if (_context != null) _context.Dispose();
+                        _context = new VideoDisplayContext(videoFormatChangingArgs.Width,
+                            videoFormatChangingArgs.Height, videoFormatChangingArgs.ChromaType);
+                        VideoSource = null;
                     }));
             }
-            
+
             _context.IsAspectRatioChecked = false;
-            chroma = (uint) _context.ChromaType;
-            width = (uint) _context.Width;
-            height = (uint) _context.Height;
-            pitches = (uint) _context.Stride;
-            lines = (uint) _context.Height;
+            *(uint*) chroma = (uint) _context.ChromaType;
+            *width = (uint) _context.Width;
+            *height = (uint) _context.Height;
+            *pitches = (uint) _context.Stride;
+            *lines = (uint) _context.Height;
             return (uint) _context.Size;
         }
 
-        private void VideoCleanupCallback(IntPtr opaque)
+        private void VideoCleanupCallback(void* opaque)
         {
         }
 
@@ -433,17 +382,17 @@ internal VideoFormatChangingEventArgs(uint width, uint height, ChromaType chroma
         }
 
         /// <summary>
-        /// Width of video.
+        ///     Width of video.
         /// </summary>
         public uint Width { get; set; }
 
         /// <summary>
-        /// Height of video.
+        ///     Height of video.
         /// </summary>
         public uint Height { get; set; }
 
         /// <summary>
-        /// Video chroma type.
+        ///     Video chroma type.
         /// </summary>
         public ChromaType ChromaType { get; set; }
     }
diff --git a/Meta.Vlc.Wpf/VlcPlayer.Helper.cs b/Meta.Vlc.Wpf/VlcPlayer.Helper.cs
index 593729b..0b6e2cb 100644
--- a/Meta.Vlc.Wpf/VlcPlayer.Helper.cs
+++ b/Meta.Vlc.Wpf/VlcPlayer.Helper.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: VlcPlayer.Helper.cs
-// Version: 20160708
+// Version: 20181231
 
 using System;
 using System.Windows;
@@ -16,13 +16,14 @@ public partial class VlcPlayer
         private Size GetScaleTransform()
         {
             if (_context == null) return new Size(1.0, 1.0);
-            AspectRatio aspectRatio = AspectRatio.Default;
+            var aspectRatio = AspectRatio.Default;
             Dispatcher.Invoke(new Action(() => { aspectRatio = AspectRatio; }));
-            
+
             switch (aspectRatio)
             {
                 case AspectRatio.Default:
-                    return new Size(_context.DisplayWidth / _context.DisplayHeight * _context.Height / _context.Width, 1.0);
+                    return new Size(_context.DisplayWidth / _context.DisplayHeight * _context.Height / _context.Width,
+                        1.0);
 
                 case AspectRatio._16_9:
                     return new Size(1.0 * 16 / 9 * _context.Height / _context.Width, 1.0);
@@ -30,6 +31,7 @@ private Size GetScaleTransform()
                 case AspectRatio._4_3:
                     return new Size(1.0 * 4 / 3 * _context.Height / _context.Width, 1.0);
             }
+
             return new Size(1.0, 1.0);
         }
 
@@ -39,10 +41,7 @@ private Size GetScaleTransform()
 
         private int GetVideoPositionX(double x)
         {
-            if (_context == null)
-            {
-                return (int)x;
-            }
+            if (_context == null) return (int) x;
             double width = _context.Width * ScaleTransform.ScaleX,
                 height = _context.Height * ScaleTransform.ScaleY;
             var px = 0;
@@ -53,51 +52,43 @@ private int GetVideoPositionX(double x)
                     switch (HorizontalContentAlignment)
                     {
                         case HorizontalAlignment.Left:
-                            px = (int)x;
+                            px = (int) x;
                             break;
 
                         case HorizontalAlignment.Center:
-                            px = (int)(x - ((ActualWidth - width) / 2));
+                            px = (int) (x - (ActualWidth - width) / 2);
                             break;
 
                         case HorizontalAlignment.Right:
-                            px = (int)(x - (ActualWidth - width));
+                            px = (int) (x - (ActualWidth - width));
                             break;
 
                         case HorizontalAlignment.Stretch:
                             if (ActualWidth > width)
-                            {
-                                px = (int)(x - ((ActualWidth - width) / 2));
-                            }
+                                px = (int) (x - (ActualWidth - width) / 2);
                             else
-                            {
-                                px = (int)x;
-                            }
+                                px = (int) x;
                             break;
                     }
+
                     break;
 
                 case Stretch.Fill:
                     switch (StretchDirection)
                     {
                         case StretchDirection.UpOnly:
-                            if (ActualWidth > width)
-                            {
-                                px = (int)(x / ActualWidth * width);
-                            }
+                            if (ActualWidth > width) px = (int) (x / ActualWidth * width);
                             break;
 
                         case StretchDirection.DownOnly:
-                            if (ActualWidth < width)
-                            {
-                                px = (int)(x / ActualWidth * width);
-                            }
+                            if (ActualWidth < width) px = (int) (x / ActualWidth * width);
                             break;
 
                         case StretchDirection.Both:
-                            px = (int)(x / ActualWidth * width);
+                            px = (int) (x / ActualWidth * width);
                             break;
                     }
+
                     break;
 
                 case Stretch.Uniform:
@@ -111,154 +102,131 @@ private int GetVideoPositionX(double x)
                             if (scale > 1)
                             {
                                 if (scaleX == scale)
-                                {
-                                    px = (int)(x / scale);
-                                }
+                                    px = (int) (x / scale);
                                 else
-                                {
                                     switch (HorizontalContentAlignment)
                                     {
                                         case HorizontalAlignment.Left:
-                                            px = (int)(x / scale);
+                                            px = (int) (x / scale);
                                             break;
 
                                         case HorizontalAlignment.Center:
-                                            px = (int)((x - ((ActualWidth - width * scale) / 2)) / scale);
+                                            px = (int) ((x - (ActualWidth - width * scale) / 2) / scale);
                                             break;
 
                                         case HorizontalAlignment.Right:
-                                            px = (int)((x - (ActualWidth - width * scale)) / scale);
+                                            px = (int) ((x - (ActualWidth - width * scale)) / scale);
                                             break;
 
                                         case HorizontalAlignment.Stretch:
-                                            px = (int)((x - ((ActualWidth - width * scale) / 2)) / scale);
-                                            break;
-
-                                        default:
+                                            px = (int) ((x - (ActualWidth - width * scale) / 2) / scale);
                                             break;
                                     }
-                                }
                             }
                             else
                             {
                                 switch (HorizontalContentAlignment)
                                 {
                                     case HorizontalAlignment.Left:
-                                        px = (int)x;
+                                        px = (int) x;
                                         break;
 
                                     case HorizontalAlignment.Center:
-                                        px = (int)(x - ((ActualWidth - width) / 2));
+                                        px = (int) (x - (ActualWidth - width) / 2);
                                         break;
 
                                     case HorizontalAlignment.Right:
-                                        px = (int)(x - (ActualWidth - width));
+                                        px = (int) (x - (ActualWidth - width));
                                         break;
 
                                     case HorizontalAlignment.Stretch:
                                         if (ActualWidth > width)
-                                        {
-                                            px = (int)(x - ((ActualWidth - width) / 2));
-                                        }
+                                            px = (int) (x - (ActualWidth - width) / 2);
                                         else
-                                        {
-                                            px = (int)x;
-                                        }
+                                            px = (int) x;
                                         break;
                                 }
                             }
+
                             break;
 
                         case StretchDirection.DownOnly:
                             if (scale < 1)
                             {
                                 if (scaleX == scale)
-                                {
-                                    px = (int)(x / scale);
-                                }
+                                    px = (int) (x / scale);
                                 else
-                                {
                                     switch (HorizontalContentAlignment)
                                     {
                                         case HorizontalAlignment.Left:
-                                            px = (int)(x / scale);
+                                            px = (int) (x / scale);
                                             break;
 
                                         case HorizontalAlignment.Center:
-                                            px = (int)((x - ((ActualWidth - width * scale) / 2)) / scale);
+                                            px = (int) ((x - (ActualWidth - width * scale) / 2) / scale);
                                             break;
 
                                         case HorizontalAlignment.Right:
-                                            px = (int)((x - (ActualWidth - width * scale)) / scale);
+                                            px = (int) ((x - (ActualWidth - width * scale)) / scale);
                                             break;
 
                                         case HorizontalAlignment.Stretch:
-                                            px = (int)((x - ((ActualWidth - width * scale) / 2)) / scale);
-                                            break;
-
-                                        default:
+                                            px = (int) ((x - (ActualWidth - width * scale) / 2) / scale);
                                             break;
                                     }
-                                }
                             }
                             else
                             {
                                 switch (HorizontalContentAlignment)
                                 {
                                     case HorizontalAlignment.Left:
-                                        px = (int)x;
+                                        px = (int) x;
                                         break;
 
                                     case HorizontalAlignment.Center:
-                                        px = (int)(x - ((ActualWidth - width) / 2));
+                                        px = (int) (x - (ActualWidth - width) / 2);
                                         break;
 
                                     case HorizontalAlignment.Right:
-                                        px = (int)(x - (ActualWidth - width));
+                                        px = (int) (x - (ActualWidth - width));
                                         break;
 
                                     case HorizontalAlignment.Stretch:
                                         if (ActualWidth > width)
-                                        {
-                                            px = (int)(x - ((ActualWidth - width) / 2));
-                                        }
+                                            px = (int) (x - (ActualWidth - width) / 2);
                                         else
-                                        {
-                                            px = (int)x;
-                                        }
+                                            px = (int) x;
                                         break;
                                 }
                             }
+
                             break;
 
                         case StretchDirection.Both:
                             if (scaleX == scale)
-                            {
-                                px = (int)(x / scale);
-                            }
+                                px = (int) (x / scale);
                             else
-                            {
                                 switch (HorizontalContentAlignment)
                                 {
                                     case HorizontalAlignment.Left:
-                                        px = (int)(x / scale);
+                                        px = (int) (x / scale);
                                         break;
 
                                     case HorizontalAlignment.Center:
-                                        px = (int)((x - ((ActualWidth - width * scale) / 2)) / scale);
+                                        px = (int) ((x - (ActualWidth - width * scale) / 2) / scale);
                                         break;
 
                                     case HorizontalAlignment.Right:
-                                        px = (int)((x - (ActualWidth - width * scale)) / scale);
+                                        px = (int) ((x - (ActualWidth - width * scale)) / scale);
                                         break;
 
                                     case HorizontalAlignment.Stretch:
-                                        px = (int)((x - ((ActualWidth - width * scale) / 2)) / scale);
+                                        px = (int) ((x - (ActualWidth - width * scale) / 2) / scale);
                                         break;
                                 }
-                            }
                             break;
                     }
+
                     break;
 
                 case Stretch.UniformToFill:
@@ -272,156 +240,134 @@ private int GetVideoPositionX(double x)
                             if (scale > 1)
                             {
                                 if (scaleX == scale)
-                                {
-                                    px = (int)(x / scale);
-                                }
+                                    px = (int) (x / scale);
                                 else
-                                {
                                     switch (HorizontalContentAlignment)
                                     {
                                         case HorizontalAlignment.Left:
-                                            px = (int)(x / scale);
+                                            px = (int) (x / scale);
                                             break;
 
                                         case HorizontalAlignment.Center:
-                                            px = (int)((x - ((ActualWidth - width * scale) / 2)) / scale);
+                                            px = (int) ((x - (ActualWidth - width * scale) / 2) / scale);
                                             break;
 
                                         case HorizontalAlignment.Right:
-                                            px = (int)((x - (ActualWidth - width * scale)) / scale);
+                                            px = (int) ((x - (ActualWidth - width * scale)) / scale);
                                             break;
 
                                         case HorizontalAlignment.Stretch:
-                                            px = (int)(x / scale);
-                                            break;
-
-                                        default:
+                                            px = (int) (x / scale);
                                             break;
                                     }
-                                }
                             }
                             else
                             {
                                 switch (HorizontalContentAlignment)
                                 {
                                     case HorizontalAlignment.Left:
-                                        px = (int)x;
+                                        px = (int) x;
                                         break;
 
                                     case HorizontalAlignment.Center:
-                                        px = (int)(x - ((ActualWidth - width) / 2));
+                                        px = (int) (x - (ActualWidth - width) / 2);
                                         break;
 
                                     case HorizontalAlignment.Right:
-                                        px = (int)(x - (ActualWidth - width));
+                                        px = (int) (x - (ActualWidth - width));
                                         break;
 
                                     case HorizontalAlignment.Stretch:
                                         if (ActualWidth > width)
-                                        {
-                                            px = (int)(x - ((ActualWidth - width) / 2));
-                                        }
+                                            px = (int) (x - (ActualWidth - width) / 2);
                                         else
-                                        {
-                                            px = (int)x;
-                                        }
+                                            px = (int) x;
                                         break;
                                 }
                             }
+
                             break;
 
                         case StretchDirection.DownOnly:
                             if (scale < 1)
                             {
                                 if (scaleX == scale)
-                                {
-                                    px = (int)(x / scale);
-                                }
+                                    px = (int) (x / scale);
                                 else
-                                {
                                     switch (HorizontalContentAlignment)
                                     {
                                         case HorizontalAlignment.Left:
-                                            px = (int)(x / scale);
+                                            px = (int) (x / scale);
                                             break;
 
                                         case HorizontalAlignment.Center:
-                                            px = (int)((x - ((ActualWidth - width * scale) / 2)) / scale);
+                                            px = (int) ((x - (ActualWidth - width * scale) / 2) / scale);
                                             break;
 
                                         case HorizontalAlignment.Right:
-                                            px = (int)((x - (ActualWidth - width * scale)) / scale);
+                                            px = (int) ((x - (ActualWidth - width * scale)) / scale);
                                             break;
 
                                         case HorizontalAlignment.Stretch:
-                                            px = (int)(x / scale);
+                                            px = (int) (x / scale);
                                             break;
                                     }
-                                }
                             }
                             else
                             {
                                 switch (HorizontalContentAlignment)
                                 {
                                     case HorizontalAlignment.Left:
-                                        px = (int)x;
+                                        px = (int) x;
                                         break;
 
                                     case HorizontalAlignment.Center:
-                                        px = (int)(x - ((ActualWidth - width) / 2));
+                                        px = (int) (x - (ActualWidth - width) / 2);
                                         break;
 
                                     case HorizontalAlignment.Right:
-                                        px = (int)(x - (ActualWidth - width));
+                                        px = (int) (x - (ActualWidth - width));
                                         break;
 
                                     case HorizontalAlignment.Stretch:
                                         if (ActualWidth > width)
-                                        {
-                                            px = (int)(x - ((ActualWidth - width) / 2));
-                                        }
+                                            px = (int) (x - (ActualWidth - width) / 2);
                                         else
-                                        {
-                                            px = (int)x;
-                                        }
+                                            px = (int) x;
                                         break;
                                 }
                             }
+
                             break;
 
                         case StretchDirection.Both:
                             if (scaleX == scale)
-                            {
-                                px = (int)(x / scale);
-                            }
+                                px = (int) (x / scale);
                             else
-                            {
                                 switch (HorizontalContentAlignment)
                                 {
                                     case HorizontalAlignment.Left:
-                                        px = (int)(x / scale);
+                                        px = (int) (x / scale);
                                         break;
 
                                     case HorizontalAlignment.Center:
-                                        px = (int)((x - ((ActualWidth - width * scale) / 2)) / scale);
+                                        px = (int) ((x - (ActualWidth - width * scale) / 2) / scale);
                                         break;
 
                                     case HorizontalAlignment.Right:
-                                        px = (int)((x - (ActualWidth - width * scale)) / scale);
+                                        px = (int) ((x - (ActualWidth - width * scale)) / scale);
                                         break;
 
                                     case HorizontalAlignment.Stretch:
-                                        px = (int)(x / scale);
-                                        break;
-
-                                    default:
+                                        px = (int) (x / scale);
                                         break;
                                 }
-                            }
                             break;
                     }
+
                     break;
             }
+
             return px;
         }
 
@@ -429,7 +375,7 @@ private int GetVideoPositionY(double y)
         {
             double width = _context.Width * ScaleTransform.ScaleX,
                 height = _context.Height * ScaleTransform.ScaleY;
-            int py = 0;
+            var py = 0;
             double scale, scaleX, scaleY;
             switch (Stretch)
             {
@@ -437,51 +383,43 @@ private int GetVideoPositionY(double y)
                     switch (VerticalContentAlignment)
                     {
                         case VerticalAlignment.Top:
-                            py = (int)y;
+                            py = (int) y;
                             break;
 
                         case VerticalAlignment.Center:
-                            py = (int)(y - ((ActualHeight - height) / 2));
+                            py = (int) (y - (ActualHeight - height) / 2);
                             break;
 
                         case VerticalAlignment.Bottom:
-                            py = (int)(y - (ActualHeight - height));
+                            py = (int) (y - (ActualHeight - height));
                             break;
 
                         case VerticalAlignment.Stretch:
                             if (ActualHeight > height)
-                            {
-                                py = (int)(y - ((ActualHeight - height) / 2));
-                            }
+                                py = (int) (y - (ActualHeight - height) / 2);
                             else
-                            {
-                                py = (int)y;
-                            }
+                                py = (int) y;
                             break;
                     }
+
                     break;
 
                 case Stretch.Fill:
                     switch (StretchDirection)
                     {
                         case StretchDirection.UpOnly:
-                            if (ActualHeight > height)
-                            {
-                                py = (int)(y / ActualHeight * height);
-                            }
+                            if (ActualHeight > height) py = (int) (y / ActualHeight * height);
                             break;
 
                         case StretchDirection.DownOnly:
-                            if (ActualHeight < height)
-                            {
-                                py = (int)(y / ActualHeight * height);
-                            }
+                            if (ActualHeight < height) py = (int) (y / ActualHeight * height);
                             break;
 
                         case StretchDirection.Both:
-                            py = (int)(y / ActualHeight * height);
+                            py = (int) (y / ActualHeight * height);
                             break;
                     }
+
                     break;
 
                 case Stretch.Uniform:
@@ -495,157 +433,131 @@ private int GetVideoPositionY(double y)
                             if (scale > 1)
                             {
                                 if (scaleY == scale)
-                                {
-                                    py = (int)(y / scale);
-                                }
+                                    py = (int) (y / scale);
                                 else
-                                {
                                     switch (VerticalContentAlignment)
                                     {
                                         case VerticalAlignment.Top:
-                                            py = (int)(y / scale);
+                                            py = (int) (y / scale);
                                             break;
 
                                         case VerticalAlignment.Center:
-                                            py = (int)((y - ((ActualHeight - height * scale) / 2)) / scale);
+                                            py = (int) ((y - (ActualHeight - height * scale) / 2) / scale);
                                             break;
 
                                         case VerticalAlignment.Bottom:
-                                            py = (int)((y - (ActualHeight - height * scale)) / scale);
+                                            py = (int) ((y - (ActualHeight - height * scale)) / scale);
                                             break;
 
                                         case VerticalAlignment.Stretch:
-                                            py = (int)((y - ((ActualHeight - height * scale) / 2)) / scale);
-                                            break;
-
-                                        default:
+                                            py = (int) ((y - (ActualHeight - height * scale) / 2) / scale);
                                             break;
                                     }
-                                }
                             }
                             else
                             {
                                 switch (VerticalContentAlignment)
                                 {
                                     case VerticalAlignment.Top:
-                                        py = (int)y;
+                                        py = (int) y;
                                         break;
 
                                     case VerticalAlignment.Center:
-                                        py = (int)(y - ((ActualHeight - height) / 2));
+                                        py = (int) (y - (ActualHeight - height) / 2);
                                         break;
 
                                     case VerticalAlignment.Bottom:
-                                        py = (int)(y - (ActualHeight - height));
+                                        py = (int) (y - (ActualHeight - height));
                                         break;
 
                                     case VerticalAlignment.Stretch:
                                         if (ActualHeight > height)
-                                        {
-                                            py = (int)(y - ((ActualHeight - height) / 2));
-                                        }
+                                            py = (int) (y - (ActualHeight - height) / 2);
                                         else
-                                        {
-                                            py = (int)y;
-                                        }
+                                            py = (int) y;
                                         break;
                                 }
                             }
+
                             break;
 
                         case StretchDirection.DownOnly:
                             if (scale < 1)
                             {
                                 if (scaleY == scale)
-                                {
-                                    py = (int)(y / scale);
-                                }
+                                    py = (int) (y / scale);
                                 else
-                                {
                                     switch (VerticalContentAlignment)
                                     {
                                         case VerticalAlignment.Top:
-                                            py = (int)(y / scale);
+                                            py = (int) (y / scale);
                                             break;
 
                                         case VerticalAlignment.Center:
-                                            py = (int)((y - ((ActualHeight - height * scale) / 2)) / scale);
+                                            py = (int) ((y - (ActualHeight - height * scale) / 2) / scale);
                                             break;
 
                                         case VerticalAlignment.Bottom:
-                                            py = (int)((y - (ActualHeight - height * scale)) / scale);
+                                            py = (int) ((y - (ActualHeight - height * scale)) / scale);
                                             break;
 
                                         case VerticalAlignment.Stretch:
-                                            py = (int)((y - ((ActualHeight - height * scale) / 2)) / scale);
-                                            break;
-
-                                        default:
+                                            py = (int) ((y - (ActualHeight - height * scale) / 2) / scale);
                                             break;
                                     }
-                                }
                             }
                             else
                             {
                                 switch (VerticalContentAlignment)
                                 {
                                     case VerticalAlignment.Top:
-                                        py = (int)y;
+                                        py = (int) y;
                                         break;
 
                                     case VerticalAlignment.Center:
-                                        py = (int)(y - ((ActualHeight - height) / 2));
+                                        py = (int) (y - (ActualHeight - height) / 2);
                                         break;
 
                                     case VerticalAlignment.Bottom:
-                                        py = (int)(y - (ActualHeight - height));
+                                        py = (int) (y - (ActualHeight - height));
                                         break;
 
                                     case VerticalAlignment.Stretch:
                                         if (ActualHeight > height)
-                                        {
-                                            py = (int)(y - ((ActualHeight - height) / 2));
-                                        }
+                                            py = (int) (y - (ActualHeight - height) / 2);
                                         else
-                                        {
-                                            py = (int)y;
-                                        }
+                                            py = (int) y;
                                         break;
                                 }
                             }
+
                             break;
 
                         case StretchDirection.Both:
                             if (scaleY == scale)
-                            {
-                                py = (int)(y / scale);
-                            }
+                                py = (int) (y / scale);
                             else
-                            {
                                 switch (VerticalContentAlignment)
                                 {
                                     case VerticalAlignment.Top:
-                                        py = (int)(y / scale);
+                                        py = (int) (y / scale);
                                         break;
 
                                     case VerticalAlignment.Center:
-                                        py = (int)((y - ((ActualHeight - height * scale) / 2)) / scale);
+                                        py = (int) ((y - (ActualHeight - height * scale) / 2) / scale);
                                         break;
 
                                     case VerticalAlignment.Bottom:
-                                        py = (int)((y - (ActualHeight - height * scale)) / scale);
+                                        py = (int) ((y - (ActualHeight - height * scale)) / scale);
                                         break;
 
                                     case VerticalAlignment.Stretch:
-                                        py = (int)((y - ((ActualHeight - height * scale) / 2)) / scale);
-                                        break;
-
-                                    default:
+                                        py = (int) ((y - (ActualHeight - height * scale) / 2) / scale);
                                         break;
                                 }
-                            }
                             break;
                     }
+
                     break;
 
                 case Stretch.UniformToFill:
@@ -659,159 +571,134 @@ private int GetVideoPositionY(double y)
                             if (scale > 1)
                             {
                                 if (scaleY == scale)
-                                {
-                                    py = (int)(y / scale);
-                                }
+                                    py = (int) (y / scale);
                                 else
-                                {
                                     switch (VerticalContentAlignment)
                                     {
                                         case VerticalAlignment.Top:
-                                            py = (int)(y / scale);
+                                            py = (int) (y / scale);
                                             break;
 
                                         case VerticalAlignment.Center:
-                                            py = (int)((y - ((ActualHeight - height * scale) / 2)) / scale);
+                                            py = (int) ((y - (ActualHeight - height * scale) / 2) / scale);
                                             break;
 
                                         case VerticalAlignment.Bottom:
-                                            py = (int)((y - (ActualHeight - height * scale)) / scale);
+                                            py = (int) ((y - (ActualHeight - height * scale)) / scale);
                                             break;
 
                                         case VerticalAlignment.Stretch:
-                                            py = (int)(y / scale);
-                                            break;
-
-                                        default:
+                                            py = (int) (y / scale);
                                             break;
                                     }
-                                }
                             }
                             else
                             {
                                 switch (VerticalContentAlignment)
                                 {
                                     case VerticalAlignment.Top:
-                                        py = (int)y;
+                                        py = (int) y;
                                         break;
 
                                     case VerticalAlignment.Center:
-                                        py = (int)(y - ((ActualHeight - height) / 2));
+                                        py = (int) (y - (ActualHeight - height) / 2);
                                         break;
 
                                     case VerticalAlignment.Bottom:
-                                        py = (int)(y - (ActualHeight - height));
+                                        py = (int) (y - (ActualHeight - height));
                                         break;
 
                                     case VerticalAlignment.Stretch:
                                         if (ActualHeight > height)
-                                        {
-                                            py = (int)(y - ((ActualHeight - height) / 2));
-                                        }
+                                            py = (int) (y - (ActualHeight - height) / 2);
                                         else
-                                        {
-                                            py = (int)y;
-                                        }
+                                            py = (int) y;
                                         break;
                                 }
                             }
+
                             break;
 
                         case StretchDirection.DownOnly:
                             if (scale < 1)
                             {
                                 if (scaleY == scale)
-                                {
-                                    py = (int)(y / scale);
-                                }
+                                    py = (int) (y / scale);
                                 else
-                                {
                                     switch (VerticalContentAlignment)
                                     {
                                         case VerticalAlignment.Top:
-                                            py = (int)(y / scale);
+                                            py = (int) (y / scale);
                                             break;
 
                                         case VerticalAlignment.Center:
-                                            py = (int)((y - ((ActualHeight - height * scale) / 2)) / scale);
+                                            py = (int) ((y - (ActualHeight - height * scale) / 2) / scale);
                                             break;
 
                                         case VerticalAlignment.Bottom:
-                                            py = (int)((y - (ActualHeight - height * scale)) / scale);
+                                            py = (int) ((y - (ActualHeight - height * scale)) / scale);
                                             break;
 
                                         case VerticalAlignment.Stretch:
-                                            py = (int)(y / scale);
-                                            break;
-
-                                        default:
+                                            py = (int) (y / scale);
                                             break;
                                     }
-                                }
                             }
                             else
                             {
                                 switch (VerticalContentAlignment)
                                 {
                                     case VerticalAlignment.Top:
-                                        py = (int)y;
+                                        py = (int) y;
                                         break;
 
                                     case VerticalAlignment.Center:
-                                        py = (int)(y - ((ActualHeight - height) / 2));
+                                        py = (int) (y - (ActualHeight - height) / 2);
                                         break;
 
                                     case VerticalAlignment.Bottom:
-                                        py = (int)(y - (ActualHeight - height));
+                                        py = (int) (y - (ActualHeight - height));
                                         break;
 
                                     case VerticalAlignment.Stretch:
                                         if (ActualHeight > height)
-                                        {
-                                            py = (int)(y - ((ActualHeight - height) / 2));
-                                        }
+                                            py = (int) (y - (ActualHeight - height) / 2);
                                         else
-                                        {
-                                            py = (int)y;
-                                        }
+                                            py = (int) y;
                                         break;
                                 }
                             }
+
                             break;
 
                         case StretchDirection.Both:
                             if (scaleY == scale)
-                            {
-                                py = (int)(y / scale);
-                            }
+                                py = (int) (y / scale);
                             else
-                            {
                                 switch (VerticalContentAlignment)
                                 {
                                     case VerticalAlignment.Top:
-                                        py = (int)(y / scale);
+                                        py = (int) (y / scale);
                                         break;
 
                                     case VerticalAlignment.Center:
-                                        py = (int)((y - ((ActualHeight - height * scale) / 2)) / scale);
+                                        py = (int) ((y - (ActualHeight - height * scale) / 2) / scale);
                                         break;
 
                                     case VerticalAlignment.Bottom:
-                                        py = (int)((y - (ActualHeight - height * scale)) / scale);
+                                        py = (int) ((y - (ActualHeight - height * scale)) / scale);
                                         break;
 
                                     case VerticalAlignment.Stretch:
-                                        py = (int)(y / scale);
-                                        break;
-
-                                    default:
+                                        py = (int) (y / scale);
                                         break;
                                 }
-                            }
                             break;
                     }
+
                     break;
             }
+
             return py;
         }
 
diff --git a/Meta.Vlc.Wpf/VlcPlayer.Properties.cs b/Meta.Vlc.Wpf/VlcPlayer.Properties.cs
index 759109d..33e3dc7 100644
--- a/Meta.Vlc.Wpf/VlcPlayer.Properties.cs
+++ b/Meta.Vlc.Wpf/VlcPlayer.Properties.cs
@@ -1,18 +1,20 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: VlcPlayer.Properties.cs
-// Version: 20160325
+// Version: 20181231
 
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
-using Meta.Vlc.Interop.Media;
-using Meta.Vlc.Interop.MediaPlayer;
 
 namespace Meta.Vlc.Wpf
 {
     public partial class VlcPlayer
     {
+        private readonly Dispatcher _customDisplayThreadDispatcher;
+
         #region Position
 
         /// <summary>
@@ -47,18 +49,6 @@ public TimeSpan Time
 
         #endregion Time
 
-        #region FPS
-
-        /// <summary>
-        ///     Get FPS of media.
-        /// </summary>
-        public float FPS
-        {
-            get { return VlcMediaPlayer.DefaultValueWhenNull(x => x.Fps.DefaultValueWhenTrue(_isStopping)); }
-        }
-
-        #endregion FPS
-
         #region IsMute
 
         /// <summary>
@@ -75,10 +65,7 @@ public bool IsMute
                 Dispatcher.Invoke(DispatcherPriority.Normal, new Action(() =>
                 {
                     OnPropertyChanged(() => IsMute);
-                    if (IsMuteChanged != null)
-                    {
-                        IsMuteChanged(this, new EventArgs());
-                    }
+                    if (IsMuteChanged != null) IsMuteChanged(this, new EventArgs());
                 }));
             }
         }
@@ -146,7 +133,7 @@ public int AudioTrack
         /// <summary>
         ///     Get description of audio track.
         /// </summary>
-        public TrackDescriptionList AudioTrackDescription
+        public List<TrackDescription> AudioTrackDescription
         {
             get
             {
@@ -262,6 +249,18 @@ public MediaState State
 
         #endregion State
 
+        #region CanPause
+
+        /// <summary>
+        ///     Can this media player be paused?
+        /// </summary>
+        public bool CanPause
+        {
+            get { return VlcMediaPlayer.DefaultValueWhenNull(x => x.CanPause.DefaultValueWhenTrue(_isStopping)); }
+        }
+
+        #endregion Length
+
         #region Length
 
         /// <summary>
@@ -297,28 +296,18 @@ public TimeSpan Length
         public PlayerCreateMode CreateMode { get; set; }
 
         #endregion CreateMode
-        
-        private ThreadSeparatedImage Image
-        {
-            get { return (ThreadSeparatedImage)GetTemplateChild("Image"); }
-        }
 
-        private Dispatcher _customDisplayThreadDispatcher;
+        private ThreadSeparatedImage Image => (ThreadSeparatedImage) GetTemplateChild("Image");
+
         public Dispatcher DisplayThreadDispatcher
         {
             get
             {
-                Dispatcher result = _customDisplayThreadDispatcher;
+                var result = _customDisplayThreadDispatcher;
 
-                if (result == null && Image!= null)
-                {
-                    result = Image.SeparateThreadDispatcher;
-                }
+                if (result == null && Image != null) result = Image.SeparateThreadDispatcher;
 
-                if (result == null)
-                {
-                    return ThreadSeparatedImage.CommonDispatcher;
-                }
+                if (result == null) return ThreadSeparatedImage.CommonDispatcher;
 
                 return result;
             }
@@ -333,7 +322,7 @@ public Dispatcher DisplayThreadDispatcher
         /// </summary>
         public int Volume
         {
-            get { return _volume; }
+            get => _volume;
             set
             {
                 if (_volume == value || VlcMediaPlayer == null) return;
@@ -342,10 +331,7 @@ public int Volume
                 Dispatcher.Invoke(DispatcherPriority.Normal, new Action(() =>
                 {
                     OnPropertyChanged(() => Volume);
-                    if (VolumeChanged != null)
-                    {
-                        VolumeChanged(this, new EventArgs());
-                    }
+                    if (VolumeChanged != null) VolumeChanged(this, new EventArgs());
                 }));
             }
         }
@@ -361,23 +347,17 @@ public int Volume
         /// </summary>
         public AudioEqualizer AudioEqualizer
         {
-            get { return _audioEqualizer; }
+            get => _audioEqualizer;
             set
             {
-                if (_audioEqualizer != null)
-                {
-                    _audioEqualizer.PropertyChanged -= AudioEqualizer_PropertyChanged;
-                }
-                if (value != null)
-                {
-                    value.PropertyChanged += AudioEqualizer_PropertyChanged;
-                }
+                if (_audioEqualizer != null) _audioEqualizer.PropertyChanged -= AudioEqualizer_PropertyChanged;
+                if (value != null) value.PropertyChanged += AudioEqualizer_PropertyChanged;
                 _audioEqualizer = value;
                 VlcMediaPlayer.SetEqualizer(_audioEqualizer);
             }
         }
 
-        private void AudioEqualizer_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        private void AudioEqualizer_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             VlcMediaPlayer.SetEqualizer(_audioEqualizer);
         }
@@ -386,29 +366,23 @@ private void AudioEqualizer_PropertyChanged(object sender, System.ComponentModel
 
         #region VideoSource
 
-        public BitmapSource _videoSource = null;
+        public BitmapSource _videoSource;
 
         /// <summary>
         ///     The image data of video, it is created on other thread, you can't use it in main thread.
         /// </summary>
         public BitmapSource VideoSource
         {
-            get { return _videoSource; }
+            get => _videoSource;
             private set
             {
-                if (Image != null)
-                {
-                    Image.Source = value;
-                }
+                if (Image != null) Image.Source = value;
 
                 if (_videoSource != value)
                 {
                     _videoSource = value;
                     OnPropertyChanged(() => VideoSource);
-                    if (VideoSourceChanged != null)
-                    {
-                        VideoSourceChanged(this, new VideoSourceChangedEventArgs(value));
-                    }
+                    if (VideoSourceChanged != null) VideoSourceChanged(this, new VideoSourceChangedEventArgs(value));
                 }
             }
         }
@@ -419,17 +393,14 @@ private set
 
         #region ScaleTransform
 
-        internal ScaleTransform _scaleTransform = null;
+        internal ScaleTransform _scaleTransform;
 
         internal ScaleTransform ScaleTransform
         {
-            get { return _scaleTransform; }
+            get => _scaleTransform;
             set
             {
-                if (Image != null)
-                {
-                    Image.ScaleTransform = value;
-                }
+                if (Image != null) Image.ScaleTransform = value;
 
                 if (_scaleTransform != value)
                 {
diff --git a/Meta.Vlc.Wpf/VlcPlayer.cs b/Meta.Vlc.Wpf/VlcPlayer.cs
index b4e4d04..63f22a7 100644
--- a/Meta.Vlc.Wpf/VlcPlayer.cs
+++ b/Meta.Vlc.Wpf/VlcPlayer.cs
@@ -1,8 +1,9 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: VlcPlayer.cs
-// Version: 20160327
+// Version: 20181231
 
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
@@ -15,7 +16,6 @@
 using System.Windows.Threading;
 using Meta.Vlc.Interop.MediaPlayer;
 using Meta.Vlc.Wpf.Annotations;
-using MediaState = Meta.Vlc.Interop.Media.MediaState;
 
 namespace Meta.Vlc.Wpf
 {
@@ -23,17 +23,18 @@ namespace Meta.Vlc.Wpf
     ///     VLC media player.
     /// </summary>
     [TemplatePart(Name = "Image", Type = typeof(ThreadSeparatedImage))]
-    public partial class VlcPlayer : Control, IDisposable, INotifyPropertyChanged
+    public unsafe partial class VlcPlayer : Control, IDisposable, INotifyPropertyChanged
     {
         #region --- Fields ---
 
         //TODO: maybe make all fields private or protected (for descendant classes to access)?
 
-        private VideoLockCallback _lockCallback;
-        private VideoUnlockCallback _unlockCallback;
-        private VideoDisplayCallback _displayCallback;
-        private VideoFormatCallback _formatCallback;
-        private VideoCleanupCallback _cleanupCallback;
+        private libvlc_video_lock_cb _lockCallback;
+        private libvlc_video_unlock_cb _unlockCallback;
+        private libvlc_video_display_cb _displayCallback;
+        private libvlc_video_format_cb _formatCallback;
+
+        private libvlc_video_cleanup_cb _cleanupCallback;
         //private AudioPlayCallback _audioPlayCallback;
         //private AudioPauseCallback _audioPauseCallback;
         //private AudioResumeCallback _audioResumeCallback;
@@ -47,6 +48,7 @@ public partial class VlcPlayer : Control, IDisposable, INotifyPropertyChanged
         private GCHandle _unlockCallbackHandle;
         private GCHandle _displayCallbackHandle;
         private GCHandle _formatCallbackHandle;
+
         private GCHandle _cleanupCallbackHandle;
         //private GCHandle _audioPlayCallbackHandle;
         //private GCHandle _audioPauseCallbackHandle;
@@ -64,7 +66,6 @@ public partial class VlcPlayer : Control, IDisposable, INotifyPropertyChanged
         private int _checkCount;
         private bool _isDVD;
         private bool _isStopping;
-        private VlcMedia _oldMedia;
 
         //Dispose//
         private bool _disposed;
@@ -86,9 +87,7 @@ static VlcPlayer()
                     var @this = o as VlcPlayer;
 
                     if (@this.DisplayThreadDispatcher != null)
-                    {
-                        @this.Image.HorizontalContentAlignment = (HorizontalAlignment)args.NewValue;
-                    }
+                        @this.Image.HorizontalContentAlignment = (HorizontalAlignment) args.NewValue;
                 }));
 
             VerticalContentAlignmentProperty.OverrideMetadata(typeof(VlcPlayer),
@@ -97,9 +96,7 @@ static VlcPlayer()
                     var @this = o as VlcPlayer;
 
                     if (@this.DisplayThreadDispatcher != null)
-                    {
-                        @this.Image.VerticalContentAlignment = (VerticalAlignment)args.NewValue;
-                    }
+                        @this.Image.VerticalContentAlignment = (VerticalAlignment) args.NewValue;
                 }));
         }
 
@@ -110,14 +107,8 @@ static VlcPlayer()
         /// </summary>
         public VlcPlayer()
         {
-            this.AddHandler(ThreadSeparatedControlHost.ThreadSeparatedControlLoadedEvent, new RoutedEventHandler(
-                (s, a) =>
-                {
-                    if (ThreadSeparatedImageLoaded != null)
-                    {
-                        ThreadSeparatedImageLoaded(this, new EventArgs());
-                    }
-                }));
+            AddHandler(ThreadSeparatedControlHost.ThreadSeparatedControlLoadedEvent, new RoutedEventHandler(
+                (s, a) => { ThreadSeparatedImageLoaded?.Invoke(this, new EventArgs()); }));
         }
 
         /// <summary>
@@ -129,13 +120,9 @@ public VlcPlayer()
         public VlcPlayer(bool displayWithThreadSeparatedImage) : this()
         {
             if (displayWithThreadSeparatedImage)
-            {
                 _customDisplayThreadDispatcher = ThreadSeparatedImage.CommonDispatcher;
-            }
             else
-            {
                 _customDisplayThreadDispatcher = Application.Current.Dispatcher;
-            }
         }
 
         /// <summary>
@@ -162,25 +149,19 @@ protected override void OnInitialized(EventArgs e)
             var libVlcOption = VlcOption;
 
             if (LibVlcPath != null)
-            {
                 libVlcPath = Path.IsPathRooted(LibVlcPath)
                     ? LibVlcPath
                     : Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName)
                         .CombinePath(LibVlcPath);
-            }
 
             if (!designMode)
             {
                 if (libVlcPath != null)
                 {
                     if (libVlcOption == null)
-                    {
                         Initialize(libVlcPath);
-                    }
                     else
-                    {
                         Initialize(libVlcPath, libVlcOption.ToArray());
-                    }
                 }
                 else
                 {
@@ -193,13 +174,11 @@ protected override void OnInitialized(EventArgs e)
                         var vlcSettingsAttribute = vlcSettings[0] as VlcSettingsAttribute;
 
                         if (vlcSettingsAttribute != null && vlcSettingsAttribute.LibVlcPath != null)
-                        {
                             libVlcPath = Path.IsPathRooted(vlcSettingsAttribute.LibVlcPath)
                                 ? vlcSettingsAttribute.LibVlcPath
                                 : Path.GetDirectoryName(
-                                    Process.GetCurrentProcess().MainModule.FileName)
+                                        Process.GetCurrentProcess().MainModule.FileName)
                                     .CombinePath(vlcSettingsAttribute.LibVlcPath);
-                        }
 
                         if (vlcSettingsAttribute != null && vlcSettingsAttribute.VlcOption != null)
                             libVlcOption = vlcSettingsAttribute.VlcOption;
@@ -238,15 +217,9 @@ public void Initialize(string libVlcPath)
         /// <param name="libVlcOption"></param>
         public void Initialize(string libVlcPath, params string[] libVlcOption)
         {
-            if (!ApiManager.IsInitialized)
-            {
-                ApiManager.Initialize(libVlcPath, libVlcOption);
-            }
+            if (!ApiManager.IsInitialized) ApiManager.Initialize(libVlcPath, libVlcOption);
 
-            if (VlcMediaPlayer != null)
-            {
-                throw new InvalidOperationException("VlcPlayer is been initialized.");
-            }
+            if (VlcMediaPlayer != null) throw new InvalidOperationException("VlcPlayer is been initialized.");
 
             switch (CreateMode)
             {
@@ -261,7 +234,7 @@ public void Initialize(string libVlcPath, params string[] libVlcOption)
                     break;
             }
 
-            VlcMediaPlayer player = Vlc.CreateMediaPlayer();
+            var player = Vlc.CreateMediaPlayer();
 
             _lockCallback = VideoLockCallback;
             _unlockCallback = VideoUnlockCallback;
@@ -291,10 +264,7 @@ public void Initialize(string libVlcPath, params string[] libVlcOption)
             //_audioDrainCallbackHandle = GCHandle.Alloc(_audioDrainCallback);
             //_audioSetVolumeCallbackHandle = GCHandle.Alloc(_audioSetVolumeCallback);
 
-            if (player == null)
-            {
-                throw new Exception("Vlc media player initialize fail.");
-            }
+            if (player == null) throw new Exception("Vlc media player initialize fail.");
 
             AttachPlayer(player);
         }
@@ -332,12 +302,12 @@ private void AttachPlayer(VlcMediaPlayer mediaPlayer)
         {
             if (VlcMediaPlayer != null)
             {
+                VlcMediaPlayer.MediaStateChanged -= VlcMediaPlayerMediaStateChanged;
                 VlcMediaPlayer.PositionChanged -= VlcMediaPlayerPositionChanged;
                 VlcMediaPlayer.TimeChanged -= VlcMediaPlayerTimeChanged;
-                VlcMediaPlayer.EndReached -= VlcMediaPlayerEndReached;
                 VlcMediaPlayer.SeekableChanged -= VlcMediaPlayerSeekableChanged;
                 VlcMediaPlayer.LengthChanged -= VlcMediaPlayerLengthChanged;
-                VlcMediaPlayer.MediaChanged -= VlcMediaPlayerMediaChanged;
+                VlcMediaPlayer.PausableChanged -= VlcMediaPlayerPausableChanged;
 
                 VlcMediaPlayer.SetVideoDecodeCallback(null, null, null, IntPtr.Zero);
                 VlcMediaPlayer.SetVideoFormatCallback(null, null);
@@ -352,12 +322,12 @@ private void AttachPlayer(VlcMediaPlayer mediaPlayer)
 
             if (VlcMediaPlayer != null)
             {
+                VlcMediaPlayer.MediaStateChanged += VlcMediaPlayerMediaStateChanged;
                 VlcMediaPlayer.PositionChanged += VlcMediaPlayerPositionChanged;
                 VlcMediaPlayer.TimeChanged += VlcMediaPlayerTimeChanged;
-                VlcMediaPlayer.EndReached += VlcMediaPlayerEndReached;
                 VlcMediaPlayer.SeekableChanged += VlcMediaPlayerSeekableChanged;
                 VlcMediaPlayer.LengthChanged += VlcMediaPlayerLengthChanged;
-                VlcMediaPlayer.MediaChanged += VlcMediaPlayerMediaChanged;
+                VlcMediaPlayer.PausableChanged += VlcMediaPlayerPausableChanged;
 
                 VlcMediaPlayer.SetVideoDecodeCallback(_lockCallback, _unlockCallback, _displayCallback, IntPtr.Zero);
                 VlcMediaPlayer.SetVideoFormatCallback(_formatCallback, _cleanupCallback);
@@ -377,10 +347,7 @@ private void AttachPlayer(VlcMediaPlayer mediaPlayer)
         /// <param name="disposing"></param>
         protected void Dispose(bool disposing)
         {
-            if (_disposed || _disposing)
-            {
-                return;
-            }
+            if (_disposed || _disposing) return;
 
             _disposing = true;
 
@@ -388,11 +355,9 @@ protected void Dispose(bool disposing)
 
             if (VlcMediaPlayer != null)
             {
-                if (VlcMediaPlayer.Media != null)
-                {
-                    VlcMediaPlayer.Media.Dispose();
-                }
+                VlcMediaPlayer.Media?.Dispose();
                 VlcMediaPlayer.Dispose();
+                VlcMediaPlayer = null;
             }
 
             _lockCallbackHandle.Free();
@@ -452,21 +417,19 @@ public void LoadMedia(string path)
         {
             ThrowIfNotInitialize();
 
-            Uri uri;
-            if (Uri.TryCreate(path, UriKind.Absolute, out uri))
+            if (Uri.TryCreate(path, UriKind.Absolute, out var uri))
             {
                 LoadMedia(uri);
                 return;
             }
 
             if (!(File.Exists(path) || Path.GetFullPath(path).IsDriveRootDirectory()))
-                throw new FileNotFoundException(string.Format("Not found: {0}", path), path);
+                throw new FileNotFoundException($"Not found: {path}", path);
+
+            VlcMediaPlayer.Media?.Dispose();
 
-            if (VlcMediaPlayer.Media != null)
-                VlcMediaPlayer.Media.Dispose();
-            
             VlcMediaPlayer.Media = VlcMediaPlayer.VlcInstance.CreateMediaFromPath(path);
-            VlcMediaPlayer.Media.ParseAsync();
+            VlcMediaPlayer.Media.ParseWithOption(MediaParseOption.ParseLocal);
 
             _isDVD = VlcMediaPlayer.Media.Mrl.IsDriveRootDirectory();
         }
@@ -479,10 +442,10 @@ public void LoadMedia(Uri uri)
         {
             ThrowIfNotInitialize();
 
-            if (VlcMediaPlayer.Media != null) VlcMediaPlayer.Media.Dispose();
-            
+            VlcMediaPlayer.Media?.Dispose();
+
             VlcMediaPlayer.Media = VlcMediaPlayer.VlcInstance.CreateMediaFromLocation(uri.ToString());
-            VlcMediaPlayer.Media.ParseAsync();
+            VlcMediaPlayer.Media.ParseWithOption(MediaParseOption.ParseLocal | MediaParseOption.ParseNetwork);
 
             _isDVD = VlcMediaPlayer.Media.Mrl.IsDriveRootDirectory();
         }
@@ -497,14 +460,13 @@ public void LoadMediaWithOptions(string path, params string[] options)
             ThrowIfNotInitialize();
 
             if (!(File.Exists(path) || Path.GetFullPath(path).IsDriveRootDirectory()))
-                throw new FileNotFoundException(string.Format("Not found: {0}", path), path);
+                throw new FileNotFoundException($"Not found: {path}", path);
+
+            VlcMediaPlayer.Media?.Dispose();
 
-            if (VlcMediaPlayer.Media != null)
-                VlcMediaPlayer.Media.Dispose();
-            
             VlcMediaPlayer.Media = VlcMediaPlayer.VlcInstance.CreateMediaFromPath(path);
             VlcMediaPlayer.Media.AddOption(options);
-            VlcMediaPlayer.Media.ParseAsync();
+            VlcMediaPlayer.Media.ParseWithOption(MediaParseOption.ParseLocal);
 
             _isDVD = VlcMediaPlayer.Media.Mrl.IsDriveRootDirectory();
         }
@@ -518,12 +480,11 @@ public void LoadMediaWithOptions(Uri uri, params string[] options)
         {
             ThrowIfNotInitialize();
 
-            if (VlcMediaPlayer.Media != null)
-                VlcMediaPlayer.Media.Dispose();
-            
+            VlcMediaPlayer.Media?.Dispose();
+
             VlcMediaPlayer.Media = VlcMediaPlayer.VlcInstance.CreateMediaFromLocation(uri.ToString());
             VlcMediaPlayer.Media.AddOption(options);
-            VlcMediaPlayer.Media.ParseAsync();
+            VlcMediaPlayer.Media.ParseWithOption(MediaParseOption.ParseLocal | MediaParseOption.ParseNetwork);
 
             _isDVD = VlcMediaPlayer.Media.Mrl.IsDriveRootDirectory();
         }
@@ -539,10 +500,7 @@ public void Play()
         {
             ThrowIfNotInitialize();
 
-            if (_context != null)
-            {
-                VideoSource = _context.Image;
-            }
+            if (_context != null) VideoSource = _context.Image;
             VlcMediaPlayer.Play();
         }
 
@@ -711,7 +669,7 @@ public void TakeSnapshot(string file, int quality = 100)
         ///     Gets a list of potential audio output devices.
         /// </summary>
         /// <returns></returns>
-        public AudioDeviceList EnumAudioDeviceList()
+        public List<AudioDevice> EnumAudioDeviceList()
         {
             ThrowIfNotInitialize();
 
@@ -723,7 +681,7 @@ public AudioDeviceList EnumAudioDeviceList()
         /// </summary>
         /// <param name="audioOutput"></param>
         /// <returns></returns>
-        public AudioDeviceList GetAudioDeviceList(AudioOutput audioOutput)
+        public List<AudioDevice> GetAudioDeviceList(AudioOutput audioOutput)
         {
             ThrowIfNotInitialize();
 
@@ -734,7 +692,7 @@ public AudioDeviceList GetAudioDeviceList(AudioOutput audioOutput)
         ///     Gets the list of available audio output modules.
         /// </summary>
         /// <returns></returns>
-        public AudioOutputList GetAudioOutputList()
+        public List<AudioOutput> GetAudioOutputList()
         {
             ThrowIfNotInitialize();
 
@@ -801,19 +759,15 @@ protected virtual void OnPropertyChanged<T>(Expression<Func<T>> expr)
             var propName = propInfo.Name;
 
             var displayThreadDispatcher = DisplayThreadDispatcher;
-            if (displayThreadDispatcher != null)
-            {
-                displayThreadDispatcher.BeginInvoke(
-                    new Action(() =>
-                    {
-                        if (_disposing) return;
-                        if (_isStopping) return;
+            displayThreadDispatcher?.BeginInvoke(
+                new Action(() =>
+                {
+                    if (_disposing) return;
+                    if (_isStopping) return;
 
-                        var onPropertyChanged = PropertyChanged;
-                        if (onPropertyChanged != null)
-                            onPropertyChanged(this, new PropertyChangedEventArgs(propName));
-                    }));
-            }
+                    var onPropertyChanged = PropertyChanged;
+                    onPropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propName));
+                }));
         }
 
         #endregion --- NotifyPropertyChanged ---
diff --git a/Meta.Vlc.sln b/Meta.Vlc.sln
index 12d120b..d14fe0a 100644
--- a/Meta.Vlc.sln
+++ b/Meta.Vlc.sln
@@ -1,13 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2046
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Meta.Vlc - .Net 2.0", "Meta.Vlc\Meta.Vlc - .Net 2.0.csproj", "{966C7E4A-C5BE-411C-B822-A17E9FCA0B69}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Meta.Vlc - .Net 3.0", "Meta.Vlc\Meta.Vlc - .Net 3.0.csproj", "{0B31FAEE-5591-402F-B8EA-3358174BF594}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Meta.Vlc - .Net 3.5", "Meta.Vlc\Meta.Vlc - .Net 3.5.csproj", "{6F34CA47-D818-42B2-9C41-2FADEB7024CF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Meta.Vlc - .Net 3.5", "Meta.Vlc\Meta.Vlc - .Net 3.5.csproj", "{966C7E4A-C5BE-411C-B822-A17E9FCA0B69}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Meta.Vlc - .Net 4.0", "Meta.Vlc\Meta.Vlc - .Net 4.0.csproj", "{9368132D-33F8-4149-8733-3BF90715F887}"
 EndProject
@@ -93,30 +89,6 @@ Global
 		{966C7E4A-C5BE-411C-B822-A17E9FCA0B69}.Release|x64.Build.0 = Release|x64
 		{966C7E4A-C5BE-411C-B822-A17E9FCA0B69}.Release|x86.ActiveCfg = Release|x86
 		{966C7E4A-C5BE-411C-B822-A17E9FCA0B69}.Release|x86.Build.0 = Release|x86
-		{0B31FAEE-5591-402F-B8EA-3358174BF594}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B31FAEE-5591-402F-B8EA-3358174BF594}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B31FAEE-5591-402F-B8EA-3358174BF594}.Debug|x64.ActiveCfg = Debug|x64
-		{0B31FAEE-5591-402F-B8EA-3358174BF594}.Debug|x64.Build.0 = Debug|x64
-		{0B31FAEE-5591-402F-B8EA-3358174BF594}.Debug|x86.ActiveCfg = Debug|x86
-		{0B31FAEE-5591-402F-B8EA-3358174BF594}.Debug|x86.Build.0 = Debug|x86
-		{0B31FAEE-5591-402F-B8EA-3358174BF594}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0B31FAEE-5591-402F-B8EA-3358174BF594}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0B31FAEE-5591-402F-B8EA-3358174BF594}.Release|x64.ActiveCfg = Release|x64
-		{0B31FAEE-5591-402F-B8EA-3358174BF594}.Release|x64.Build.0 = Release|x64
-		{0B31FAEE-5591-402F-B8EA-3358174BF594}.Release|x86.ActiveCfg = Release|x86
-		{0B31FAEE-5591-402F-B8EA-3358174BF594}.Release|x86.Build.0 = Release|x86
-		{6F34CA47-D818-42B2-9C41-2FADEB7024CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F34CA47-D818-42B2-9C41-2FADEB7024CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F34CA47-D818-42B2-9C41-2FADEB7024CF}.Debug|x64.ActiveCfg = Debug|x64
-		{6F34CA47-D818-42B2-9C41-2FADEB7024CF}.Debug|x64.Build.0 = Debug|x64
-		{6F34CA47-D818-42B2-9C41-2FADEB7024CF}.Debug|x86.ActiveCfg = Debug|x86
-		{6F34CA47-D818-42B2-9C41-2FADEB7024CF}.Debug|x86.Build.0 = Debug|x86
-		{6F34CA47-D818-42B2-9C41-2FADEB7024CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F34CA47-D818-42B2-9C41-2FADEB7024CF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F34CA47-D818-42B2-9C41-2FADEB7024CF}.Release|x64.ActiveCfg = Release|x64
-		{6F34CA47-D818-42B2-9C41-2FADEB7024CF}.Release|x64.Build.0 = Release|x64
-		{6F34CA47-D818-42B2-9C41-2FADEB7024CF}.Release|x86.ActiveCfg = Release|x86
-		{6F34CA47-D818-42B2-9C41-2FADEB7024CF}.Release|x86.Build.0 = Release|x86
 		{9368132D-33F8-4149-8733-3BF90715F887}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9368132D-33F8-4149-8733-3BF90715F887}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9368132D-33F8-4149-8733-3BF90715F887}.Debug|x64.ActiveCfg = Debug|x64
@@ -219,8 +191,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{966C7E4A-C5BE-411C-B822-A17E9FCA0B69} = {C65FB565-E565-4AAB-A1A9-2868B9C650EF}
-		{0B31FAEE-5591-402F-B8EA-3358174BF594} = {C65FB565-E565-4AAB-A1A9-2868B9C650EF}
-		{6F34CA47-D818-42B2-9C41-2FADEB7024CF} = {C65FB565-E565-4AAB-A1A9-2868B9C650EF}
 		{9368132D-33F8-4149-8733-3BF90715F887} = {C65FB565-E565-4AAB-A1A9-2868B9C650EF}
 		{174900EB-956F-4435-87F2-677F014DD5DB} = {C65FB565-E565-4AAB-A1A9-2868B9C650EF}
 		{F4026089-4DBE-4C6E-B3FD-9153A5925FEB} = {4087973B-E53B-4C99-9797-E7B3B2B8FE5E}
@@ -236,4 +206,7 @@ Global
 		{F187CDF1-24B3-41E2-AD62-57CB67AB1037} = {9E0C4C85-FFFE-4C76-8FA2-13CD1D3A1E2D}
 		{CBF6B603-6440-4DD8-93BA-9B489AF23BCD} = {F187CDF1-24B3-41E2-AD62-57CB67AB1037}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {2FD4719A-9873-4DE6-AADF-954A9B1F03CD}
+	EndGlobalSection
 EndGlobal
diff --git a/Meta.Vlc/AudioDevice.cs b/Meta.Vlc/AudioDevice.cs
index b3ce294..2790b36 100644
--- a/Meta.Vlc/AudioDevice.cs
+++ b/Meta.Vlc/AudioDevice.cs
@@ -1,94 +1,56 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: AudioDevice.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
+using Meta.Vlc.Interop.MediaPlayer;
+using Meta.Vlc.Interop.MediaPlayer.Audio;
 
 namespace Meta.Vlc
 {
     /// <summary>
-    ///     A warpper for <see cref="Interop.MediaPlayer.AudioDevice" /> struct.
+    ///     A wrapper for <see cref="libvlc_audio_output_device_t" /> struct.
     /// </summary>
-    public class AudioDevice
+    public unsafe class AudioDevice
     {
-        internal IntPtr _pointer;
-
-        internal Interop.MediaPlayer.AudioDevice _struct;
-
-        internal AudioDevice(IntPtr pointer)
+        internal AudioDevice(libvlc_audio_output_device_t* pointer)
         {
-            _pointer = pointer;
-            if (pointer != IntPtr.Zero)
-            {
-                _struct =
-                    (Interop.MediaPlayer.AudioDevice)
-                        Marshal.PtrToStructure(pointer, typeof (Interop.MediaPlayer.AudioDevice));
-                Device = InteropHelper.PtrToString(_struct.Device);
-                Description = InteropHelper.PtrToString(_struct.Description);
-            }
+            if (pointer == null) return;
+
+            Device = InteropHelper.PtrToString(pointer->psz_device);
+            Description = InteropHelper.PtrToString(pointer->psz_description);
         }
 
-        public String Device { get; private set; }
+        public string Device { get; }
 
-        public String Description { get; private set; }
+        public string Description { get; }
     }
 
     /// <summary>
-    ///     A list warpper for <see cref="Interop.MediaPlayer.AudioDevice" /> linklist struct.
+    ///     A list wrapper for <see cref="libvlc_audio_output_device_t" /> linked list struct.
     /// </summary>
-    public class AudioDeviceList : IDisposable, IEnumerable<AudioDevice>, IEnumerable
+    public unsafe class AudioDeviceList : VlcUnmanagedLinkedList<AudioDevice>
     {
-        private List<AudioDevice> _list;
-        private IntPtr _pointer;
-
-        /// <summary>
-        ///     Create a readonly list by a pointer of <see cref="Interop.MediaPlayer.AudioDevice" />.
-        /// </summary>
-        /// <param name="pointer"></param>
-        public AudioDeviceList(IntPtr pointer)
+        public AudioDeviceList(void* pointer) : base(pointer)
         {
-            _list = new List<AudioDevice>();
-            _pointer = pointer;
-
-            while (pointer != IntPtr.Zero)
-            {
-                var AudioDevice = new AudioDevice(pointer);
-                _list.Add(AudioDevice);
-
-                pointer = AudioDevice._struct.Next;
-            }
         }
 
-        public int Count
+        protected override AudioDevice CreateItem(void* data)
         {
-            get { return _list.Count; }
-        }
-
-        public AudioDevice this[int index]
-        {
-            get { return _list[index]; }
-        }
-
-        public void Dispose()
-        {
-            if (_pointer == IntPtr.Zero) return;
-
-            LibVlcManager.ReleaseAudioDeviceList(_pointer);
-            _pointer = IntPtr.Zero;
-            _list.Clear();
+            return new AudioDevice((libvlc_audio_output_device_t*) data);
         }
 
-        public IEnumerator<AudioDevice> GetEnumerator()
+        protected override void* NextItem(void* data)
         {
-            return _list.GetEnumerator();
+            return ((libvlc_audio_output_device_t*) data)->p_next;
         }
 
-        IEnumerator IEnumerable.GetEnumerator()
+        protected override void Release(void* data)
         {
-            return GetEnumerator();
+            LibVlcManager.GetFunctionDelegate<libvlc_audio_output_device_list_release>()
+                .Invoke((libvlc_audio_output_device_t*) data);
         }
     }
 }
\ No newline at end of file
diff --git a/Meta.Vlc/AudioEqualizer.cs b/Meta.Vlc/AudioEqualizer.cs
index 2174098..32e07a8 100644
--- a/Meta.Vlc/AudioEqualizer.cs
+++ b/Meta.Vlc/AudioEqualizer.cs
@@ -1,24 +1,29 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: AudioEqualizer.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
-using Meta.Vlc.Interop;
-using Meta.Vlc.Interop.MediaPlayer;
+using Meta.Vlc.Interop.MediaPlayer.Audio;
 
 namespace Meta.Vlc
 {
     /// <summary>
     ///     Audio equalizer of VLC player.
     /// </summary>
-    public class AudioEqualizer : IVlcObject, IEnumerable<float>, INotifyPropertyChanged
+    public unsafe class AudioEqualizer : IUnmanagedObject, IEnumerable<float>, INotifyPropertyChanged
     {
+        #region --- Fields ---
+
+        private bool _disposed;
+
+        #endregion --- Fields ---
+
         private class AudioEqualizerEnumerator : IEnumerator<float>
         {
-            private AudioEqualizer _audioEqualizer;
+            private readonly AudioEqualizer _audioEqualizer;
             private int _index = -1;
 
             public AudioEqualizerEnumerator(AudioEqualizer equalizer)
@@ -37,6 +42,7 @@ public bool MoveNext()
                     _index++;
                     return true;
                 }
+
                 return false;
             }
 
@@ -45,39 +51,11 @@ public void Reset()
                 _index = -1;
             }
 
-            public float Current
-            {
-                get { return _audioEqualizer[(uint) _index]; }
-            }
+            public float Current => _audioEqualizer[(uint) _index];
 
-            object IEnumerator.Current
-            {
-                get { return Current; }
-            }
+            object IEnumerator.Current => Current;
         }
 
-        #region --- Fields ---
-
-        private bool _disposed;
-
-        #region LibVlcFunctions
-
-        private static LibVlcFunction<CreateEqualizer> _createEqualizerFunction;
-        private static LibVlcFunction<CreateEqualizerFromPreset> _createEqualizerFromPresetFunction;
-        private static LibVlcFunction<ReleaseEqualizer> _releaseEqualizerFunction;
-        private static LibVlcFunction<GetEqualizerPresetCount> _getEqualizerPresetCountFunction;
-        private static LibVlcFunction<GetEqualizerPresetName> _getEqualizerPresetNameFunction;
-        private static LibVlcFunction<GetEqualizerBandCount> _getEqualizerBandCountFunction;
-        private static LibVlcFunction<GetEqualizerBandFrequency> _getEqualizerBandFrequencyFunction;
-        private static LibVlcFunction<SetEqualizerPreamp> _setEqualizerPreampFunction;
-        private static LibVlcFunction<GetEqualizerPreamp> _getEqualizerPreampFunction;
-        private static LibVlcFunction<SetEqualizerAmplification> _setEqualizerAmplificationFunction;
-        private static LibVlcFunction<GetEqualizerAmplification> _getEqualizerAmplificationFunction;
-
-        #endregion LibVlcFunctions
-
-        #endregion --- Fields ---
-
         #region --- Initialization ---
 
         /// <summary>
@@ -85,8 +63,7 @@ object IEnumerator.Current
         /// </summary>
         public AudioEqualizer()
         {
-            InstancePointer = _createEqualizerFunction.Delegate();
-            HandleManager.Add(this);
+            InstancePointer = LibVlcManager.GetFunctionDelegate<libvlc_audio_equalizer_new>().Invoke();
         }
 
         /// <summary>
@@ -103,8 +80,7 @@ public AudioEqualizer(PresetAudioEqualizerType type) : this((uint) type)
         /// <param name="index"></param>
         public AudioEqualizer(uint index)
         {
-            InstancePointer = _createEqualizerFromPresetFunction.Delegate(index);
-            HandleManager.Add(this);
+            InstancePointer = LibVlcManager.GetFunctionDelegate<libvlc_audio_equalizer_new_from_preset>().Invoke(index);
         }
 
         #endregion --- Initialization ---
@@ -116,11 +92,8 @@ protected void Dispose(bool disposing)
             if (_disposed)
                 return;
 
-            HandleManager.Remove(this);
-
-            _releaseEqualizerFunction.Delegate(InstancePointer);
-
-            InstancePointer = IntPtr.Zero;
+            LibVlcManager.GetFunctionDelegate<libvlc_audio_equalizer_release>().Invoke(InstancePointer);
+            InstancePointer = null;
 
             _disposed = true;
         }
@@ -142,39 +115,27 @@ public void Dispose()
         /// <summary>
         ///     Get the number of equalizer presets.
         /// </summary>
-        public static uint PresetEqualizerCount
-        {
-            get { return _getEqualizerPresetCountFunction.Delegate(); }
-        }
+        public static uint PresetEqualizerCount =>
+            LibVlcManager.GetFunctionDelegate<libvlc_audio_equalizer_get_preset_count>().Invoke();
 
         /// <summary>
         ///     Get the number of distinct frequency bands for an equalizer.
         /// </summary>
-        public static uint EqualizerBandCount
-        {
-            get { return _getEqualizerBandCountFunction.Delegate(); }
-        }
+        public static uint EqualizerBandCount =>
+            LibVlcManager.GetFunctionDelegate<libvlc_audio_equalizer_get_band_count>().Invoke();
 
-        public IntPtr InstancePointer { get; private set; }
-
-        /// <summary>
-        ///     Aways return <see cref="null" />.
-        /// </summary>
-        public Vlc VlcInstance
-        {
-            get { return null; }
-        }
+        public void* InstancePointer { get; private set; }
 
         /// <summary>
         ///     Get or set the current pre-amplification value from an equalizer.
         /// </summary>
         public float Preamp
         {
-            get { return _getEqualizerPreampFunction.Delegate(InstancePointer); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_audio_equalizer_get_preamp>().Invoke(InstancePointer);
             set
             {
-                OnPropertyChanged("Preamp");
-                _setEqualizerPreampFunction.Delegate(InstancePointer, value);
+                OnPropertyChanged(nameof(Preamp));
+                LibVlcManager.GetFunctionDelegate<libvlc_audio_equalizer_set_preamp>().Invoke(InstancePointer, value);
             }
         }
 
@@ -188,20 +149,19 @@ public float this[uint band]
             get
             {
                 if (band >= EqualizerBandCount)
-                {
                     throw new IndexOutOfRangeException("Band index should less than AudioEqualizer.EqualizerBandCount");
-                }
-                return _getEqualizerAmplificationFunction.Delegate(InstancePointer, band);
+
+                return LibVlcManager.GetFunctionDelegate<libvlc_audio_equalizer_get_amp_at_index>()
+                    .Invoke(InstancePointer, band);
             }
             set
             {
                 if (band >= EqualizerBandCount)
-                {
                     throw new IndexOutOfRangeException("Band index should less than AudioEqualizer.EqualizerBandCount");
-                }
 
                 OnPropertyChanged(null);
-                _setEqualizerAmplificationFunction.Delegate(InstancePointer, value, band);
+                LibVlcManager.GetFunctionDelegate<libvlc_audio_equalizer_set_amp_at_index>()
+                    .Invoke(InstancePointer, value, band);
             }
         }
 
@@ -209,33 +169,15 @@ public float this[uint band]
 
         #region --- Methods ---
 
-        internal static void LoadLibVlc()
-        {
-            if (IsLibLoaded) return;
-
-            _createEqualizerFunction = new LibVlcFunction<CreateEqualizer>();
-            _createEqualizerFromPresetFunction = new LibVlcFunction<CreateEqualizerFromPreset>();
-            _releaseEqualizerFunction = new LibVlcFunction<ReleaseEqualizer>();
-            _getEqualizerPresetCountFunction = new LibVlcFunction<GetEqualizerPresetCount>();
-            _getEqualizerPresetNameFunction = new LibVlcFunction<GetEqualizerPresetName>();
-            _getEqualizerBandCountFunction = new LibVlcFunction<GetEqualizerBandCount>();
-            _getEqualizerBandFrequencyFunction = new LibVlcFunction<GetEqualizerBandFrequency>();
-            _setEqualizerPreampFunction = new LibVlcFunction<SetEqualizerPreamp>();
-            _getEqualizerPreampFunction = new LibVlcFunction<GetEqualizerPreamp>();
-            _setEqualizerAmplificationFunction = new LibVlcFunction<SetEqualizerAmplification>();
-            _getEqualizerAmplificationFunction = new LibVlcFunction<GetEqualizerAmplification>();
-
-            IsLibLoaded = true;
-        }
-
         /// <summary>
         ///     Get the name of a particular equalizer preset.
         /// </summary>
         /// <param name="index"></param>
         /// <returns></returns>
-        public static String GetPresetEqualizerName(uint index)
+        public static string GetPresetEqualizerName(uint index)
         {
-            return InteropHelper.PtrToString(_getEqualizerPresetNameFunction.Delegate(index));
+            return InteropHelper.PtrToString(LibVlcManager.GetFunctionDelegate<libvlc_audio_equalizer_get_preset_name>()
+                .Invoke(index));
         }
 
         /// <summary>
@@ -245,7 +187,7 @@ public static String GetPresetEqualizerName(uint index)
         /// <returns></returns>
         public static float GetEqualizerBandFrequency(uint index)
         {
-            return _getEqualizerBandFrequencyFunction.Delegate(index);
+            return LibVlcManager.GetFunctionDelegate<libvlc_audio_equalizer_get_band_frequency>().Invoke(index);
         }
 
         public IEnumerator<float> GetEnumerator()
@@ -262,12 +204,9 @@ IEnumerator IEnumerable.GetEnumerator()
 
         public event PropertyChangedEventHandler PropertyChanged;
 
-        protected virtual void OnPropertyChanged(String propertyName)
+        protected virtual void OnPropertyChanged(string propertyName)
         {
-            if (PropertyChanged != null)
-            {
-                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-            }
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
         #endregion --- NotifyPropertyChanged ---
diff --git a/Meta.Vlc/AudioOutput.cs b/Meta.Vlc/AudioOutput.cs
index 3ab4795..bddb04a 100644
--- a/Meta.Vlc/AudioOutput.cs
+++ b/Meta.Vlc/AudioOutput.cs
@@ -1,94 +1,55 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: AudioOutput.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
+using Meta.Vlc.Interop.MediaPlayer;
+using Meta.Vlc.Interop.MediaPlayer.Audio;
 
 namespace Meta.Vlc
 {
     /// <summary>
-    ///     A warpper for <see cref="Interop.MediaPlayer.AudioOutput" /> struct.
+    ///     A wrapper for <see cref="libvlc_audio_output_t" /> struct.
     /// </summary>
-    public class AudioOutput
+    public unsafe class AudioOutput
     {
-        internal IntPtr _pointer;
-
-        internal Interop.MediaPlayer.AudioOutput _struct;
-
-        internal AudioOutput(IntPtr pointer)
+        internal AudioOutput(libvlc_audio_output_t* pointer)
         {
-            _pointer = pointer;
-            if (pointer != IntPtr.Zero)
-            {
-                _struct =
-                    (Interop.MediaPlayer.AudioOutput)
-                        Marshal.PtrToStructure(pointer, typeof (Interop.MediaPlayer.AudioOutput));
-                Name = InteropHelper.PtrToString(_struct.Name);
-                Description = InteropHelper.PtrToString(_struct.Description);
-            }
+            if (pointer == null) return;
+
+            Name = InteropHelper.PtrToString(pointer->psz_name);
+            Description = InteropHelper.PtrToString(pointer->psz_description);
         }
 
-        public String Name { get; private set; }
+        public string Name { get; }
 
-        public String Description { get; private set; }
+        public string Description { get; }
     }
 
     /// <summary>
-    ///     A list warpper for <see cref="Interop.MediaPlayer.AudioOutput" /> linklist struct.
+    ///     A list wrapper for <see cref="AudioOutput" /> linked list struct.
     /// </summary>
-    public class AudioOutputList : IDisposable, IEnumerable<AudioOutput>, IEnumerable
+    public unsafe class AudioOutputList : VlcUnmanagedLinkedList<AudioOutput>
     {
-        private List<AudioOutput> _list;
-        private IntPtr _pointer;
-
-        /// <summary>
-        ///     Create a readonly list by a pointer of <see cref="Interop.MediaPlayer.AudioOutput" />.
-        /// </summary>
-        /// <param name="pointer"></param>
-        public AudioOutputList(IntPtr pointer)
+        public AudioOutputList(void* pointer) : base(pointer)
         {
-            _list = new List<AudioOutput>();
-            _pointer = pointer;
-
-            while (pointer != IntPtr.Zero)
-            {
-                var audioOutput = new AudioOutput(pointer);
-                _list.Add(audioOutput);
-
-                pointer = audioOutput._struct.Next;
-            }
         }
 
-        public int Count
+        protected override AudioOutput CreateItem(void* data)
         {
-            get { return _list.Count; }
-        }
-
-        public AudioOutput this[int index]
-        {
-            get { return _list[index]; }
-        }
-
-        public void Dispose()
-        {
-            if (_pointer == IntPtr.Zero) return;
-
-            LibVlcManager.ReleaseAudioOutputList(_pointer);
-            _pointer = IntPtr.Zero;
-            _list.Clear();
+            return new AudioOutput((libvlc_audio_output_t*) data);
         }
 
-        public IEnumerator<AudioOutput> GetEnumerator()
+        protected override void* NextItem(void* data)
         {
-            return _list.GetEnumerator();
+            return ((libvlc_audio_output_t*) data)->p_next;
         }
 
-        IEnumerator IEnumerable.GetEnumerator()
+        protected override void Release(void* data)
         {
-            return GetEnumerator();
+            LibVlcManager.GetFunctionDelegate<libvlc_audio_output_list_release>().Invoke((libvlc_audio_output_t*) data);
         }
     }
 }
\ No newline at end of file
diff --git a/Meta.Vlc/AudioOutputChannel.cs b/Meta.Vlc/AudioOutputChannel.cs
new file mode 100644
index 0000000..32a970f
--- /dev/null
+++ b/Meta.Vlc/AudioOutputChannel.cs
@@ -0,0 +1,21 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: AudioOutputChannel.cs
+// Version: 20181231
+
+using Meta.Vlc.Interop.MediaPlayer.Audio;
+
+namespace Meta.Vlc
+{
+    /// <summary>
+    ///     Audio channels
+    /// </summary>
+    public enum AudioOutputChannel
+    {
+        Error = libvlc_audio_output_channel_t.libvlc_AudioChannel_Error,
+        Stereo = libvlc_audio_output_channel_t.libvlc_AudioChannel_Stereo,
+        RStereo = libvlc_audio_output_channel_t.libvlc_AudioChannel_RStereo,
+        Left = libvlc_audio_output_channel_t.libvlc_AudioChannel_Left,
+        Right = libvlc_audio_output_channel_t.libvlc_AudioChannel_Right,
+        Dolbys = libvlc_audio_output_channel_t.libvlc_AudioChannel_Dolbys
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Event/MediaDurationChangedEventArgs.cs b/Meta.Vlc/Event/MediaDurationChangedEventArgs.cs
new file mode 100644
index 0000000..c441c8c
--- /dev/null
+++ b/Meta.Vlc/Event/MediaDurationChangedEventArgs.cs
@@ -0,0 +1,18 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: MediaDurationChangedEventArgs.cs
+// Version: 20181231
+
+using System;
+
+namespace Meta.Vlc.Event
+{
+    public class MediaDurationChangedEventArgs : EventArgs
+    {
+        public MediaDurationChangedEventArgs(long duration)
+        {
+            Duration = duration;
+        }
+
+        public long Duration { get; }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Event/MediaFreedEventArgs.cs b/Meta.Vlc/Event/MediaFreedEventArgs.cs
new file mode 100644
index 0000000..1903092
--- /dev/null
+++ b/Meta.Vlc/Event/MediaFreedEventArgs.cs
@@ -0,0 +1,18 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: MediaFreedEventArgs.cs
+// Version: 20181231
+
+using System;
+
+namespace Meta.Vlc.Event
+{
+    public class MediaFreedEventArgs : EventArgs
+    {
+        public MediaFreedEventArgs(IntPtr media)
+        {
+            Media = media;
+        }
+
+        public IntPtr Media { get; }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Event/MediaMetaChangedEventArgs.cs b/Meta.Vlc/Event/MediaMetaChangedEventArgs.cs
new file mode 100644
index 0000000..0f3751e
--- /dev/null
+++ b/Meta.Vlc/Event/MediaMetaChangedEventArgs.cs
@@ -0,0 +1,18 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: MediaMetaChangedEventArgs.cs
+// Version: 20181231
+
+using System;
+
+namespace Meta.Vlc.Event
+{
+    public class MediaMetaChangedEventArgs : EventArgs
+    {
+        public MediaMetaChangedEventArgs(MediaMetaType type)
+        {
+            Type = type;
+        }
+
+        public MediaMetaType Type { get; }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Event/MediaParsedStatusChangedEventArgs.cs b/Meta.Vlc/Event/MediaParsedStatusChangedEventArgs.cs
new file mode 100644
index 0000000..fc36b20
--- /dev/null
+++ b/Meta.Vlc/Event/MediaParsedStatusChangedEventArgs.cs
@@ -0,0 +1,18 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: MediaParsedStatusChangedEventArgs.cs
+// Version: 20181231
+
+using System;
+
+namespace Meta.Vlc.Event
+{
+    public class MediaParsedStatusChangedEventArgs : EventArgs
+    {
+        public MediaParsedStatusChangedEventArgs(MediaParsedStatus status)
+        {
+            Status = status;
+        }
+
+        public MediaParsedStatus Status { get; }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Event/MediaPlayerBufferingEventArgs.cs b/Meta.Vlc/Event/MediaPlayerBufferingEventArgs.cs
new file mode 100644
index 0000000..8720765
--- /dev/null
+++ b/Meta.Vlc/Event/MediaPlayerBufferingEventArgs.cs
@@ -0,0 +1,18 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: MediaPlayerBufferingEventArgs.cs
+// Version: 20181231
+
+using System;
+
+namespace Meta.Vlc.Event
+{
+    public class MediaPlayerBufferingEventArgs : EventArgs
+    {
+        public MediaPlayerBufferingEventArgs(float newCache)
+        {
+            NewCache = newCache;
+        }
+
+        public float NewCache { get; }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Event/MediaPlayerValueChangedEventArgs.cs b/Meta.Vlc/Event/MediaPlayerValueChangedEventArgs.cs
new file mode 100644
index 0000000..ab691aa
--- /dev/null
+++ b/Meta.Vlc/Event/MediaPlayerValueChangedEventArgs.cs
@@ -0,0 +1,18 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: MediaPlayerValueChangedEventArgs.cs
+// Version: 20181231
+
+using System;
+
+namespace Meta.Vlc.Event
+{
+    public class MediaPlayerValueChangedEventArgs<T> : EventArgs
+    {
+        public MediaPlayerValueChangedEventArgs(T newValue)
+        {
+            NewValue = newValue;
+        }
+
+        public T NewValue { get; }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Event/MediaStateChangedEventArgs.cs b/Meta.Vlc/Event/MediaStateChangedEventArgs.cs
new file mode 100644
index 0000000..fae4015
--- /dev/null
+++ b/Meta.Vlc/Event/MediaStateChangedEventArgs.cs
@@ -0,0 +1,18 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: MediaStateChangedEventArgs.cs
+// Version: 20181231
+
+using System;
+
+namespace Meta.Vlc.Event
+{
+    public class MediaStateChangedEventArgs : EventArgs
+    {
+        public MediaStateChangedEventArgs(MediaState state)
+        {
+            State = state;
+        }
+
+        public MediaState State { get; }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Event/MediaSubItemAddedEventArgs.cs b/Meta.Vlc/Event/MediaSubItemAddedEventArgs.cs
new file mode 100644
index 0000000..ad8f67e
--- /dev/null
+++ b/Meta.Vlc/Event/MediaSubItemAddedEventArgs.cs
@@ -0,0 +1,18 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: MediaSubItemAddedEventArgs.cs
+// Version: 20181231
+
+using System;
+
+namespace Meta.Vlc.Event
+{
+    public class MediaSubItemAddedEventArgs : EventArgs
+    {
+        public MediaSubItemAddedEventArgs(IntPtr newChild)
+        {
+            NewChild = newChild;
+        }
+
+        public IntPtr NewChild { get; }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Event/ObjectEventArgs.cs b/Meta.Vlc/Event/ObjectEventArgs.cs
new file mode 100644
index 0000000..e125977
--- /dev/null
+++ b/Meta.Vlc/Event/ObjectEventArgs.cs
@@ -0,0 +1,22 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: ObjectEventArgs.cs
+// Version: 20181231
+
+using System;
+
+namespace Meta.Vlc.Event
+{
+    public class ObjectEventArgs<T> : EventArgs
+    {
+        public ObjectEventArgs()
+        {
+        }
+
+        public ObjectEventArgs(T value)
+        {
+            Value = value;
+        }
+
+        public T Value { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/EventType.cs b/Meta.Vlc/EventType.cs
new file mode 100644
index 0000000..f10c69c
--- /dev/null
+++ b/Meta.Vlc/EventType.cs
@@ -0,0 +1,185 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: EventType.cs
+// Version: 20181231
+
+using Meta.Vlc.Interop.Core.Event;
+using Meta.Vlc.Interop.Media;
+
+namespace Meta.Vlc
+{
+    public enum EventType
+    {
+        /// <summary>
+        ///     Metadata of a <see cref="VlcMedia" /> changed
+        /// </summary>
+        MediaMetaChanged = libvlc_event_e.libvlc_MediaMetaChanged,
+
+        /// <summary>
+        ///     Subitem was added to a <see cref="VlcMedia" />
+        /// </summary>
+        /// <seealso cref="VlcMedia.Subitems" />
+        MediaSubItemAdded = libvlc_event_e.libvlc_MediaSubItemAdded,
+
+        /// <summary>
+        ///     Duration of a <see cref="VlcMedia" /> changed
+        /// </summary>
+        /// <seealso cref="VlcMedia.Duration" />
+        MediaDurationChanged = libvlc_event_e.libvlc_MediaDurationChanged,
+
+        /// <summary>
+        ///     Parsing state of a <see cref="VlcMedia" /> changed
+        /// </summary>
+        /// <seealso cref="VlcMedia.ParseWithOptionAsync" />
+        /// <seealso cref="VlcMedia.ParseStatus" />
+        /// <seealso cref="VlcMedia.ParseStop" />
+        MediaParsedChanged = libvlc_event_e.libvlc_MediaParsedChanged,
+
+        /// <summary>
+        ///     A <see cref="VlcMedia" /> was freed
+        /// </summary>
+        MediaFreed = libvlc_event_e.libvlc_MediaFreed,
+
+        /// <summary>
+        ///     \link #libvlc_state_t State\endlink of the <see cref="VlcMedia" /> changed
+        /// </summary>
+        /// <seealso cref="libvlc_media_get_state" />
+        MediaStateChanged = libvlc_event_e.libvlc_MediaStateChanged,
+
+        /// <summary>
+        ///     Subitem tree was added to a <see cref="VlcMedia" />
+        /// </summary>
+        MediaSubItemTreeAdded = libvlc_event_e.libvlc_MediaSubItemTreeAdded,
+
+        MediaPlayerMediaChanged = libvlc_event_e.libvlc_MediaPlayerMediaChanged,
+        MediaPlayerNothingSpecial = libvlc_event_e.libvlc_MediaPlayerNothingSpecial,
+        MediaPlayerOpening = libvlc_event_e.libvlc_MediaPlayerOpening,
+        MediaPlayerBuffering = libvlc_event_e.libvlc_MediaPlayerBuffering,
+        MediaPlayerPlaying = libvlc_event_e.libvlc_MediaPlayerPlaying,
+        MediaPlayerPaused = libvlc_event_e.libvlc_MediaPlayerPaused,
+        MediaPlayerStopped = libvlc_event_e.libvlc_MediaPlayerStopped,
+        MediaPlayerForward = libvlc_event_e.libvlc_MediaPlayerForward,
+        MediaPlayerBackward = libvlc_event_e.libvlc_MediaPlayerBackward,
+        MediaPlayerEndReached = libvlc_event_e.libvlc_MediaPlayerEndReached,
+        MediaPlayerEncounteredError = libvlc_event_e.libvlc_MediaPlayerEncounteredError,
+        MediaPlayerTimeChanged = libvlc_event_e.libvlc_MediaPlayerTimeChanged,
+        MediaPlayerPositionChanged = libvlc_event_e.libvlc_MediaPlayerPositionChanged,
+        MediaPlayerSeekableChanged = libvlc_event_e.libvlc_MediaPlayerSeekableChanged,
+        MediaPlayerPausableChanged = libvlc_event_e.libvlc_MediaPlayerPausableChanged,
+        MediaPlayerTitleChanged = libvlc_event_e.libvlc_MediaPlayerTitleChanged,
+        MediaPlayerSnapshotTaken = libvlc_event_e.libvlc_MediaPlayerSnapshotTaken,
+        MediaPlayerLengthChanged = libvlc_event_e.libvlc_MediaPlayerLengthChanged,
+        MediaPlayerVout = libvlc_event_e.libvlc_MediaPlayerVout,
+        MediaPlayerScrambledChanged = libvlc_event_e.libvlc_MediaPlayerScrambledChanged,
+        MediaPlayerESAdded = libvlc_event_e.libvlc_MediaPlayerESAdded,
+        MediaPlayerESDeleted = libvlc_event_e.libvlc_MediaPlayerESDeleted,
+        MediaPlayerESSelected = libvlc_event_e.libvlc_MediaPlayerESSelected,
+        MediaPlayerCorked = libvlc_event_e.libvlc_MediaPlayerCorked,
+        MediaPlayerUncorked = libvlc_event_e.libvlc_MediaPlayerUncorked,
+        MediaPlayerMuted = libvlc_event_e.libvlc_MediaPlayerMuted,
+        MediaPlayerUnmuted = libvlc_event_e.libvlc_MediaPlayerUnmuted,
+        MediaPlayerAudioVolume = libvlc_event_e.libvlc_MediaPlayerAudioVolume,
+        MediaPlayerAudioDevice = libvlc_event_e.libvlc_MediaPlayerAudioDevice,
+        MediaPlayerChapterChanged = libvlc_event_e.libvlc_MediaPlayerChapterChanged,
+
+        /**
+         * A <see cref="VlcMedia"/> was added to a
+         * \link #libvlc_media_list_t media list\endlink.
+         */
+        MediaListItemAdded = libvlc_event_e.libvlc_MediaListItemAdded,
+
+        /**
+         * A <see cref="VlcMedia"/> is about to get
+         * added to a \link #libvlc_media_list_t media list\endlink.
+         */
+        MediaListWillAddItem = libvlc_event_e.libvlc_MediaListWillAddItem,
+
+        /**
+         * A <see cref="VlcMedia"/> was deleted from
+         * a \link #libvlc_media_list_t media list\endlink.
+         */
+        MediaListItemDeleted = libvlc_event_e.libvlc_MediaListItemDeleted,
+
+        /**
+         * A <see cref="VlcMedia"/> is about to get
+         * deleted from a \link #libvlc_media_list_t media list\endlink.
+         */
+        MediaListWillDeleteItem = libvlc_event_e.libvlc_MediaListWillDeleteItem,
+
+        /**
+         * A \link #libvlc_media_list_t media list\endlink has reached the
+         * end.
+         * All \link #libvlc_media_t items\endlink were either added (in
+         * case of a \ref libvlc_media_discoverer_t) or parsed (preparser).
+         */
+        MediaListEndReached = libvlc_event_e.libvlc_MediaListEndReached,
+
+        /**
+         * \deprecated No longer used.
+         * This belonged to the removed libvlc_media_list_view_t
+         */
+        MediaListViewItemAdded = libvlc_event_e.libvlc_MediaListViewItemAdded,
+
+        /**
+         * \deprecated No longer used.
+         * This belonged to the removed libvlc_media_list_view_t
+         */
+        MediaListViewWillAddItem = libvlc_event_e.libvlc_MediaListViewWillAddItem,
+
+        /**
+         * \deprecated No longer used.
+         * This belonged to the removed libvlc_media_list_view_t
+         */
+        MediaListViewItemDeleted = libvlc_event_e.libvlc_MediaListViewItemDeleted,
+
+        /**
+         * \deprecated No longer used.
+         * This belonged to the removed libvlc_media_list_view_t
+         */
+        MediaListViewWillDeleteItem = libvlc_event_e.libvlc_MediaListViewWillDeleteItem,
+
+        /**
+         * Playback of a \link #libvlc_media_list_player_t media list
+         * player\endlink has started.
+         */
+        MediaListPlayerPlayed = libvlc_event_e.libvlc_MediaListPlayerPlayed,
+
+        /**
+         * The current \link #libvlc_media_t item\endlink of a
+         * \link #libvlc_media_list_player_t media list player\endlink
+         * has changed to a different item.
+         */
+        MediaListPlayerNextItemSet = libvlc_event_e.libvlc_MediaListPlayerNextItemSet,
+
+        /**
+         * Playback of a \link #libvlc_media_list_player_t media list
+         * player\endlink has stopped.
+         */
+        MediaListPlayerStopped = libvlc_event_e.libvlc_MediaListPlayerStopped,
+
+        /**
+         * A new \link #libvlc_renderer_item_t renderer item\endlink was found by a
+         * \link #libvlc_renderer_discoverer_t renderer discoverer\endlink.
+         * The renderer item is valid until deleted.
+         */
+        RendererDiscovererItemAdded = libvlc_event_e.libvlc_RendererDiscovererItemAdded,
+
+        /**
+         * A previously discovered \link #libvlc_renderer_item_t renderer item\endlink
+         * was deleted by a \link #libvlc_renderer_discoverer_t renderer discoverer\endlink.
+         * The renderer item is no longer valid.
+         */
+        RendererDiscovererItemDeleted = libvlc_event_e.libvlc_RendererDiscovererItemDeleted,
+
+        VlmMediaAdded = libvlc_event_e.libvlc_VlmMediaAdded,
+        VlmMediaRemoved = libvlc_event_e.libvlc_VlmMediaRemoved,
+        VlmMediaChanged = libvlc_event_e.libvlc_VlmMediaChanged,
+        VlmMediaInstanceStarted = libvlc_event_e.libvlc_VlmMediaInstanceStarted,
+        VlmMediaInstanceStopped = libvlc_event_e.libvlc_VlmMediaInstanceStopped,
+        VlmMediaInstanceStatusInit = libvlc_event_e.libvlc_VlmMediaInstanceStatusInit,
+        VlmMediaInstanceStatusOpening = libvlc_event_e.libvlc_VlmMediaInstanceStatusOpening,
+        VlmMediaInstanceStatusPlaying = libvlc_event_e.libvlc_VlmMediaInstanceStatusPlaying,
+        VlmMediaInstanceStatusPause = libvlc_event_e.libvlc_VlmMediaInstanceStatusPause,
+        VlmMediaInstanceStatusEnd = libvlc_event_e.libvlc_VlmMediaInstanceStatusEnd,
+        VlmMediaInstanceStatusError = libvlc_event_e.libvlc_VlmMediaInstanceStatusError
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Exceptions.cs b/Meta.Vlc/Exceptions.cs
index 9a5abed..4d60aab 100644
--- a/Meta.Vlc/Exceptions.cs
+++ b/Meta.Vlc/Exceptions.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: Exceptions.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
 using Meta.Vlc.Interop;
@@ -69,7 +69,7 @@ public FunctionNotFoundException(LibVlcFunctionAttribute functionInfo, LibVlcVer
         /// <param name="innerException">inner exception</param>
         public FunctionNotFoundException(LibVlcFunctionAttribute functionInfo, LibVlcVersion libvlcVersion,
             Exception innerException)
-            : base(String.Format("Can't find function \"{0}\" in dll.", functionInfo.FunctionName), innerException)
+            : base(string.Format("Can't find function \"{0}\" in dll.", functionInfo.FunctionName), innerException)
         {
             FunctionInfomation = functionInfo;
             LibVlcVersion = libvlcVersion;
@@ -78,12 +78,12 @@ public FunctionNotFoundException(LibVlcFunctionAttribute functionInfo, LibVlcVer
         /// <summary>
         ///     Infomation of function what not found.
         /// </summary>
-        public LibVlcFunctionAttribute FunctionInfomation { get; private set; }
+        public LibVlcFunctionAttribute FunctionInfomation { get; }
 
         /// <summary>
         ///     Versiong infomation of current LibVlc.
         /// </summary>
-        public LibVlcVersion LibVlcVersion { get; private set; }
+        public LibVlcVersion LibVlcVersion { get; }
     }
 
     /// <summary>
@@ -98,7 +98,7 @@ public class FunctionNotAvailableException : LibVlcException
         /// <param name="libvlcVersion">version of LibVlc</param>
         public FunctionNotAvailableException(LibVlcFunctionAttribute functionInfo, LibVlcVersion libvlcVersion)
             : base(
-                String.Format("Function \"{0}\" isn't available on current version LibVlc.", functionInfo.FunctionName))
+                string.Format("Function \"{0}\" isn't available on current version LibVlc.", functionInfo.FunctionName))
         {
             FunctionInfomation = functionInfo;
             LibVlcVersion = libvlcVersion;
@@ -107,12 +107,12 @@ public FunctionNotAvailableException(LibVlcFunctionAttribute functionInfo, LibVl
         /// <summary>
         ///     Infomation of function what not found.
         /// </summary>
-        public LibVlcFunctionAttribute FunctionInfomation { get; private set; }
+        public LibVlcFunctionAttribute FunctionInfomation { get; }
 
         /// <summary>
         ///     Versiong infomation of current LibVlc.
         /// </summary>
-        public LibVlcVersion LibVlcVersion { get; private set; }
+        public LibVlcVersion LibVlcVersion { get; }
     }
 
     /// <summary>
@@ -124,9 +124,9 @@ public class VersionStringParseException : LibVlcException
         ///     Create a <see cref="VersionStringParseException" /> with parse failed version string.
         /// </summary>
         /// <param name="versionString"></param>
-        public VersionStringParseException(String versionString)
+        public VersionStringParseException(string versionString)
             : base(
-                String.Format("Can't parse libvlc version string \"{0}\", it must be like \"2.2.0-Meta Weatherwax\".",
+                string.Format("Can't parse libvlc version string \"{0}\", it must be like \"2.2.0-Meta Weatherwax\".",
                     versionString))
         {
             VersionString = versionString;
@@ -135,7 +135,7 @@ public VersionStringParseException(String versionString)
         /// <summary>
         ///     Parse failed version string.
         /// </summary>
-        public String VersionString { get; private set; }
+        public string VersionString { get; }
     }
 
     /// <summary>
@@ -177,8 +177,10 @@ public VlcCreateFailException() : this(null)
         /// <summary>
         ///     Create a <see cref="VlcCreateFailException" /> with some message.
         /// </summary>
-        public VlcCreateFailException(String message)
-            : base("Can't create a Vlc instence, check your Vlc options." + (message == null ? "" : String.Format(" Maybe those message \"{0}\" mean sometion for you.",message)))
+        public VlcCreateFailException(string message)
+            : base("Can't create a Vlc instence, check your Vlc options." + (message == null
+                       ? ""
+                       : string.Format(" Maybe those message \"{0}\" mean sometion for you.", message)))
         {
         }
     }
diff --git a/Meta.Vlc/HandleManager.cs b/Meta.Vlc/HandleManager.cs
deleted file mode 100644
index 8d58615..0000000
--- a/Meta.Vlc/HandleManager.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
-// Filename: HandleManager.cs
-// Version: 20160214
-
-using System;
-using System.Collections.Generic;
-
-namespace Meta.Vlc
-{
-    internal static class HandleManager
-    {
-        private static readonly Dictionary<IntPtr, IVlcObject> HandleDic = new Dictionary<IntPtr, IVlcObject>();
-
-        public static IVlcObject GetVlcObject(IntPtr pointer)
-        {
-            if (HandleDic.ContainsKey(pointer))
-            {
-                return HandleDic[pointer];
-            }
-            return null;
-        }
-
-        public static void Add(IVlcObject vlcObject)
-        {
-            if (!HandleDic.ContainsKey(vlcObject.InstancePointer))
-            {
-                HandleDic.Add(vlcObject.InstancePointer, vlcObject);
-            }
-        }
-
-        public static void Remove(IVlcObject vlcObject)
-        {
-            if (HandleDic.ContainsKey(vlcObject.InstancePointer))
-            {
-                HandleDic.Remove(vlcObject.InstancePointer);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Meta.Vlc/IVlcObject.cs b/Meta.Vlc/IVlcObject.cs
index f6b629c..4e9b29d 100644
--- a/Meta.Vlc/IVlcObject.cs
+++ b/Meta.Vlc/IVlcObject.cs
@@ -1,21 +1,27 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: IVlcObject.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
 
 namespace Meta.Vlc
 {
     /// <summary>
-    ///     A Vlc unmanaged object.
+    ///     A unmanaged object.
     /// </summary>
-    public interface IVlcObject : IDisposable
+    public unsafe interface IUnmanagedObject : IDisposable
     {
         /// <summary>
-        ///     A pointer of this Vlc object.
+        ///     A pointer of this unmanaged object.
         /// </summary>
-        IntPtr InstancePointer { get; }
+        void* InstancePointer { get; }
+    }
 
+    /// <summary>
+    ///     A Vlc unmanaged object.
+    /// </summary>
+    public interface IVlcObject : IUnmanagedObject
+    {
         /// <summary>
         ///     A relation <see cref="Vlc" /> of this object.
         /// </summary>
diff --git a/Meta.Vlc/Interop/Core/Callback.cs b/Meta.Vlc/Interop/Core/Callback.cs
new file mode 100644
index 0000000..4048fad
--- /dev/null
+++ b/Meta.Vlc/Interop/Core/Callback.cs
@@ -0,0 +1,40 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: Callback.cs
+// Version: 20181231
+
+using System.Runtime.InteropServices;
+
+namespace Meta.Vlc.Interop.Core
+{
+    public unsafe delegate void ExitHandler(void* data);
+
+    namespace Event
+    {
+        /// <summary>
+        ///     Callback function notification
+        /// </summary>
+        /// <param name="p_event">the event triggering the callback</param>
+        /// <param name="data"></param>
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_callback_t(libvlc_event_t* p_event, void* data);
+    }
+
+    namespace Logging
+    {
+        /**
+         * Callback prototype for LibVLC log message handler.
+         *
+         * \param data data pointer as given to libvlc_log_set()
+         * \param level message level (@ref libvlc_log_level)
+         * \param ctx message context (meta-information about the message)
+         * \param fmt printf() format string (as defined by ISO C11)
+         * \param args variable argument list for the format
+         * \note Log message handlers <b>must</b> be thread-safe.
+         * \warning The message context pointer, the format string parameters and the
+         *          variable arguments are only valid until the callback returns.
+         */
+
+        //public unsafe delegate void libvlc_log_cb(void* data, int level, IntPtr ctx,
+        //    byte* fmt, va_list args);
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Interop/Core/Enum.cs b/Meta.Vlc/Interop/Core/Enum.cs
new file mode 100644
index 0000000..bf5d7e5
--- /dev/null
+++ b/Meta.Vlc/Interop/Core/Enum.cs
@@ -0,0 +1,223 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: Enum.cs
+// Version: 20181231
+
+using Meta.Vlc.Interop.Media;
+
+namespace Meta.Vlc.Interop.Core
+{
+    namespace Event
+    {
+        public enum libvlc_event_e
+        {
+            /* Append new event types at the end of a category.
+             * Do not remove, insert or re-order any entry.
+             * Keep this in sync with lib/event.c:libvlc_event_type_name(). */
+
+            /// <summary>
+            ///     Metadata of a \link #libvlc_media_t media item\endlink changed
+            /// </summary>
+            libvlc_MediaMetaChanged = 0,
+
+            /// <summary>
+            ///     Subitem was added to a \link #libvlc_media_t media item\endlink
+            /// </summary>
+            /// <seealso cref="libvlc_media_subitems" />
+            libvlc_MediaSubItemAdded,
+
+            /// <summary>
+            ///     Duration of a \link #libvlc_media_t media item\endlink changed
+            /// </summary>
+            /// <seealso cref="libvlc_media_get_duration" />
+            libvlc_MediaDurationChanged,
+
+            /// <summary>
+            ///     Parsing state of a \link #libvlc_media_t media item\endlink changed
+            /// </summary>
+            /// <seealso cref="libvlc_media_parse_with_options" />
+            /// <seealso cref="libvlc_media_get_parsed_status" />
+            /// <seealso cref="libvlc_media_parse_stop" />
+            libvlc_MediaParsedChanged,
+
+            /// <summary>
+            ///     A \link #libvlc_media_t media item\endlink was freed
+            /// </summary>
+            libvlc_MediaFreed,
+
+            /// <summary>
+            ///     \link #libvlc_state_t State\endlink of the \link #libvlc_media_t media item\endlink changed
+            /// </summary>
+            /// <seealso cref="libvlc_media_get_state" />
+            libvlc_MediaStateChanged,
+
+            /// <summary>
+            ///     Subitem tree was added to a \link #libvlc_media_t media item\endlink
+            /// </summary>
+            libvlc_MediaSubItemTreeAdded,
+
+            libvlc_MediaPlayerMediaChanged = 0x100,
+            libvlc_MediaPlayerNothingSpecial,
+            libvlc_MediaPlayerOpening,
+            libvlc_MediaPlayerBuffering,
+            libvlc_MediaPlayerPlaying,
+            libvlc_MediaPlayerPaused,
+            libvlc_MediaPlayerStopped,
+            libvlc_MediaPlayerForward,
+            libvlc_MediaPlayerBackward,
+            libvlc_MediaPlayerEndReached,
+            libvlc_MediaPlayerEncounteredError,
+            libvlc_MediaPlayerTimeChanged,
+            libvlc_MediaPlayerPositionChanged,
+            libvlc_MediaPlayerSeekableChanged,
+            libvlc_MediaPlayerPausableChanged,
+            libvlc_MediaPlayerTitleChanged,
+            libvlc_MediaPlayerSnapshotTaken,
+            libvlc_MediaPlayerLengthChanged,
+            libvlc_MediaPlayerVout,
+            libvlc_MediaPlayerScrambledChanged,
+            libvlc_MediaPlayerESAdded,
+            libvlc_MediaPlayerESDeleted,
+            libvlc_MediaPlayerESSelected,
+            libvlc_MediaPlayerCorked,
+            libvlc_MediaPlayerUncorked,
+            libvlc_MediaPlayerMuted,
+            libvlc_MediaPlayerUnmuted,
+            libvlc_MediaPlayerAudioVolume,
+            libvlc_MediaPlayerAudioDevice,
+            libvlc_MediaPlayerChapterChanged,
+
+            /**
+             * A \link #libvlc_media_t media item\endlink was added to a
+             * \link #libvlc_media_list_t media list\endlink.
+             */
+            libvlc_MediaListItemAdded = 0x200,
+
+            /**
+             * A \link #libvlc_media_t media item\endlink is about to get
+             * added to a \link #libvlc_media_list_t media list\endlink.
+             */
+            libvlc_MediaListWillAddItem,
+
+            /**
+             * A \link #libvlc_media_t media item\endlink was deleted from
+             * a \link #libvlc_media_list_t media list\endlink.
+             */
+            libvlc_MediaListItemDeleted,
+
+            /**
+             * A \link #libvlc_media_t media item\endlink is about to get
+             * deleted from a \link #libvlc_media_list_t media list\endlink.
+             */
+            libvlc_MediaListWillDeleteItem,
+
+            /**
+             * A \link #libvlc_media_list_t media list\endlink has reached the
+             * end.
+             * All \link #libvlc_media_t items\endlink were either added (in
+             * case of a \ref libvlc_media_discoverer_t) or parsed (preparser).
+             */
+            libvlc_MediaListEndReached,
+
+            /**
+             * \deprecated No longer used.
+             * This belonged to the removed libvlc_media_list_view_t
+             */
+            libvlc_MediaListViewItemAdded = 0x300,
+
+            /**
+             * \deprecated No longer used.
+             * This belonged to the removed libvlc_media_list_view_t
+             */
+            libvlc_MediaListViewWillAddItem,
+
+            /**
+             * \deprecated No longer used.
+             * This belonged to the removed libvlc_media_list_view_t
+             */
+            libvlc_MediaListViewItemDeleted,
+
+            /**
+             * \deprecated No longer used.
+             * This belonged to the removed libvlc_media_list_view_t
+             */
+            libvlc_MediaListViewWillDeleteItem,
+
+            /**
+             * Playback of a \link #libvlc_media_list_player_t media list
+             * player\endlink has started.
+             */
+            libvlc_MediaListPlayerPlayed = 0x400,
+
+            /**
+             * The current \link #libvlc_media_t item\endlink of a
+             * \link #libvlc_media_list_player_t media list player\endlink
+             * has changed to a different item.
+             */
+            libvlc_MediaListPlayerNextItemSet,
+
+            /**
+             * Playback of a \link #libvlc_media_list_player_t media list
+             * player\endlink has stopped.
+             */
+            libvlc_MediaListPlayerStopped,
+
+            /**
+             * A new \link #libvlc_renderer_item_t renderer item\endlink was found by a
+             * \link #libvlc_renderer_discoverer_t renderer discoverer\endlink.
+             * The renderer item is valid until deleted.
+             */
+            libvlc_RendererDiscovererItemAdded = 0x502,
+
+            /**
+             * A previously discovered \link #libvlc_renderer_item_t renderer item\endlink
+             * was deleted by a \link #libvlc_renderer_discoverer_t renderer discoverer\endlink.
+             * The renderer item is no longer valid.
+             */
+            libvlc_RendererDiscovererItemDeleted,
+
+            libvlc_VlmMediaAdded = 0x600,
+            libvlc_VlmMediaRemoved,
+            libvlc_VlmMediaChanged,
+            libvlc_VlmMediaInstanceStarted,
+            libvlc_VlmMediaInstanceStopped,
+            libvlc_VlmMediaInstanceStatusInit,
+            libvlc_VlmMediaInstanceStatusOpening,
+            libvlc_VlmMediaInstanceStatusPlaying,
+            libvlc_VlmMediaInstanceStatusPause,
+            libvlc_VlmMediaInstanceStatusEnd,
+            libvlc_VlmMediaInstanceStatusError
+        }
+    }
+
+    namespace Logging
+    {
+        /// <summary>
+        ///     Logging messages level.
+        /// </summary>
+        /// <remarks>
+        ///     Future LibVLC versions may define new levels.
+        /// </remarks>
+        public enum libvlc_log_level
+        {
+            /// <summary>
+            ///     Debug message
+            /// </summary>
+            LIBVLC_DEBUG = 0,
+
+            /// <summary>
+            ///     Important informational messag
+            /// </summary>
+            LIBVLC_NOTICE = 2,
+
+            /// <summary>
+            ///     Warning (potential error) message
+            /// </summary>
+            LIBVLC_WARNING = 3,
+
+            /// <summary>
+            ///     Error message
+            /// </summary>
+            LIBVLC_ERROR = 4
+        }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Interop/Core/Function.cs b/Meta.Vlc/Interop/Core/Function.cs
new file mode 100644
index 0000000..27d174f
--- /dev/null
+++ b/Meta.Vlc/Interop/Core/Function.cs
@@ -0,0 +1,435 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: Function.cs
+// Version: 20181231
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Meta.Vlc.Interop.Core
+{
+    namespace Error
+    {
+        /// <summary>
+        ///     A human-readable error message for the last LibVLC error in the calling
+        ///     thread. The resulting string is valid until another error occurs (at least
+        ///     until the next LibVLC call).
+        /// </summary>
+        /// <remarks>This will be NULL if there was no error.</remarks>
+        /// <returns></returns>
+        [LibVlcFunction(nameof(libvlc_errmsg))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate byte* libvlc_errmsg();
+
+        /// <summary>
+        ///     Clears the LibVLC error status for the current thread. This is optional.
+        ///     By default, the error status is automatically overridden when a new error
+        ///     occurs, and destroyed when the thread exits.
+        /// </summary>
+        [LibVlcFunction(nameof(libvlc_clearerr))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public delegate void libvlc_clearerr();
+
+        /// <summary>
+        ///     Sets the LibVLC error status and message for the current thread.
+        ///     Any previous error is overridden.
+        /// </summary>
+        /// <param name="fmt">the format string</param>
+        /// <param name="ap">the arguments</param>
+        /// <returns>a nul terminated string in any case</returns>
+        [LibVlcFunction(nameof(libvlc_vprinterr))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate byte* libvlc_vprinterr(byte* fmt, IntPtr ap);
+
+        /// <summary>
+        ///     Sets the LibVLC error status and message for the current thread.
+        ///     Any previous error is overridden.
+        /// </summary>
+        /// <param name="fmt">the format string</param>
+        /// <param name="args">the arguments</param>
+        /// <returns>a nul terminated string in any case</returns>
+        [LibVlcFunction(nameof(libvlc_printerr))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate byte* libvlc_printerr(byte* fmt, ArgIterator args);
+    }
+
+    /// <summary>
+    ///     Create and initialize a libvlc instance.
+    ///     This functions accept a list of "command line" arguments similar to the
+    ///     main(). These arguments affect the LibVLC instance default configuration.
+    /// </summary>
+    /// <param name="argc">the number of arguments (should be 0)</param>
+    /// <param name="argv">the number of arguments (should be NULL)</param>
+    /// <remarks>
+    ///     LibVLC may create threads. Therefore, any thread-unsafe process
+    ///     initialization must be performed before calling libvlc_new(). In particular
+    ///     and where applicable:
+    ///     - setlocale() and textdomain(),
+    ///     - setenv(), unsetenv() and putenv(),
+    ///     - with the X11 display system, XInitThreads()
+    ///     (see also libvlc_media_player_set_xwindow()) and
+    ///     - on Microsoft Windows, SetErrorMode().
+    ///     - sigprocmask() shall never be invoked; pthread_sigmask() can be used.
+    ///     On POSIX systems, the SIGCHLD signal <b>must not</b> be ignored, i.e. the
+    ///     signal handler must set to SIG_DFL or a function pointer, not SIG_IGN.
+    ///     Also while LibVLC is active, the wait() function shall not be called, and
+    ///     any call to waitpid() shall use a strictly positive value for the first
+    ///     parameter (i.e. the PID). Failure to follow those rules may lead to a
+    ///     deadlock or a busy loop.
+    ///     On Microsoft Windows, setting the default DLL directories to SYSTEM32
+    ///     exclusively is strongly recommended for security reasons:
+    ///     <para />
+    ///     SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_SYSTEM32);
+    ///     <para />
+    ///     <para />
+    ///     Arguments are meant to be passed from the command line to LibVLC, just like
+    ///     VLC media player does. The list of valid arguments depends on the LibVLC
+    ///     version, the operating system and platform, and set of available LibVLC
+    ///     plugins. Invalid or unsupported arguments will cause the function to fail
+    ///     (i.e. return NULL). Also, some arguments may alter the behaviour or
+    ///     otherwise interfere with other LibVLC functions.
+    ///     <para />
+    ///     There is absolutely no warranty or promise of forward, backward and
+    ///     cross-platform compatibility with regards to <see cref="libvlc_new" /> arguments.
+    ///     We recommend that you do not use them, other than when debugging.
+    /// </remarks>
+    /// <returns>the libvlc instance or NULL in case of error</returns>
+    [LibVlcFunction(nameof(libvlc_new))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void* libvlc_new(int argc, IntPtr argv);
+
+    /// <summary>
+    ///     Decrement the reference count of a libvlc instance, and destroy it
+    ///     if it reaches zero.
+    /// </summary>
+    /// <param name="p_instance">the instance to destroy</param>
+    [LibVlcFunction(nameof(libvlc_release))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_release(void* p_instance);
+
+    /// <summary>
+    ///     Increments the reference count of a libvlc instance.
+    ///     The initial reference count is 1 after <see cref="libvlc_new" /> returns.
+    /// </summary>
+    /// <param name="p_instance">the instance to reference</param>
+    [LibVlcFunction(nameof(libvlc_retain))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_retain(void* p_instance);
+
+    /// <summary>
+    ///     Try to start a user interface for the libvlc instance.
+    /// </summary>
+    /// <param name="p_instance">the instance</param>
+    /// <param name="name">interface name, or NULL for default</param>
+    /// <returns>0 on success, -1 on error.</returns>
+    [LibVlcFunction(nameof(libvlc_add_intf))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate int libvlc_add_intf(void* p_instance, byte* name);
+
+    /// <summary>
+    ///     Registers a callback for the LibVLC exit event. This is mostly useful if
+    ///     the VLC playlist and/or at least one interface are started with
+    ///     <see cref="libvlc_playlist_play" /> or <see cref="libvlc_add_intf" /> respectively.
+    ///     Typically, this function will wake up your application main loop (from
+    ///     another thread).
+    /// </summary>
+    /// <param name="p_instance">LibVLC instance</param>
+    /// <param name="callback">
+    ///     callback to invoke when LibVLC wants to exit, or NULL to disable the exit handler (as by
+    ///     default)
+    /// </param>
+    /// <param name="opaque">data pointer for the callback</param>
+    /// <remarks>
+    ///     This function should be called before the playlist or interface are
+    ///     started. Otherwise, there is a small race condition: the exit event could
+    ///     be raised before the handler is registered.
+    /// </remarks>
+    [LibVlcFunction(nameof(libvlc_set_exit_handler))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_set_exit_handler(void* p_instance, ExitHandler callback, void* opaque);
+
+    /// <summary>
+    ///     Sets the application name. LibVLC passes this as the user agent string
+    ///     when a protocol requires it.
+    /// </summary>
+    /// <param name="p_instance">LibVLC instance</param>
+    /// <param name="name">human-readable application name, e.g. "FooBar player 1.2.3"</param>
+    /// <param name="http">HTTP User Agent, e.g. "FooBar/1.2.3 Python/2.6.0"</param>
+    [LibVlcFunction(nameof(libvlc_set_user_agent), "1.1.1")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_set_user_agent(void* p_instance, byte* name, byte* http);
+
+    /// <summary>
+    ///     Sets some meta-information about the application.
+    /// </summary>
+    /// <param name="p_instance">LibVLC instance</param>
+    /// <param name="id">Java-style application identifier, e.g. "com.acme.foobar"</param>
+    /// <param name="version">application version numbers, e.g. "1.2.3"</param>
+    /// <param name="icon">application icon name, e.g. "foobar"</param>
+    /// <seealso cref="libvlc_set_user_agent" />
+    [LibVlcFunction(nameof(libvlc_set_app_id), "2.1.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_set_app_id(void* p_instance, byte* id, byte* version, byte* icon);
+
+    /// <summary>
+    ///     Retrieve libvlc version.
+    ///     <para />
+    ///     Example: "1.1.0-git The Luggage"
+    /// </summary>
+    /// <returns>a string containing the libvlc version</returns>
+    [LibVlcFunction(nameof(libvlc_get_version))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate byte* libvlc_get_version();
+
+    /// <summary>
+    ///     Retrieve libvlc compiler version.
+    ///     <para />
+    ///     Example: "gcc version 4.2.3 (Ubuntu 4.2.3-2ubuntu6)"
+    /// </summary>
+    /// <returns>a string containing the libvlc compiler version</returns>
+    [LibVlcFunction(nameof(libvlc_get_compiler))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate byte* libvlc_get_compiler();
+
+    /// <summary>
+    ///     Retrieve libvlc changeset.
+    ///     <para />
+    ///     Example: "aa9bce0bc4"
+    /// </summary>
+    /// <returns>a string containing the libvlc changeset</returns>
+    [LibVlcFunction(nameof(libvlc_get_changeset))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate byte* libvlc_get_changeset();
+
+    /// <summary>
+    ///     Frees an heap allocation returned by a LibVLC function.
+    ///     If you know you're using the same underlying C run-time as the LibVLC
+    ///     implementation, then you can call ANSI C free() directly instead.
+    /// </summary>
+    /// <param name="ptr">the pointer</param>
+    [LibVlcFunction(nameof(libvlc_free))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_free(void* ptr);
+
+    /**
+     * LibVLC emits asynchronous events.
+     *
+     * Several LibVLC objects (such @ref libvlc_instance_t as
+     * @ref libvlc_media_player_t) generate events asynchronously. Each of them
+     * provides @ref libvlc_event_manager_t event manager. You can subscribe to
+     * events with libvlc_event_attach() and unsubscribe with
+     * libvlc_event_detach().
+     */
+    namespace Event
+    {
+        /// <summary>
+        ///     Register for an event notification.
+        /// </summary>
+        /// <param name="p_event_manager">
+        ///     the event manager to which you want to attach to.
+        ///     Generally it is obtained by vlc_my_object_event_manager() where
+        ///     my_object is the object you want to listen to.
+        /// </param>
+        /// <param name="i_event_type">the desired event to which we want to listen</param>
+        /// <param name="f_callback">the function to call when i_event_type occurs</param>
+        /// <param name="user_data">user provided data to carry with the event</param>
+        /// <returns>0 on success, ENOMEM on error</returns>
+        [LibVlcFunction(nameof(libvlc_event_attach))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_event_attach(void* p_event_manager,
+            libvlc_event_e i_event_type,
+            libvlc_callback_t f_callback,
+            void* user_data);
+
+        /// <summary>
+        ///     Unregister an event notification.
+        /// </summary>
+        /// <param name="p_event_manager">the event manager</param>
+        /// <param name="i_event_type">the desired event to which we want to unregister</param>
+        /// <param name="f_callback">the function to call when i_event_type occurs</param>
+        /// <param name="p_user_data">user provided data to carry with the event</param>
+        [LibVlcFunction(nameof(libvlc_event_detach))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_event_detach(void* p_event_manager,
+            libvlc_event_e i_event_type,
+            libvlc_callback_t f_callback,
+            void* p_user_data);
+
+        /// <summary>
+        ///     Get an event's type name.
+        /// </summary>
+        /// <param name="event_type">the desired event</param>
+        /// <returns></returns>
+        [LibVlcFunction(nameof(libvlc_event_type_name))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate byte* libvlc_event_type_name(libvlc_event_e event_type);
+    }
+
+    /**
+     * libvlc_log_* functions provide access to the LibVLC messages log.
+     * This is used for logging and debugging.
+     */
+    namespace Logging
+    {
+        /**
+         * Gets log message debug infos.
+         *
+         * This function retrieves self-debug information about a log message:
+         * - the name of the VLC module emitting the message,
+         * - the name of the source code module (i.e. file) and
+         * - the line number within the source code module.
+         *
+         * The returned module name and file name will be NULL if unknown.
+         * The returned line number will similarly be zero if unknown.
+         *
+         * \param ctx message context (as passed to the @ref libvlc_log_cb callback)
+         * \param module module name storage (or NULL) [OUT]
+         * \param file source code file name storage (or NULL) [OUT]
+         * \param line source code file line number storage (or NULL) [OUT]
+         * \warning The returned module name and source code file name, if non-NULL,
+         * are only valid until the logging callback returns.
+         *
+         * \version LibVLC 2.1.0 or later
+         */
+        [LibVlcFunction(nameof(libvlc_log_get_context), "2.1.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_log_get_context(void* ctx,
+            byte** module, byte** file, uint* line);
+
+        /**
+         * Gets log message info.
+         *
+         * This function retrieves meta-information about a log message:
+         * - the type name of the VLC object emitting the message,
+         * - the object header if any, and
+         * - a temporaly-unique object identifier.
+         *
+         * This information is mainly meant for <b>manual</b> troubleshooting.
+         *
+         * The returned type name may be "generic" if unknown, but it cannot be NULL.
+         * The returned header will be NULL if unset; in current versions, the header
+         * is used to distinguish for VLM inputs.
+         * The returned object ID will be zero if the message is not associated with
+         * any VLC object.
+         *
+         * \param ctx message context (as passed to the @ref libvlc_log_cb callback)
+         * \param name object name storage (or NULL) [OUT]
+         * \param header object header (or NULL) [OUT]
+         * \param line source code file line number storage (or NULL) [OUT]
+         * \warning The returned module name and source code file name, if non-NULL,
+         * are only valid until the logging callback returns.
+         *
+         * \version LibVLC 2.1.0 or later
+         */
+        [LibVlcFunction(nameof(libvlc_log_get_object), "2.1.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_log_get_object(void* ctx,
+            byte** name, byte** header, UIntPtr* id);
+
+        /**
+         * Unsets the logging callback.
+         *
+         * This function deregisters the logging callback for a LibVLC instance.
+         * This is rarely needed as the callback is implicitly unset when the instance
+         * is destroyed.
+         *
+         * \note This function will wait for any pending callbacks invocation to
+         * complete (causing a deadlock if called from within the callback).
+         *
+         * \param p_instance libvlc instance
+         * \version LibVLC 2.1.0 or later
+         */
+        [LibVlcFunction(nameof(libvlc_log_unset), "2.1.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_log_unset(void* p_instance);
+
+        /**
+         * Sets the logging callback for a LibVLC instance.
+         *
+         * This function is thread-safe: it will wait for any pending callbacks
+         * invocation to complete.
+         *
+         * \param cb callback function pointer
+         * \param data opaque data pointer for the callback function
+         *
+         * \note Some log messages (especially debug) are emitted by LibVLC while
+         * is being initialized. These messages cannot be captured with this interface.
+         *
+         * \warning A deadlock may occur if this function is called from the callback.
+         *
+         * \param p_instance libvlc instance
+         * \version LibVLC 2.1.0 or later
+         */
+        //[LibVlcFunction(nameof(libvlc_log_set), "2.1.0")]
+        //[UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        //public unsafe delegate void libvlc_log_set(void* p_instance,
+        //                                libvlc_log_cb cb, void* data);
+
+
+        /**
+         * Sets up logging to a file.
+         * \param p_instance libvlc instance
+         * \param stream FILE pointer opened for writing
+         *         (the FILE pointer must remain valid until libvlc_log_unset())
+         * \version LibVLC 2.1.0 or later
+         */
+        [LibVlcFunction(nameof(libvlc_log_set_file), "2.1.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_log_set_file(void* p_instance, void* stream);
+    }
+
+    /// <summary>
+    ///     Release a list of module descriptions.
+    /// </summary>
+    /// <param name="p_list">the list to be released</param>
+    [LibVlcFunction(nameof(libvlc_module_description_list_release))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_module_description_list_release(libvlc_module_description_t* p_list);
+
+    /// <summary>
+    ///     Returns a list of audio filters that are available.
+    /// </summary>
+    /// <param name="p_instance">libvlc instance</param>
+    /// <returns>
+    ///     a list of module descriptions. It should be freed with <see cref="libvlc_module_description_list_release" />.
+    ///     In case of an error, NULL is returned.
+    /// </returns>
+    /// <seealso cref="libvlc_module_description_t" />
+    /// <seealso cref="libvlc_module_description_list_release" />
+    [LibVlcFunction(nameof(libvlc_audio_filter_list_get))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate libvlc_module_description_t* libvlc_audio_filter_list_get(void* p_instance);
+
+    /// <summary>
+    ///     Returns a list of video filters that are available.
+    /// </summary>
+    /// <param name="p_instance">libvlc instance</param>
+    /// <returns>
+    ///     a list of module descriptions. It should be freed with libvlc_module_description_list_release().
+    ///     In case of an error, NULL is returned.
+    /// </returns>
+    /// <seealso cref="libvlc_module_description_t" />
+    /// <seealso cref="libvlc_module_description_list_release" />
+    [LibVlcFunction(nameof(libvlc_video_filter_list_get))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate libvlc_module_description_t* libvlc_video_filter_list_get(void* p_instance);
+
+    /**
+     * These functions provide access to the LibVLC time/clock.
+     */
+    namespace Time
+    {
+        /// <summary>
+        ///     Return the current time as defined by LibVLC. The unit is the microsecond.
+        ///     Time increases monotonically (regardless of time zone changes and RTC
+        ///     adjustements).
+        ///     <para />
+        ///     The origin is arbitrary but consistent across the whole system
+        ///     (e.g. the system uptim, the time since the system was booted).
+        /// </summary>
+        /// <remarks>On systems that support it, the POSIX monotonic clock is used.</remarks>
+        /// <returns></returns>
+        [LibVlcFunction(nameof(libvlc_clock))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public delegate long libvlc_clock();
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Interop/Core/Struct.cs b/Meta.Vlc/Interop/Core/Struct.cs
new file mode 100644
index 0000000..c1fdbf3
--- /dev/null
+++ b/Meta.Vlc/Interop/Core/Struct.cs
@@ -0,0 +1,324 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: Struct.cs
+// Version: 20181231
+
+using System.Runtime.InteropServices;
+using Meta.Vlc.Interop.Media;
+using MediaPtr = System.IntPtr;
+using VlcTime = System.Int64;
+
+namespace Meta.Vlc.Interop.Core
+{
+    namespace Event
+    {
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_meta_changed
+        {
+            public libvlc_meta_t meta_type;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_subitem_added
+        {
+            public MediaPtr new_child;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_duration_changed
+        {
+            public long new_duration;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_parsed_changed
+        {
+            public libvlc_media_parsed_status_t new_status;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_freed
+        {
+            public MediaPtr md;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_state_changed
+        {
+            public libvlc_state_t new_state;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_subitemtree_added
+        {
+            public MediaPtr md;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_player_buffering
+        {
+            public float new_cache;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_player_chapter_changed
+        {
+            public int new_chapter;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_player_position_changed
+        {
+            public float new_position;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_player_time_changed
+        {
+            public long new_time;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_player_title_changed
+        {
+            public int new_title;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_player_seekable_changed
+        {
+            public int new_seekable;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_player_pausable_changed
+        {
+            public int new_pausable;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_player_scrambled_changed
+        {
+            public int new_scrambled;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_player_vout
+        {
+            public int new_count;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        /* media list */
+        public struct media_list_item_added
+        {
+            public MediaPtr item;
+            public int index;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_list_will_add_item
+        {
+            public MediaPtr item;
+            public int index;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_list_item_deleted
+        {
+            public MediaPtr item;
+            public int index;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_list_will_delete_item
+        {
+            public MediaPtr item;
+            public int index;
+        }
+
+        /* media list player */
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_list_player_next_item_set
+        {
+            public MediaPtr item;
+        }
+
+        /* snapshot taken */
+        [StructLayout(LayoutKind.Sequential)]
+        public unsafe struct media_player_snapshot_taken
+        {
+            public byte* psz_filename;
+        }
+
+        /* Length changed */
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_player_length_changed
+        {
+            public long new_length;
+        }
+
+        /* VLM media */
+        [StructLayout(LayoutKind.Sequential)]
+        public unsafe struct vlm_media_event
+        {
+            public byte* psz_media_name;
+            public byte* psz_instance_name;
+        }
+
+        /* Extra MediaPlayer */
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_player_media_changed
+        {
+            public MediaPtr new_media;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_player_es_changed
+        {
+            public libvlc_track_type_t i_type;
+            public int i_id;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct media_player_audio_volume
+        {
+            public float volume;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public unsafe struct media_player_audio_device
+        {
+            public byte* device;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public unsafe struct renderer_discoverer_item_added
+        {
+            public void* item;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public unsafe struct renderer_discoverer_item_deleted
+        {
+            public void* item;
+        }
+
+        [StructLayout(LayoutKind.Explicit)]
+        public unsafe struct libvlc_event_t
+        {
+            /// <summary>
+            ///     Event type
+            /// </summary>
+            /// <seealso cref="libvlc_event_e" />
+            [FieldOffset(0)] public int type;
+
+            /// <summary>
+            ///     Object emitting the event
+            /// </summary>
+            [FieldOffset(Platform.IntSize)] public void* p_obj;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_meta_changed media_meta_changed;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_subitem_added media_subitem_added;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_duration_changed media_duration_changed;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_parsed_changed media_parsed_changed;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_freed media_freed;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_state_changed media_state_changed;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_subitemtree_added media_subitemtree_added;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_player_buffering media_player_buffering;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_player_chapter_changed media_player_chapter_changed;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_player_position_changed media_player_position_changed;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_player_time_changed media_player_time_changed;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_player_title_changed media_player_title_changed;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_player_seekable_changed media_player_seekable_changed;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_player_pausable_changed media_player_pausable_changed;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_player_scrambled_changed media_player_scrambled_changed;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_player_vout media_player_vout;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_list_item_added media_list_item_added;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_list_will_add_item media_list_will_add_item;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_list_item_deleted media_list_item_deleted;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_list_will_delete_item media_list_will_delete_item;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_list_player_next_item_set media_list_player_next_item_set;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_player_snapshot_taken media_player_snapshot_taken;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_player_length_changed media_player_length_changed;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public vlm_media_event vlm_media_event;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_player_media_changed media_player_media_changed;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_player_es_changed media_player_es_changed;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_player_audio_volume media_player_audio_volume;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public media_player_audio_device media_player_audio_device;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public renderer_discoverer_item_added renderer_discoverer_item_added;
+
+            [FieldOffset(Platform.IntSize + Platform.IntPtrSize)]
+            public renderer_discoverer_item_deleted renderer_discoverer_item_deleted;
+        }
+    }
+
+    /// <summary>
+    ///     Description of a module.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public unsafe struct libvlc_module_description_t
+    {
+        public byte* psz_name;
+        public byte* psz_shortname;
+        public byte* psz_longname;
+        public byte* psz_help;
+        public libvlc_module_description_t* p_next;
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Interop/LibVlc.Time.cs b/Meta.Vlc/Interop/LibVlc.Time.cs
deleted file mode 100644
index 648daa4..0000000
--- a/Meta.Vlc/Interop/LibVlc.Time.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
-// Filename: LibVlc.Time.cs
-// Version: 20160214
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace Meta.Vlc.Interop.Time
-{
-    /// <summary>
-    ///     获取由 LibVlc 定义的当前时间
-    /// </summary>
-    /// <returns>返回由 LibVlc 定义的当前时间</returns>
-    [LibVlcFunction("libvlc_clock")]
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    public delegate Int64 Clock();
-
-    /// <summary>
-    ///     获取与提供的时间戳之间的延迟
-    /// </summary>
-    /// <param name="timestamp">时间戳</param>
-    /// <returns>返回与提供的时间戳之间的延迟</returns>
-    [LibVlcFunction("libvlc_clock")]
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    public delegate Int64 Delay(Int64 timestamp);
-}
\ No newline at end of file
diff --git a/Meta.Vlc/Interop/LibVlc.VLM.cs b/Meta.Vlc/Interop/LibVlc.VLM.cs
index 23fa6d9..8ae53aa 100644
--- a/Meta.Vlc/Interop/LibVlc.VLM.cs
+++ b/Meta.Vlc/Interop/LibVlc.VLM.cs
@@ -1,11 +1,11 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: LibVlc.VLM.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
 using System.Runtime.InteropServices;
 
-namespace Meta.Vlc.Interop.VLM
+namespace Meta.Vlc.Interop
 {
     /// <summary>
     ///     释放给定的 LibVlc 的实例相关的 VLM 实例
diff --git a/Meta.Vlc/Interop/LibVlcFunction.cs b/Meta.Vlc/Interop/LibVlcFunction.cs
index 4e27fc6..d663424 100644
--- a/Meta.Vlc/Interop/LibVlcFunction.cs
+++ b/Meta.Vlc/Interop/LibVlcFunction.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: LibVlcFunction.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
 using System.ComponentModel;
@@ -12,10 +12,12 @@ namespace Meta.Vlc.Interop
     ///     A dynamic mapper of LibVlc functions.
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public class LibVlcFunction<T>
+    public class LibVlcFunction<T> where T : Delegate
     {
         private readonly T _functionDelegate;
 
+        private readonly LibVlcVersion _version;
+
         /// <summary>
         ///     Load a LibVlc function from unmanaged to managed.
         /// </summary>
@@ -25,42 +27,36 @@ public class LibVlcFunction<T>
         ///     of function.
         /// </exception>
         /// <exception cref="FunctionNotFoundException">Can't find function in dll.</exception>
-        public LibVlcFunction()
+        public LibVlcFunction(IntPtr libHandle, LibVlcVersion version)
         {
             IsEnable = false;
+            _version = version;
 
-            object[] attrs = typeof (T).GetCustomAttributes(typeof (LibVlcFunctionAttribute), false);
+            var attrs = typeof(T).GetCustomAttributes(typeof(LibVlcFunctionAttribute), false);
 
             foreach (var item in attrs)
-            {
                 if (item is LibVlcFunctionAttribute)
                 {
                     FunctionInfomation = item as LibVlcFunctionAttribute;
                     break;
                 }
-            }
 
-            if (FunctionInfomation == null)
-            {
-                throw new NoLibVlcFunctionAttributeException();
-            }
+            if (FunctionInfomation == null) throw new NoLibVlcFunctionAttributeException();
 
-            if (LibVlcManager.LibVlcVersion == null ||
-                LibVlcManager.LibVlcVersion.IsFunctionAvailable(FunctionInfomation))
+            if (_version == null || _version.IsFunctionAvailable(FunctionInfomation))
             {
                 IntPtr procAddress;
                 try
                 {
-                    procAddress = Win32Api.GetProcAddress(LibVlcManager.LibVlcHandle,
-                        FunctionInfomation.FunctionName.Trim());
+                    procAddress = Win32Api.GetProcAddress(libHandle, FunctionInfomation.FunctionName.Trim());
                 }
                 catch (Win32Exception e)
                 {
-                    throw new FunctionNotFoundException(FunctionInfomation, LibVlcManager.LibVlcVersion, e);
+                    throw new FunctionNotFoundException(FunctionInfomation, _version, e);
                 }
 
-                var del = Marshal.GetDelegateForFunctionPointer(procAddress, typeof (T));
-                _functionDelegate = (T) Convert.ChangeType(del, typeof (T));
+                var del = Marshal.GetDelegateForFunctionPointer(procAddress, typeof(T));
+                _functionDelegate = (T) Convert.ChangeType(del, typeof(T));
                 IsEnable = true;
             }
         }
@@ -68,12 +64,12 @@ public LibVlcFunction()
         /// <summary>
         ///     Get this <see cref="LibVlcFunction{T}" /> is available or not.
         /// </summary>
-        public bool IsEnable { get; private set; }
+        public bool IsEnable { get; }
 
         /// <summary>
         ///     Get infomation of this <see cref="LibVlcFunction{T}" />.
         /// </summary>
-        public LibVlcFunctionAttribute FunctionInfomation { get; private set; }
+        public LibVlcFunctionAttribute FunctionInfomation { get; }
 
         /// <summary>
         ///     Get delegate of this <see cref="LibVlcFunction{T}" />, if <see cref="IsEnable" /> is false, this method will throw
@@ -84,10 +80,7 @@ public T Delegate
         {
             get
             {
-                if (!IsEnable)
-                {
-                    throw new FunctionNotAvailableException(FunctionInfomation, LibVlcManager.LibVlcVersion);
-                }
+                if (!IsEnable) throw new FunctionNotAvailableException(FunctionInfomation, _version);
                 return _functionDelegate;
             }
         }
diff --git a/Meta.Vlc/Interop/LibVlcFunctionAttribute.cs b/Meta.Vlc/Interop/LibVlcFunctionAttribute.cs
index dac9698..944d869 100644
--- a/Meta.Vlc/Interop/LibVlcFunctionAttribute.cs
+++ b/Meta.Vlc/Interop/LibVlcFunctionAttribute.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: LibVlcFunctionAttribute.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
 
@@ -63,21 +63,21 @@ public LibVlcFunctionAttribute(string functionName, string minVersion, string ma
         /// <summary>
         ///     获取一个值,表示函数在 LibVlc 中的名称
         /// </summary>
-        public string FunctionName { get; private set; }
+        public string FunctionName { get; }
 
         /// <summary>
         ///     获取一个值,表示支持该函数的最小 LibVlc 版本
         /// </summary>
-        public Version MinVersion { get; private set; }
+        public Version MinVersion { get; }
 
         /// <summary>
         ///     获取一个值,表示支持该函数的最大 LibVlc 版本
         /// </summary>
-        public Version MaxVersion { get; private set; }
+        public Version MaxVersion { get; }
 
         /// <summary>
         ///     获取一个值,表示特定的开发版本
         /// </summary>
-        public String Dev { get; private set; }
+        public string Dev { get; }
     }
 }
\ No newline at end of file
diff --git a/Meta.Vlc/Interop/LibVlcVersion.cs b/Meta.Vlc/Interop/LibVlcVersion.cs
index 19a9137..212ca66 100644
--- a/Meta.Vlc/Interop/LibVlcVersion.cs
+++ b/Meta.Vlc/Interop/LibVlcVersion.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: LibVlcVersion.cs
-// Version: 20160216
+// Version: 20181231
 
 using System;
 using System.Text.RegularExpressions;
@@ -12,7 +12,7 @@ namespace Meta.Vlc.Interop
     /// </summary>
     public class LibVlcVersion
     {
-        private static String[] matchExpressions =
+        private static readonly string[] matchExpressions =
         {
             @"^([0-9.]*)-([\S]*)(?: ([\S]*))?",
             @"^([0-9.]*) ([^(]*)(?:\(([\S]*)\))?"
@@ -27,7 +27,7 @@ public class LibVlcVersion
         ///     At least one component of version represents a number greater than
         ///     <see cref="Int32.MaxValue" />.
         /// </exception>
-        public LibVlcVersion(String versionString)
+        public LibVlcVersion(string versionString)
         {
             Match match = null;
 
@@ -42,10 +42,7 @@ public LibVlcVersion(String versionString)
                 }
             }
 
-            if (match == null)
-            {
-                throw new VersionStringParseException(versionString);
-            }
+            if (match == null) throw new VersionStringParseException(versionString);
 
             switch (match.Groups.Count)
             {
@@ -57,10 +54,7 @@ public LibVlcVersion(String versionString)
                 case 4:
                     Version = new Version(match.Groups[1].Value);
                     DevString = match.Groups[2].Value.Trim();
-                    if (match.Groups[3].Success)
-                    {
-                        CodeName = match.Groups[3].Value;
-                    }
+                    if (match.Groups[3].Success) CodeName = match.Groups[3].Value;
                     break;
 
                 default:
@@ -71,17 +65,17 @@ public LibVlcVersion(String versionString)
         /// <summary>
         ///     Version of LibVlc.
         /// </summary>
-        public Version Version { get; private set; }
+        public Version Version { get; }
 
         /// <summary>
         ///     DevString of LibVlc.
         /// </summary>
-        public String DevString { get; private set; }
+        public string DevString { get; }
 
         /// <summary>
         ///     Code name of LibVlc.
         /// </summary>
-        public String CodeName { get; private set; }
+        public string CodeName { get; }
 
         /// <summary>
         ///     Check a function is available for this version.
@@ -92,20 +86,11 @@ public bool IsFunctionAvailable(LibVlcFunctionAttribute functionInfo)
         {
             var result = true;
 
-            if (functionInfo.MinVersion != null)
-            {
-                result = functionInfo.MinVersion <= Version;
-            }
+            if (functionInfo.MinVersion != null) result = functionInfo.MinVersion <= Version;
 
-            if (functionInfo.MaxVersion != null)
-            {
-                result = result && Version <= functionInfo.MaxVersion;
-            }
+            if (functionInfo.MaxVersion != null) result = result && Version <= functionInfo.MaxVersion;
 
-            if (functionInfo.Dev != null)
-            {
-                result = result && DevString == functionInfo.Dev;
-            }
+            if (functionInfo.Dev != null) result = result && DevString == functionInfo.Dev;
 
             return result;
         }
diff --git a/Meta.Vlc/Interop/Media/Callback.cs b/Meta.Vlc/Interop/Media/Callback.cs
new file mode 100644
index 0000000..f1bc88c
--- /dev/null
+++ b/Meta.Vlc/Interop/Media/Callback.cs
@@ -0,0 +1,62 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: Callback.cs
+// Version: 20181231
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Meta.Vlc.Interop.Media
+{
+    /// <summary>
+    ///     Callback prototype to close a custom bitstream input media.
+    /// </summary>
+    /// <param name="opaque">private pointer as set by the <see cref="Media.libvlc_media_open_cb" /> callback</param>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate void libvlc_media_close_cb(void* opaque);
+
+    /// <summary>
+    ///     Callback prototype to seek a custom bitstream input media.
+    /// </summary>
+    /// <param name="opaque">private pointer as set by the <see cref="Media.libvlc_media_open_cb" /> callback</param>
+    /// <param name="offset">absolute byte offset to seek to</param>
+    /// <returns>0 on success, -1 on error.</returns>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate int libvlc_media_seek_cb(void* opaque, ulong offset);
+
+    /// <summary>
+    ///     Callback prototype to read data from a custom bitstream input media.
+    /// </summary>
+    /// <param name="opaque">private pointer as set by the <see cref="Media.libvlc_media_open_cb" /> callback</param>
+    /// <param name="buf">start address of the buffer to read data into</param>
+    /// <param name="len">bytes length of the buffer</param>
+    /// <remarks>
+    ///     If no data is immediately available, then the callback should sleep.
+    ///     <para />
+    ///     The application is responsible for avoiding deadlock situations.
+    ///     In particular, the callback should return an error if playback is stopped;
+    ///     if it does not return, then <see cref="libvlc_media_player_stop" />() will never return.
+    /// </remarks>
+    /// <returns>strictly positive number of bytes read, 0 on end-of-stream, or -1 on non-recoverable error</returns>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate UIntPtr libvlc_media_read_cb(void* opaque, byte* buf, IntPtr len);
+
+    /// <summary>
+    ///     Callback prototype to open a custom bitstream input media.
+    ///     <para />
+    ///     The same media item can be opened multiple times. Each time, this callback
+    ///     is invoked. It should allocate and initialize any instance-specific
+    ///     resources, then store them in *datap. The instance resources can be freed
+    ///     in the <see cref="Media.libvlc_media_close_cb(void*)" /> callback.
+    /// </summary>
+    /// <param name="opaque">private pointer as passed to <see cref="Media.libvlc_media_new_callbacks" />()</param>
+    /// <param name="datap">storage space for a private data pointer [OUT]</param>
+    /// <param name="sizep">byte length of the bitstream or UINT64_MAX if unknown [OUT]</param>
+    /// <remarks>For convenience, *datap is initially NULL and *sizep is initially 0.</remarks>
+    /// <returns>
+    ///     0 on success, non-zero on error. In case of failure, the other
+    ///     callbacks will not be invoked and any value stored in *datap and *sizep is
+    ///     discarded.
+    /// </returns>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate int libvlc_media_open_cb(void* opaque, void** datap, ulong* sizep);
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Interop/Media/Enum.cs b/Meta.Vlc/Interop/Media/Enum.cs
new file mode 100644
index 0000000..edf628e
--- /dev/null
+++ b/Meta.Vlc/Interop/Media/Enum.cs
@@ -0,0 +1,241 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: Enum.cs
+// Version: 20181231
+
+namespace Meta.Vlc.Interop.Media
+{
+    /// <summary>
+    ///     Type of a media slave: subtitle or audio.
+    /// </summary>
+    public enum libvlc_media_slave_type_t
+    {
+        libvlc_media_slave_type_subtitle,
+        libvlc_media_slave_type_audio
+    }
+
+    public enum libvlc_video_projection_t
+    {
+        libvlc_video_projection_rectangular,
+
+        /// <summary>
+        ///     360 spherical
+        /// </summary>
+        libvlc_video_projection_equirectangular,
+        libvlc_video_projection_cubemap_layout_standard = 0x100
+    }
+
+    public enum libvlc_video_orient_t
+    {
+        /// <summary>
+        ///     Normal. Top line represents top, left column left.
+        /// </summary>
+        libvlc_video_orient_top_left,
+
+        /// <summary>
+        ///     Flipped horizontally
+        /// </summary>
+        libvlc_video_orient_top_right,
+
+        /// <summary>
+        ///     Flipped vertically
+        /// </summary>
+        libvlc_video_orient_bottom_left,
+
+        /// <summary>
+        ///     Rotated 180 degrees
+        /// </summary>
+        libvlc_video_orient_bottom_right,
+
+        /// <summary>
+        ///     Transposed
+        /// </summary>
+        libvlc_video_orient_left_top,
+
+        /// <summary>
+        ///     Rotated 90 degrees clockwise (or 270 anti-clockwise)
+        /// </summary>
+        libvlc_video_orient_left_bottom,
+
+        /// <summary>
+        ///     Rotated 90 degrees anti-clockwise
+        /// </summary>
+        libvlc_video_orient_right_top,
+
+        /// <summary>
+        ///     Anti-transposed
+        /// </summary>
+        libvlc_video_orient_right_bottom
+    }
+
+    public enum libvlc_video_multiview_t
+    {
+        /// <summary>
+        ///     No stereoscopy: 2D picture.
+        /// </summary>
+        libvlc_video_multiview_2d,
+
+        /// <summary>
+        ///     Side-by-side
+        /// </summary>
+        libvlc_video_multiview_stereo_sbs,
+
+        /// <summary>
+        ///     Top-bottom
+        /// </summary>
+        libvlc_video_multiview_stereo_tb,
+
+        /// <summary>
+        ///     Row sequential
+        /// </summary>
+        libvlc_video_multiview_stereo_row,
+
+        /// <summary>
+        ///     Column sequential
+        /// </summary>
+        libvlc_video_multiview_stereo_col,
+
+        /// <summary>
+        ///     Frame sequential
+        /// </summary>
+        libvlc_video_multiview_stereo_frame,
+
+        /// <summary>
+        ///     Checkerboard pattern
+        /// </summary>
+        libvlc_video_multiview_stereo_checkerboard
+    }
+
+    public enum libvlc_track_type_t
+    {
+        libvlc_track_unknown = -1,
+        libvlc_track_audio = 0,
+        libvlc_track_video = 1,
+        libvlc_track_text = 2
+    }
+
+    /// <summary>
+    ///     Note the order of libvlc_state_t enum must match exactly the order of
+    ///     \see mediacontrol_PlayerStatus, \see input_state_e enums,
+    ///     and VideoLAN.LibVLC.State (at bindings/cil/src/media.cs).
+    ///     Expected states by web plugins are:
+    ///     IDLE/CLOSE=0, OPENING=1, PLAYING=3, PAUSED=4,
+    ///     STOPPING=5, ENDED=6, ERROR=7
+    /// </summary>
+    public enum libvlc_state_t
+    {
+        libvlc_NothingSpecial = 0,
+        libvlc_Opening,
+
+        /// <summary>
+        ///     Deprecated value. Check the libvlc_MediaPlayerBuffering event to know the buffering state of a libvlc_media_player
+        /// </summary>
+        libvlc_Buffering,
+        libvlc_Playing,
+        libvlc_Paused,
+        libvlc_Stopped,
+        libvlc_Ended,
+        libvlc_Error
+    }
+
+    /// <summary>
+    ///     Meta data types
+    /// </summary>
+    public enum libvlc_meta_t
+    {
+        libvlc_meta_Title,
+        libvlc_meta_Artist,
+        libvlc_meta_Genre,
+        libvlc_meta_Copyright,
+        libvlc_meta_Album,
+        libvlc_meta_TrackNumber,
+        libvlc_meta_Description,
+        libvlc_meta_Rating,
+        libvlc_meta_Date,
+        libvlc_meta_Setting,
+        libvlc_meta_URL,
+        libvlc_meta_Language,
+        libvlc_meta_NowPlaying,
+        libvlc_meta_Publisher,
+        libvlc_meta_EncodedBy,
+        libvlc_meta_ArtworkURL,
+        libvlc_meta_TrackID,
+        libvlc_meta_TrackTotal,
+        libvlc_meta_Director,
+        libvlc_meta_Season,
+        libvlc_meta_Episode,
+        libvlc_meta_ShowName,
+        libvlc_meta_Actors,
+        libvlc_meta_AlbumArtist,
+        libvlc_meta_DiscNumber,
+
+        libvlc_meta_DiscTotal
+        /* Add new meta types HERE */
+    }
+
+    /// <summary>
+    ///     Media type
+    /// </summary>
+    public enum libvlc_media_type_t
+    {
+        libvlc_media_type_unknown,
+        libvlc_media_type_file,
+        libvlc_media_type_directory,
+        libvlc_media_type_disc,
+        libvlc_media_type_stream,
+        libvlc_media_type_playlist
+    }
+
+    /// <summary>
+    ///     Parse status used sent by <see cref="libvlc_media_parse_with_options" /> or returned by
+    ///     <see cref="libvlc_media_get_parsed_status" />()
+    /// </summary>
+    /// <seealso cref="libvlc_media_parse_with_options" />
+    /// <seealso cref="libvlc_media_get_parsed_status" />
+    public enum libvlc_media_parsed_status_t
+    {
+        libvlc_media_parsed_status_skipped = 1,
+        libvlc_media_parsed_status_failed,
+        libvlc_media_parsed_status_timeout,
+        libvlc_media_parsed_status_done
+    }
+
+    /// <summary>
+    ///     Parse flags used by <see cref="libvlc_media_parse_with_options" />
+    /// </summary>
+    /// <seealso cref="libvlc_media_parse_with_options" />
+    public enum libvlc_media_parse_flag_t
+    {
+        /// <summary>
+        ///     Parse media if it's a local file
+        /// </summary>
+        libvlc_media_parse_local = 0x00,
+
+        /// <summary>
+        ///     Parse media even if it's a network file
+        /// </summary>
+        libvlc_media_parse_network = 0x01,
+
+        /// <summary>
+        ///     Fetch meta and covert art using local resources
+        /// </summary>
+        libvlc_media_fetch_local = 0x02,
+
+        /// <summary>
+        ///     Fetch meta and covert art using network resources
+        /// </summary>
+        libvlc_media_fetch_network = 0x04,
+
+        /// <summary>
+        ///     Interact with the user (via libvlc_dialog_cbs) when preparsing this item
+        ///     (and not its sub items). Set this flag in order to receive a callback
+        ///     when the input is asking for credentials.
+        /// </summary>
+        libvlc_media_do_interact = 0x08
+    }
+
+    public enum libvlc_media_option_t
+    {
+        libvlc_media_option_trusted = 0x2,
+        libvlc_media_option_unique = 0x100
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Interop/Media/Function.cs b/Meta.Vlc/Interop/Media/Function.cs
new file mode 100644
index 0000000..fa1e320
--- /dev/null
+++ b/Meta.Vlc/Interop/Media/Function.cs
@@ -0,0 +1,441 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: Function.cs
+// Version: 20181231
+
+using System.Runtime.InteropServices;
+using Meta.Vlc.Interop.Core.Event;
+
+namespace Meta.Vlc.Interop.Media
+{
+    /// <summary>
+    ///     Create a media with a certain given media resource location,
+    ///     for instance a valid URL.
+    /// </summary>
+    /// <param name="instance">the instance</param>
+    /// <param name="psz_mrl">the media location</param>
+    /// <remarks>
+    ///     To refer to a local file with this function,
+    ///     the file://... URI syntax <b>must</b> be used (see IETF RFC3986).
+    ///     We recommend using libvlc_media_new_path() instead when dealing with
+    ///     local files.
+    /// </remarks>
+    /// <returns>the newly created media or NULL on error</returns>
+    /// <seealso cref="libvlc_media_release" />
+    [LibVlcFunction(nameof(libvlc_media_new_location))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void* libvlc_media_new_location(void* instance, byte* psz_mrl);
+
+    /// <summary>
+    ///     Create a media for a certain file path.
+    /// </summary>
+    /// <param name="instance">the instance</param>
+    /// <param name="path">local filesystem path</param>
+    /// <returns>the newly created media or NULL on error</returns>
+    /// <seealso cref="libvlc_media_release" />
+    [LibVlcFunction(nameof(libvlc_media_new_path))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void* libvlc_media_new_path(void* instance, byte* path);
+
+    /// <summary>
+    ///     Create a media with custom callbacks to read the data from.
+    /// </summary>
+    /// <param name="instance">LibVLC instance</param>
+    /// <param name="open_cb">callback to open the custom bitstream input media</param>
+    /// <param name="read_cb">callback to read data (must not be NULL)</param>
+    /// <param name="seek_cb">callback to seek, or NULL if seeking is not supported</param>
+    /// <param name="close_cb">callback to close the media, or NULL if unnecessary</param>
+    /// <param name="opaque">data pointer for the open callback</param>
+    /// <remarks>
+    ///     If open_cb is NULL, the opaque pointer will be passed to read_cb,
+    ///     seek_cb and close_cb, and the stream size will be treated as unknown.
+    ///     <para />
+    ///     The callbacks may be called asynchronously (from another thread).
+    ///     A single stream instance need not be reentrant. However the open_cb needs to
+    ///     be reentrant if the media is used by multiple player instances.
+    ///     <para />
+    ///     The callbacks may be used until all or any player instances
+    ///     that were supplied the media item are stopped.
+    /// </remarks>
+    /// <returns>the newly created media or NULL on error</returns>
+    /// <seealso cref="libvlc_media_release" />
+    [LibVlcFunction(nameof(libvlc_media_new_callbacks), "3.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void* libvlc_media_new_callbacks(void* instance,
+        libvlc_media_open_cb open_cb,
+        libvlc_media_read_cb read_cb,
+        libvlc_media_seek_cb seek_cb,
+        libvlc_media_close_cb close_cb,
+        void* opaque);
+
+    /// <summary>
+    ///     Create a media as an empty node with a given name.
+    /// </summary>
+    /// <param name="instance">the instance</param>
+    /// <param name="psz_name">the name of the node</param>
+    /// <returns>the new empty media or NULL on error</returns>
+    /// <seealso cref="libvlc_media_release" />
+    [LibVlcFunction(nameof(libvlc_media_new_as_node))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void* libvlc_media_new_as_node(void* instance, byte* psz_name);
+
+    /// <summary>
+    ///     Add an option to the media.
+    ///     <para />
+    ///     This option will be used to determine how the media_player will
+    ///     read the media. This allows to use VLC's advanced
+    ///     reading/streaming options on a per-media basis.
+    /// </summary>
+    /// <param name="p_md">the media descriptor</param>
+    /// <param name="psz_options">the options (as a string)</param>
+    /// <remarks>
+    ///     The options are listed in 'vlc --long-help' from the command line,
+    ///     e.g. "-sout-all". Keep in mind that available options and their semantics
+    ///     vary across LibVLC versions and builds.
+    ///     <para />
+    ///     Not all options affects libvlc_media_t objects:
+    ///     Specifically, due to architectural issues most audio and video options,
+    ///     such as text renderer options, have no effects on an individual media.
+    ///     These options must be set through libvlc_new() instead.
+    /// </remarks>
+    [LibVlcFunction(nameof(libvlc_media_add_option))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_add_option(void* p_md, byte* psz_options);
+
+    /// <summary>
+    ///     Add an option to the media with configurable flags.
+    ///     <para />
+    ///     This option will be used to determine how the media_player will
+    ///     read the media. This allows to use VLC's advanced
+    ///     reading/streaming options on a per-media basis.
+    ///     <para />
+    ///     The options are detailed in vlc --long-help, for instance
+    ///     "--sout-all". Note that all options are not usable on medias:
+    ///     specifically, due to architectural issues, video-related options
+    ///     such as text renderer options cannot be set on a single media. They
+    ///     must be set on the whole libvlc instance instead.
+    /// </summary>
+    /// <param name="p_md">the media descriptor</param>
+    /// <param name="psz_options">the options (as a string)</param>
+    /// <param name="i_flags">the flags for this option</param>
+    [LibVlcFunction(nameof(libvlc_media_add_option_flag))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_add_option_flag(void* p_md, byte* psz_options, uint i_flags);
+
+    /// <summary>
+    ///     Retain a reference to a media descriptor object (libvlc_media_t). Use
+    ///     libvlc_media_release() to decrement the reference count of a
+    ///     media descriptor object.
+    /// </summary>
+    /// <param name="p_md">the media descriptor</param>
+    [LibVlcFunction(nameof(libvlc_media_retain))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_retain(void* p_md);
+
+    /// <summary>
+    ///     Decrement the reference count of a media descriptor object. If the
+    ///     reference count is 0, then libvlc_media_release() will release the
+    ///     media descriptor object. It will send out an libvlc_MediaFreed event
+    ///     to all listeners. If the media descriptor object has been released it
+    ///     should not be used again.
+    /// </summary>
+    /// <param name="p_md">the media descriptor</param>
+    [LibVlcFunction(nameof(libvlc_media_release))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_release(void* p_md);
+
+    /// <summary>
+    ///     Get the media resource locator (mrl) from a media descriptor object
+    /// </summary>
+    /// <param name="p_md">a media descriptor object</param>
+    /// <returns>string with mrl of media descriptor object</returns>
+    [LibVlcFunction(nameof(libvlc_media_get_mrl))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate byte* libvlc_media_get_mrl(void* p_md);
+
+    /// <summary>
+    ///     Duplicate a media descriptor object.
+    /// </summary>
+    /// <param name="p_md">a media descriptor object.</param>
+    /// <returns></returns>
+    [LibVlcFunction(nameof(libvlc_media_duplicate))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void* libvlc_media_duplicate(void* p_md);
+
+    /// <summary>
+    ///     Read the meta of the media.
+    ///     <para />
+    ///     If the media has not yet been parsed this will return NULL.
+    /// </summary>
+    /// <param name="p_md">the media descriptor</param>
+    /// <param name="e_meta">the meta to read</param>
+    /// <returns>the media's meta</returns>
+    /// <seealso cref="libvlc_media_parse_with_options" />
+    /// <seealso cref="libvlc_event_e.libvlc_MediaMetaChanged" />
+    [LibVlcFunction(nameof(libvlc_media_get_meta))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate byte* libvlc_media_get_meta(void* p_md,
+        libvlc_meta_t e_meta);
+
+    /// <summary>
+    ///     Set the meta of the media (this function will not save the meta, call
+    ///     <see cref="libvlc_media_save_meta" /> in order to save the meta)
+    /// </summary>
+    /// <param name="p_md">the media descriptor</param>
+    /// <param name="e_meta">the meta to write</param>
+    /// <param name="psz_value">the media's meta</param>
+    [LibVlcFunction(nameof(libvlc_media_set_meta))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_set_meta(void* p_md,
+        libvlc_meta_t e_meta,
+        byte* psz_value);
+
+    /// <summary>
+    ///     Save the meta previously set
+    /// </summary>
+    /// <param name="p_md">the media desriptor</param>
+    /// <returns>true if the write operation was successful</returns>
+    [LibVlcFunction(nameof(libvlc_media_save_meta))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate bool libvlc_media_save_meta(void* p_md);
+
+    /// <summary>
+    ///     Get current state of media descriptor object. Possible media states are
+    ///     libvlc_NothingSpecial=0, libvlc_Opening, libvlc_Playing, libvlc_Paused,
+    ///     libvlc_Stopped, libvlc_Ended, libvlc_Error.
+    /// </summary>
+    /// <param name="p_md">a media descriptor object</param>
+    /// <returns>state of media descriptor object</returns>
+    /// <seealso cref="libvlc_state_t" />
+    [LibVlcFunction(nameof(libvlc_media_get_state))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate libvlc_state_t libvlc_media_get_state(void* p_md);
+
+    /// <summary>
+    ///     Get the current statistics about the media
+    /// </summary>
+    /// <param name="p_md">media descriptor object</param>
+    /// <param name="p_stats">
+    ///     structure that contain the statistics about the media(this structure must be allocated by the
+    ///     caller)
+    /// </param>
+    /// <returns>true if the statistics are available, false otherwise</returns>
+    [LibVlcFunction(nameof(libvlc_media_get_stats))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate bool libvlc_media_get_stats(void* p_md, libvlc_media_stats_t* p_stats);
+
+    /// <summary>
+    ///     Get subitems of media descriptor object. This will increment
+    ///     the reference count of supplied media descriptor object. Use
+    ///     <see cref="libvlc_media_list_release" /> to decrement the reference counting.
+    /// </summary>
+    /// <param name="p_md">media descriptor object</param>
+    /// <returns>list of media descriptor subitems or NULL</returns>
+    [LibVlcFunction(nameof(libvlc_media_subitems))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void* libvlc_media_subitems(void* p_md); // return libvlc_media_list_t*
+
+    /// <summary>
+    ///     Get event manager from media descriptor object.
+    /// </summary>
+    /// <param name="p_md">a media descriptor object</param>
+    /// <remarks>
+    ///     this function doesn't increment reference counting.
+    /// </remarks>
+    /// <returns>event manager object</returns>
+    [LibVlcFunction(nameof(libvlc_media_event_manager))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void* libvlc_media_event_manager(void* p_md); // return libvlc_event_manager_t*
+
+    /// <summary>
+    ///     Get duration (in ms) of media descriptor object item.
+    /// </summary>
+    /// <param name="p_md">media descriptor object</param>
+    /// <returns>duration of media item or -1 on error</returns>
+    [LibVlcFunction(nameof(libvlc_media_get_duration))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate long libvlc_media_get_duration(void* p_md); // return libvlc_time_t*
+
+    /// <summary>
+    ///     Parse the media asynchronously with options.
+    ///     <para />
+    ///     This fetches (local or network) art, meta data and/or tracks information.
+    ///     <para />
+    ///     To track when this is over you can listen to <see cref="libvlc_event_e.libvlc_MediaParsedChanged" />
+    ///     event. However if this functions returns an error, you will not receive any
+    ///     events.
+    ///     <para />
+    ///     It uses a flag to specify parse options (see <see cref="libvlc_media_parse_flag_t" />). All
+    ///     these flags can be combined. By default, media is parsed if it's a local
+    ///     file.
+    /// </summary>
+    /// <param name="p_md">media descriptor object</param>
+    /// <param name="parse_flag">parse options</param>
+    /// <param name="timeout">
+    ///     maximum time allowed to preparse the media. If -1, the
+    ///     default "preparse-timeout" option will be used as a timeout. If 0, it will
+    ///     wait indefinitely. If > 0, the timeout will be used (in milliseconds).
+    /// </param>
+    /// <remarks>Parsing can be aborted with <see cref="libvlc_media_parse_stop" />.</remarks>
+    /// <returns>-1 in case of error, 0 otherwise</returns>
+    /// <seealso cref="libvlc_event_e.libvlc_MediaParsedChanged" />
+    /// <seealso cref="libvlc_media_get_meta" />
+    /// <seealso cref="libvlc_media_tracks_get" />
+    /// <seealso cref="libvlc_media_get_parsed_status" />
+    /// <seealso cref="libvlc_media_parse_flag_t" />
+    [LibVlcFunction(nameof(libvlc_media_parse_with_options), "3.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate int libvlc_media_parse_with_options(void* p_md,
+        libvlc_media_parse_flag_t parse_flag,
+        int timeout);
+
+    /// <summary>
+    ///     Stop the parsing of the media
+    ///     <para />
+    ///     When the media parsing is stopped, the libvlc_MediaParsedChanged event will
+    ///     be sent with the libvlc_media_parsed_status_timeout status.
+    /// </summary>
+    /// <param name="p_md">media descriptor object</param>
+    /// <seealso cref="libvlc_media_parse_with_options" />
+    [LibVlcFunction(nameof(libvlc_media_parse_stop), "3.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_parse_stop(void* p_md);
+
+    /// <summary>
+    ///     Get Parsed status for media descriptor object.
+    /// </summary>
+    /// <param name="p_md">media descriptor object</param>
+    /// <returns>a value of the <see cref="libvlc_media_parsed_status_t" /> enum</returns>
+    /// <seealso cref="libvlc_event_e.libvlc_MediaParsedChanged" />
+    /// <seealso cref="libvlc_media_parsed_status_t" />
+    [LibVlcFunction(nameof(libvlc_media_get_parsed_status), "3.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate libvlc_media_parsed_status_t libvlc_media_get_parsed_status(void* p_md);
+
+    /// <summary>
+    ///     Sets media descriptor's user_data. user_data is specialized data
+    ///     accessed by the host application, VLC.framework uses it as a pointer to
+    ///     an native object that references a libvlc_media_t pointer
+    /// </summary>
+    /// <param name="p_md">media descriptor object</param>
+    /// <param name="p_new_user_data">pointer to user data</param>
+    [LibVlcFunction(nameof(libvlc_media_set_user_data))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_set_user_data(void* p_md, void* p_new_user_data);
+
+    /// <summary>
+    ///     Get media descriptor's user_data. user_data is specialized data
+    ///     accessed by the host application, VLC.framework uses it as a pointer to
+    ///     an native object that references a libvlc_media_t pointer
+    /// </summary>
+    /// <param name="p_md">media descriptor object</param>
+    /// <returns></returns>
+    [LibVlcFunction(nameof(libvlc_media_get_user_data))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void* libvlc_media_get_user_data(void* p_md);
+
+    /// <summary>
+    ///     Get media descriptor's elementary streams description
+    ///     <para />
+    ///     Note, you need to call <see cref="libvlc_media_parse_with_options" />() or play the media at least once
+    ///     before calling this function.
+    ///     Not doing this will result in an empty array.
+    /// </summary>
+    /// <param name="p_md">media descriptor object</param>
+    /// <param name="tracks">
+    ///     tracks address to store an allocated array of Elementary Streams
+    ///     descriptions (must be freed with <see cref="Media.libvlc_media_tracks_release" />
+    ///     by the caller) [OUT]
+    /// </param>
+    /// <returns>the number of Elementary Streams (zero on error)</returns>
+    [LibVlcFunction(nameof(libvlc_media_tracks_get), "2.1.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate uint libvlc_media_tracks_get(void* p_md, libvlc_media_track_t*** tracks);
+
+    /// <summary>
+    ///     Get codec description from media elementary stream
+    /// </summary>
+    /// <param name="i_type">i_type from <see cref="libvlc_media_track_t" /></param>
+    /// <param name="i_codec">i_codec or i_original_fourcc from <see cref="libvlc_media_track_t" /></param>
+    /// <returns>codec description</returns>
+    /// <seealso cref="libvlc_media_track_t" />
+    [LibVlcFunction(nameof(libvlc_media_get_codec_description), "3.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate byte* libvlc_media_get_codec_description(libvlc_track_type_t i_type, uint i_codec);
+
+    /// <summary>
+    ///     Release media descriptor's elementary streams description array
+    /// </summary>
+    /// <param name="p_tracks">tracks info array to release</param>
+    /// <param name="i_count">number of elements in the array</param>
+    [LibVlcFunction(nameof(libvlc_media_tracks_release), "2.1.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_tracks_release(libvlc_media_track_t** p_tracks, uint i_count);
+
+    /// <summary>
+    ///     Get the media type of the media descriptor object
+    /// </summary>
+    /// <param name="p_md">media descriptor object</param>
+    /// <returns>media type</returns>
+    /// <seealso cref="libvlc_media_type_t" />
+    [LibVlcFunction(nameof(libvlc_media_get_type), "3.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate libvlc_media_type_t libvlc_media_get_type(void* p_md);
+
+    /// <summary>
+    ///     Add a slave to the current media.
+    ///     <para />
+    ///     A slave is an external input source that may contains an additional subtitle
+    ///     track (like a .srt) or an additional audio track (like a .ac3).
+    /// </summary>
+    /// <param name="p_md">media descriptor object</param>
+    /// <param name="i_type">subtitle or audio</param>
+    /// <param name="i_priority">from 0 (low priority) to 4 (high priority)</param>
+    /// <param name="psz_uri">Uri of the slave (should contain a valid scheme).</param>
+    /// <remarks>
+    ///     This function must be called before the media is parsed (via
+    ///     <see cref="Media.libvlc_media_parse_with_options" />) or before the media is played (via
+    ///     <see cref="libvlc_media_player_play" />)
+    /// </remarks>
+    /// <returns>0 on success, -1 on error.</returns>
+    [LibVlcFunction(nameof(libvlc_media_slaves_add), "3.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate int libvlc_media_slaves_add(void* p_md,
+        libvlc_media_slave_type_t i_type,
+        uint i_priority,
+        byte* psz_uri);
+
+    /// <summary>
+    ///     Clear all slaves previously added by <see cref="Media.libvlc_media_slaves_add" /> or
+    ///     internally.
+    /// </summary>
+    /// <param name="p_md">media descriptor object</param>
+    [LibVlcFunction(nameof(libvlc_media_slaves_clear), "3.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_slaves_clear(void* p_md);
+
+    /// <summary>
+    ///     Get a media descriptor's slave list
+    ///     <para />
+    ///     The list will contain slaves parsed by VLC or previously added by
+    ///     <see cref="libvlc_media_slaves_add" />. The typical use case of this function is to save
+    ///     a list of slave in a database for a later use.
+    /// </summary>
+    /// <param name="p_md">media descriptor object</param>
+    /// <param name="ppp_slaves">
+    ///     address to store an allocated array of slaves (must be
+    ///     freed with <see cref="libvlc_media_slaves_release" />) [OUT]
+    /// </param>
+    /// <returns>the number of slaves (zero on error)</returns>
+    [LibVlcFunction(nameof(libvlc_media_slaves_get), "3.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate uint libvlc_media_slaves_get(void* p_md, libvlc_media_slave_t*** ppp_slaves);
+
+    /// <summary>
+    ///     Release a media descriptor's slave list
+    /// </summary>
+    /// <param name="ppp_slaves">slave array to release</param>
+    /// <param name="i_count">number of elements in the array</param>
+    [LibVlcFunction(nameof(libvlc_media_slaves_release), "3.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_slaves_release(libvlc_media_slave_t** ppp_slaves, uint i_count);
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Interop/Media/Struct.cs b/Meta.Vlc/Interop/Media/Struct.cs
new file mode 100644
index 0000000..0e10b9b
--- /dev/null
+++ b/Meta.Vlc/Interop/Media/Struct.cs
@@ -0,0 +1,170 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: Struct.cs
+// Version: 20181231
+
+using System.Runtime.InteropServices;
+
+namespace Meta.Vlc.Interop.Media
+{
+    /// <summary>
+    ///     A slave of a libvlc_media_t
+    /// </summary>
+    /// <seealso cref="Media.libvlc_media_slaves_get" />
+    [StructLayout(LayoutKind.Sequential)]
+    public unsafe struct libvlc_media_slave_t
+    {
+        public byte* psz_uri;
+        public libvlc_media_slave_type_t i_type;
+        public uint i_priority;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public unsafe struct libvlc_media_track_t
+    {
+        /* Codec fourcc */
+        public uint i_codec;
+
+        public uint i_original_fourcc;
+        
+        public int i_id;
+        
+        public libvlc_track_type_t i_type;
+
+        /* Codec specific */
+        public int i_profile;
+        
+        public int i_level;
+        
+        public void* data;
+        
+        public uint i_bitrate;
+        
+        public byte* psz_language;
+        
+        public byte* psz_description;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+    public unsafe struct libvlc_subtitle_track_t
+    {
+        public byte* psz_encoding;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+    public struct libvlc_video_track_t
+    {
+        public uint i_height;
+        public uint i_width;
+        public uint i_sar_num;
+        public uint i_sar_den;
+        public uint i_frame_rate_num;
+        public uint i_frame_rate_den;
+
+        public libvlc_video_orient_t i_orientation;
+        public libvlc_video_projection_t i_projection;
+        public libvlc_video_viewpoint_t pose; /**< Initial view point */
+        public libvlc_video_multiview_t i_multiview;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct libvlc_video_viewpoint_t
+    {
+        /// <summary>
+        ///     view point yaw in degrees  ]-180;180]
+        /// </summary>
+        public float f_yaw;
+
+        /// <summary>
+        ///     view point pitch in degrees  ]-90;90]
+        /// </summary>
+        public float f_pitch;
+
+        /// <summary>
+        ///     view point roll in degrees ]-180;180]
+        /// </summary>
+        public float f_roll;
+
+        /// <summary>
+        ///     field of view in degrees ]0;180[ (default 80.)
+        /// </summary>
+        public float f_field_of_view;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct libvlc_audio_track_t
+    {
+        public uint i_channels;
+        public uint i_rate;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct libvlc_media_track_info_t_audio
+    {
+        public uint i_channels;
+        public uint i_rate;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct libvlc_media_track_info_t_video
+    {
+        public uint i_height;
+        public uint i_width;
+    }
+
+    [StructLayout(LayoutKind.Explicit)]
+    public struct libvlc_media_track_info_t
+    {
+        /* Codec fourcc */
+        [FieldOffset(0)] public uint i_codec;
+        [FieldOffset(Platform.UIntSize)] public int i_id;
+
+        [FieldOffset(Platform.UIntSize + Platform.IntSize)]
+        public libvlc_track_type_t i_type;
+
+        /* Codec specific */
+        [FieldOffset(Platform.UIntSize + Platform.IntSize + Platform.IntSize)]
+        public int i_profile;
+
+        [FieldOffset(Platform.UIntSize + Platform.IntSize + Platform.IntSize + Platform.IntSize)]
+        public int i_level;
+
+        /* Audio specific */
+        [FieldOffset(Platform.UIntSize + Platform.IntSize + Platform.IntSize + Platform.IntSize + Platform.IntSize)]
+        public libvlc_media_track_info_t_audio audio;
+
+        /* Video specific */
+        [FieldOffset(Platform.UIntSize + Platform.IntSize + Platform.IntSize + Platform.IntSize + Platform.IntSize)]
+        public libvlc_media_track_info_t_video video;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct libvlc_media_stats_t
+    {
+        /* Input */
+        public int i_read_bytes;
+        public float f_input_bitrate;
+
+        /* Demux */
+        public int i_demux_read_bytes;
+        public float f_demux_bitrate;
+        public int i_demux_corrupted;
+        public int i_demux_discontinuity;
+
+        /* Decoders */
+        public int i_decoded_video;
+        public int i_decoded_audio;
+
+        /* Video Output */
+        public int i_displayed_pictures;
+        public int i_lost_pictures;
+
+        /* Audio output */
+        public int i_played_abuffers;
+        public int i_lost_abuffers;
+
+        /* Stream output */
+        public int i_sent_packets;
+        public int i_sent_bytes;
+        public float f_send_bitrate;
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Interop/MediaPlayer/Callback.cs b/Meta.Vlc/Interop/MediaPlayer/Callback.cs
new file mode 100644
index 0000000..451ffb5
--- /dev/null
+++ b/Meta.Vlc/Interop/MediaPlayer/Callback.cs
@@ -0,0 +1,192 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: Callback.cs
+// Version: 20181231
+
+using System.Runtime.InteropServices;
+
+namespace Meta.Vlc.Interop.MediaPlayer
+{
+    /// <summary>
+    ///     Callback prototype to allocate and lock a picture buffer.
+    ///     <para />
+    ///     Whenever a new video frame needs to be decoded, the lock callback is
+    ///     invoked. Depending on the video chroma, one or three pixel planes of
+    ///     adequate dimensions must be returned via the second parameter. Those
+    ///     planes must be aligned on 32-bytes boundaries.
+    /// </summary>
+    /// <param name="opaque">private pointer as passed to <see cref="libvlc_video_set_callbacks" /> [IN]</param>
+    /// <param name="planes">
+    ///     start address of the pixel planes (LibVLC allocates the array of void pointers, this callback must
+    ///     initialize the array) [OUT]
+    /// </param>
+    /// <returns>a private pointer for the display and unlock callbacks to identify the picture buffers</returns>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate void* libvlc_video_lock_cb(void* opaque, void** planes);
+
+    /// <summary>
+    ///     Callback prototype to unlock a picture buffer.
+    ///     <para />
+    ///     When the video frame decoding is complete, the unlock callback is invoked.
+    ///     This callback might not be needed at all. It is only an indication that the
+    ///     application can now read the pixel values if it needs to.
+    /// </summary>
+    /// <param name="opaque">A picture buffer is unlocked after the picture is decoded, but before the picture is displayed.</param>
+    /// <param name="picture">private pointer as passed to <see cref="libvlc_video_set_callbacks" /> [IN]</param>
+    /// <param name="planes">
+    ///     private pointer returned from the <see cref="libvlc_video_lock_cb" /> callback (this parameter is
+    ///     only for convenience) [IN]
+    /// </param>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate void libvlc_video_unlock_cb(void* opaque, void* picture, void** planes);
+
+    /// <summary>
+    ///     Callback prototype to display a picture.
+    ///     <para />
+    ///     When the video frame needs to be shown, as determined by the media playback
+    ///     clock, the display callback is invoked.
+    /// </summary>
+    /// <param name="opaque">private pointer as passed to <see cref="libvlc_video_set_callbacks" /> [IN]</param>
+    /// <param name="picture">private pointer returned from the <see cref="libvlc_video_lock_cb" /> callback [IN]</param>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate void libvlc_video_display_cb(void* opaque, void* picture);
+
+    /// <summary>
+    ///     Callback prototype to configure picture buffers format.
+    ///     This callback gets the format of the video as output by the video decoder
+    ///     and the chain of video filters (if any). It can opt to change any parameter
+    ///     as it needs. In that case, LibVLC will attempt to convert the video format
+    ///     (rescaling and chroma conversion) but these operations can be CPU intensive.
+    /// </summary>
+    /// <param name="opaque">pointer to the private pointer passed to <see cref="libvlc_video_set_callbacks" /> [IN/OUT]</param>
+    /// <param name="chroma">pointer to the 4 bytes video format identifier [IN/OUT]</param>
+    /// <param name="width">pointer to the pixel width [IN/OUT]</param>
+    /// <param name="height">pointer to the pixel height [IN/OUT]</param>
+    /// <param name="pitches">table of scanline pitches in bytes for each pixel plane (the table is allocated by LibVLC) [OUT]</param>
+    /// <param name="lines">table of scanlines count for each plane [OUT]</param>
+    /// <returns>the number of picture buffers allocated, 0 indicates failure</returns>
+    /// <remarks>
+    ///     For each pixels plane, the scanline pitch must be bigger than or equal to
+    ///     the number of bytes per pixel multiplied by the pixel width.
+    ///     Similarly, the number of scanlines must be bigger than of equal to
+    ///     the pixel height.
+    ///     <para />
+    ///     Furthermore, we recommend that pitches and lines be multiple of 32
+    ///     to not break assumptions that might be held by optimized code
+    ///     in the video decoders, video filters and/or video converters.
+    /// </remarks>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate uint libvlc_video_format_cb(void** opaque, byte* chroma, uint* width, uint* height,
+        uint* pitches, uint* lines);
+
+    /// <summary>
+    ///     Callback prototype to configure picture buffers format.
+    /// </summary>
+    /// <param name="opaque">
+    ///     opaque private pointer as passed to <see cref="libvlc_video_set_callbacks" /> (and possibly
+    ///     modified by <see cref="libvlc_video_format_cb" />) [IN]
+    /// </param>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate void libvlc_video_cleanup_cb(void* opaque);
+
+    /// <summary>
+    ///     Callback prototype for audio playback.
+    ///     <para />
+    ///     The LibVLC media player decodes and post-processes the audio signal
+    ///     asynchronously (in an internal thread). Whenever audio samples are ready
+    ///     to be queued to the output, this callback is invoked.
+    ///     <para />
+    ///     The number of samples provided per invocation may depend on the file format,
+    ///     the audio coding algorithm, the decoder plug-in, the post-processing
+    ///     filters and timing. Application must not assume a certain number of samples.
+    ///     <para />
+    ///     The exact format of audio samples is determined by <see cref="libvlc_audio_set_format" />
+    ///     or <see cref="libvlc_audio_set_format_callbacks" /> as is the channels layout.
+    ///     <para />
+    ///     Note that the number of samples is per channel. For instance, if the audio
+    ///     track sampling rate is 48000 Hz, then 1200 samples represent 25 milliseconds
+    ///     of audio signal - regardless of the number of audio channels.
+    /// </summary>
+    /// <param name="data">data pointer as passed to <see cref="libvlc_audio_set_callbacks" /> [IN]</param>
+    /// <param name="samples">pointer to a table of audio samples to play back [IN]</param>
+    /// <param name="count">number of audio samples to play back</param>
+    /// <param name="pts">expected play time stamp (see libvlc_delay())</param>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate void libvlc_audio_play_cb(void* data, void* samples, uint count, long pts);
+
+    /// <summary>
+    ///     Callback prototype for audio pause.
+    ///     <para />
+    ///     LibVLC invokes this callback to pause audio playback.
+    /// </summary>
+    /// <param name="data">data pointer as passed to <see cref="libvlc_audio_set_callbacks" /> [IN]</param>
+    /// <param name="pts">time stamp of the pause request (should be elapsed already)</param>
+    /// <remarks>The pause callback is never called if the audio is already paused.</remarks>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate void libvlc_audio_pause_cb(void* data, long pts);
+
+    /// <summary>
+    ///     Callback prototype for audio resumption.
+    ///     <para />
+    ///     LibVLC invokes this callback to resume audio playback after it was
+    ///     previously paused.
+    /// </summary>
+    /// <param name="data">data pointer as passed to <see cref="libvlc_audio_set_callbacks" /> [IN]</param>
+    /// <param name="pts">time stamp of the resumption request (should be elapsed already)</param>
+    /// <remarks>The resume callback is never called if the audio is not paused.</remarks>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate void libvlc_audio_resume_cb(void* data, long pts);
+
+    /// <summary>
+    ///     Callback prototype for audio buffer flush.
+    ///     <para />
+    ///     LibVLC invokes this callback if it needs to discard all pending buffers and
+    ///     stop playback as soon as possible. This typically occurs when the media is
+    ///     stopped.
+    /// </summary>
+    /// <param name="data">data pointer as passed to <see cref="libvlc_audio_set_callbacks" /> [IN]</param>
+    /// <param name="pts"></param>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate void libvlc_audio_flush_cb(void* data, long pts);
+
+    /// <summary>
+    ///     Callback prototype for audio buffer drain.
+    ///     <para />
+    ///     LibVLC may invoke this callback when the decoded audio track is ending.
+    ///     There will be no further decoded samples for the track, but playback should
+    ///     nevertheless continue until all already pending buffers are rendered.
+    /// </summary>
+    /// <param name="data">data pointer as passed to <see cref="libvlc_audio_set_callbacks" /> [IN]</param>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate void libvlc_audio_drain_cb(void* data);
+
+    /// <summary>
+    ///     Callback prototype for audio volume change.
+    /// </summary>
+    /// <param name="data">data pointer as passed to <see cref="libvlc_audio_set_callbacks" /> [IN]</param>
+    /// <param name="volume">software volume (1. = nominal, 0. = mute)</param>
+    /// <param name="mute">muted flag</param>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate void libvlc_audio_set_volume_cb(void* data, float volume, bool mute);
+
+    /// <summary>
+    ///     Callback prototype to setup the audio playback.
+    ///     <para />
+    ///     This is called when the media player needs to create a new audio output.
+    /// </summary>
+    /// <param name="data">pointer to the data pointer passed to libvlc_audio_set_callbacks() [IN/OUT]</param>
+    /// <param name="format">4 bytes sample format [IN/OUT]</param>
+    /// <param name="rate">sample rate [IN/OUT]</param>
+    /// <param name="channels">channels count [IN/OUT]</param>
+    /// <returns>0 on success, anything else to skip audio playback</returns>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate int libvlc_audio_setup_cb(void** data, char* format, uint* rate, uint* channels);
+
+    /// <summary>
+    ///     Callback prototype for audio playback cleanup.
+    ///     <para />
+    ///     This is called when the media player no longer needs an audio output.
+    /// </summary>
+    /// <param name="data">data pointer as passed to <see cref="libvlc_audio_set_callbacks" /> [IN]</param>
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public unsafe delegate void libvlc_audio_cleanup_cb(void* data);
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Interop/MediaPlayer/Enum.cs b/Meta.Vlc/Interop/MediaPlayer/Enum.cs
new file mode 100644
index 0000000..033812c
--- /dev/null
+++ b/Meta.Vlc/Interop/MediaPlayer/Enum.cs
@@ -0,0 +1,204 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: Enum.cs
+// Version: 20181231
+
+using Meta.Vlc.Interop.MediaPlayer.Video;
+
+namespace Meta.Vlc.Interop.MediaPlayer
+{
+    /// <summary>
+    ///     Description for titles
+    /// </summary>
+    public enum libvlc_title_t
+    {
+        libvlc_title_menu = 0x01,
+        libvlc_title_interactive = 0x02
+    }
+
+    /// <summary>
+    ///     Marq options definition
+    /// </summary>
+    public enum libvlc_video_marquee_option_t
+    {
+        libvlc_marquee_Enable = 0,
+
+        /// <summary>
+        ///     string argument
+        /// </summary>
+        libvlc_marquee_Text,
+        libvlc_marquee_Color,
+        libvlc_marquee_Opacity,
+        libvlc_marquee_Position,
+        libvlc_marquee_Refresh,
+        libvlc_marquee_Size,
+        libvlc_marquee_Timeout,
+        libvlc_marquee_X,
+        libvlc_marquee_Y
+    }
+
+    /// <summary>
+    ///     Navigation mode
+    /// </summary>
+    public enum libvlc_navigate_mode_t : uint
+    {
+        libvlc_navigate_activate = 0,
+        libvlc_navigate_up,
+        libvlc_navigate_down,
+        libvlc_navigate_left,
+        libvlc_navigate_right,
+        libvlc_navigate_popup
+    }
+
+    /// <summary>
+    ///     Enumeration of values used to set position (e.g. of video title).
+    /// </summary>
+    public enum libvlc_position_t
+    {
+        libvlc_position_disable = -1,
+        libvlc_position_center,
+        libvlc_position_left,
+        libvlc_position_right,
+        libvlc_position_top,
+        libvlc_position_top_left,
+        libvlc_position_top_right,
+        libvlc_position_bottom,
+        libvlc_position_bottom_left,
+        libvlc_position_bottom_right
+    }
+
+    /// <summary>
+    ///     Enumeration of teletext keys than can be passed via <see cref="libvlc_video_set_teletext" />
+    /// </summary>
+    public enum libvlc_teletext_key_t
+    {
+        libvlc_teletext_key_red = 'r' << 16,
+        libvlc_teletext_key_green = 'g' << 16,
+        libvlc_teletext_key_yellow = 'y' << 16,
+        libvlc_teletext_key_blue = 'b' << 16,
+        libvlc_teletext_key_index = 'i' << 16
+    }
+
+    namespace Video
+    {
+        /// <summary>
+        ///     option values for libvlc_video_{get,set}_logo_{int,string}
+        /// </summary>
+        public enum libvlc_video_logo_option_t : uint
+        {
+            libvlc_logo_enable,
+
+            /// <summary>
+            ///     string argument, "file,d,t;file,d,t;..."
+            /// </summary>
+            libvlc_logo_file,
+            libvlc_logo_x,
+            libvlc_logo_y,
+            libvlc_logo_delay,
+            libvlc_logo_repeat,
+            libvlc_logo_opacity,
+            libvlc_logo_position
+        }
+
+        /// <summary>
+        ///     option values for libvlc_video_{get,set}_adjust_{int,float,bool}
+        /// </summary>
+        public enum libvlc_video_adjust_option_t : uint
+        {
+            libvlc_adjust_Enable = 0,
+            libvlc_adjust_Contrast,
+            libvlc_adjust_Brightness,
+            libvlc_adjust_Hue,
+            libvlc_adjust_Saturation,
+            libvlc_adjust_Gamma
+        }
+    }
+
+    namespace Audio
+    {
+        /// <summary>
+        ///     Audio device types
+        /// </summary>
+        public enum libvlc_audio_output_device_types_t
+        {
+            libvlc_AudioOutputDevice_Error = -1,
+            libvlc_AudioOutputDevice_Mono = 1,
+            libvlc_AudioOutputDevice_Stereo = 2,
+            libvlc_AudioOutputDevice_2F2R = 4,
+            libvlc_AudioOutputDevice_3F2R = 5,
+            libvlc_AudioOutputDevice_5_1 = 6,
+            libvlc_AudioOutputDevice_6_1 = 7,
+            libvlc_AudioOutputDevice_7_1 = 8,
+            libvlc_AudioOutputDevice_SPDIF = 10
+        }
+
+        /// <summary>
+        ///     Audio channels
+        /// </summary>
+        public enum libvlc_audio_output_channel_t
+        {
+            libvlc_AudioChannel_Error = -1,
+            libvlc_AudioChannel_Stereo = 1,
+            libvlc_AudioChannel_RStereo = 2,
+            libvlc_AudioChannel_Left = 3,
+            libvlc_AudioChannel_Right = 4,
+            libvlc_AudioChannel_Dolbys = 5
+        }
+
+        /// <summary>
+        ///     Media player roles.
+        /// </summary>
+        /// <seealso cref="libvlc_media_player_set_role" />
+        public enum libvlc_media_player_role_t
+        {
+            /// <summary>
+            ///     Don't use a media player role
+            /// </summary>
+            libvlc_role_None = 0,
+
+            /// <summary>
+            ///     Music (or radio) playback
+            /// </summary>
+            libvlc_role_Music,
+
+            /// <summary>
+            ///     Video playback
+            /// </summary>
+            libvlc_role_Video,
+
+            /// <summary>
+            ///     Speech, real-time communication
+            /// </summary>
+            libvlc_role_Communication,
+
+            /// <summary>
+            ///     Video game
+            /// </summary>
+            libvlc_role_Game,
+
+            /// <summary>
+            ///     User interaction feedback
+            /// </summary>
+            libvlc_role_Notification,
+
+            /// <summary>
+            ///     Embedded animation (e.g. in web page)
+            /// </summary>
+            libvlc_role_Animation,
+
+            /// <summary>
+            ///     Audio editting/production
+            /// </summary>
+            libvlc_role_Production,
+
+            /// <summary>
+            ///     Accessibility
+            /// </summary>
+            libvlc_role_Accessibility,
+
+            /// <summary>
+            ///     Testing
+            /// </summary>
+            libvlc_role_Test
+        }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Interop/MediaPlayer/Function.cs b/Meta.Vlc/Interop/MediaPlayer/Function.cs
new file mode 100644
index 0000000..96a30bd
--- /dev/null
+++ b/Meta.Vlc/Interop/MediaPlayer/Function.cs
@@ -0,0 +1,1635 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: Function.cs
+// Version: 20181231
+
+using System.Runtime.InteropServices;
+using Meta.Vlc.Interop.Core;
+using Meta.Vlc.Interop.Media;
+using VlcTime = System.Int64;
+
+namespace Meta.Vlc.Interop.MediaPlayer
+{
+    /// <summary>
+    ///     Create an empty Media Player object
+    /// </summary>
+    /// <param name="p_libvlc_instance">
+    ///     the libvlc instance in which the Media Player should be created.
+    /// </param>
+    /// <returns>a new media player object, or NULL on error.</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_new))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void* libvlc_media_player_new(void* p_libvlc_instance);
+
+    /// <summary>
+    ///     Create a Media Player object from a Media
+    /// </summary>
+    /// <param name="p_md">the media. Afterwards the p_md can be safely destroyed.</param>
+    /// <returns>a new media player object, or NULL on error.</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_new_from_media))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void* libvlc_media_player_new_from_media(void* p_md);
+
+    /// <summary>
+    ///     Release a media_player after use
+    ///     Decrement the reference count of a media player object. If the
+    ///     reference count is 0, then <see cref="libvlc_media_player_release" /> will
+    ///     release the media player object. If the media player object
+    ///     has been released, then it should not be used again.
+    /// </summary>
+    /// <param name="p_mi">the Media Player to free</param>
+    [LibVlcFunction(nameof(libvlc_media_player_release))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_player_release(void* p_mi);
+
+    /// <summary>
+    ///     Retain a reference to a media player object. Use <see cref="libvlc_media_player_release" /> to decrement reference
+    ///     count.
+    /// </summary>
+    /// <param name="p_mi">media player object</param>
+    [LibVlcFunction(nameof(libvlc_media_player_retain))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_player_retain(void* p_mi);
+
+    /// <summary>
+    ///     Set the media that will be used by the media_player. If any, previous md will be released.
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <param name="p_md">the Media. Afterwards the p_md can be safely destroyed.</param>
+    [LibVlcFunction(nameof(libvlc_media_player_set_media))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_player_set_media(void* p_mi, void* p_md);
+
+    /// <summary>
+    ///     Get the media used by the media_player.
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <returns>the media associated with p_mi, or NULL if no media is associated</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_get_media))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void* libvlc_media_player_get_media(void* p_mi);
+
+    /// <summary>
+    ///     Get the Event Manager from which the media player send event.
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <returns>the event manager associated with p_mi</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_event_manager))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void* libvlc_media_player_event_manager(void* p_mi);
+
+    /// <summary>
+    ///     is playing
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <returns>1 if the media player is playing, 0 otherwise</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_is_playing))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate bool libvlc_media_player_is_playing(void* p_mi);
+
+    /// <summary>
+    ///     Play
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <returns>0 if playback started (and was already started), or -1 on error.</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_play))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate int libvlc_media_player_play(void* p_mi);
+
+    /// <summary>
+    ///     Pause or resume (no effect if there is no media)
+    /// </summary>
+    /// <param name="mp">the Media Player</param>
+    /// <param name="do_pause">play/resume if zero, pause if non-zero</param>
+    [LibVlcFunction(nameof(libvlc_media_player_set_pause), "1.1.1")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_player_set_pause(void* mp, int do_pause);
+
+    /// <summary>
+    ///     Toggle pause (no effect if there is no media)
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    [LibVlcFunction(nameof(libvlc_media_player_pause))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_player_pause(void* p_mi);
+
+    /// <summary>
+    ///     Stop (no effect if there is no media)
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    [LibVlcFunction(nameof(libvlc_media_player_stop))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_player_stop(void* p_mi);
+
+    /// <summary>
+    ///     Set a renderer to the media player
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <param name="p_item">an item discovered by libvlc_renderer_discoverer_start</param>
+    /// <returns>0 on success, -1 on error.</returns>
+    /// seealso libvlc_renderer_discoverer_new
+    /// <remarks>
+    ///     must be called before the first call of <see cref="libvlc_media_player_play" /> to take effect.
+    /// </remarks>
+    [LibVlcFunction(nameof(libvlc_media_player_set_renderer), "3.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate int libvlc_media_player_set_renderer(void* p_mi, void* p_item);
+
+    /// <summary>
+    ///     Set callbacks and private data to render decoded video to a custom area
+    ///     in memory.
+    ///     Use <see cref="libvlc_video_set_format" /> or <see cref="libvlc_video_set_format_callbacks" />
+    ///     to configure the decoded format.
+    ///     <para />
+    ///     warning: Rendering video into custom memory buffers is considerably less
+    ///     efficient than rendering in a custom window as normal.
+    ///     <para />
+    ///     For optimal perfomances, VLC media player renders into a custom window, and
+    ///     does not use this function and associated callbacks. It is
+    ///     <b>
+    ///         highly
+    ///         recommended
+    ///     </b>
+    ///     that other LibVLC-based application do likewise.
+    ///     To embed video in a window, use libvlc_media_player_set_xid() or equivalent
+    ///     depending on the operating system.
+    ///     <para />
+    ///     If window embedding does not fit the application use case, then a custom
+    ///     LibVLC video output display plugin is required to maintain optimal video
+    ///     rendering performances.
+    ///     <para />
+    ///     The following limitations affect performance:
+    ///     <para />
+    ///     - Hardware video decoding acceleration will either be disabled completely,
+    ///     or require (relatively slow) copy from video/DSP memory to main memory.
+    ///     <para />
+    ///     - Sub-pictures (subtitles, on-screen display, etc.) must be blent into the
+    ///     main picture by the CPU instead of the GPU.
+    ///     <para />
+    ///     - Depending on the video format, pixel format conversion, picture scaling,
+    ///     cropping and/or picture re-orientation, must be performed by the CPU
+    ///     instead of the GPU.
+    ///     <para />
+    ///     - Memory copying is required between LibVLC reference picture buffers and
+    ///     application buffers (between lock and unlock callbacks).
+    ///     <para />
+    /// </summary>
+    /// <param name="mp">the media player</param>
+    /// <param name="lock_cb">callback to lock video memory (must not be NULL)</param>
+    /// <param name="unlock_cb">callback to unlock video memory (or NULL if not needed)</param>
+    /// <param name="display_cb">callback to display video (or NULL if not needed)</param>
+    /// <param name="opaque">private pointer for the three callbacks (as first parameter)</param>
+    [LibVlcFunction(nameof(libvlc_video_set_callbacks), "1.1.1")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_video_set_callbacks(void* mp,
+        libvlc_video_lock_cb lock_cb,
+        libvlc_video_unlock_cb unlock_cb,
+        libvlc_video_display_cb display_cb,
+        void* opaque);
+
+    /// <summary>
+    ///     Set decoded video chroma and dimensions.
+    ///     This only works in combination with <see cref="libvlc_video_set_callbacks" />,
+    ///     and is mutually exclusive with <see cref="libvlc_video_set_format_callbacks" />.
+    /// </summary>
+    /// <param name="mp">the media player</param>
+    /// <param name="chroma">a four-characters string identifying the chroma (e.g. "RV32" or "YUYV")</param>
+    /// <param name="width">pixel width</param>
+    /// <param name="height">pixel height</param>
+    /// <param name="pitch">line pitch (in bytes)</param>
+    /// <remarks>
+    ///     All pixel planes are expected to have the same pitch.
+    ///     <para />
+    ///     To use the YCbCr color space with chrominance subsampling, consider using
+    ///     <see cref="libvlc_video_set_format_callbacks" /> instead.
+    ///     consider using libvlc_video_set_format_callbacks() instead.
+    /// </remarks>
+    [LibVlcFunction(nameof(libvlc_video_set_format), "1.1.1")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_video_set_format(void* mp, byte* chroma, uint width, uint height, uint pitch);
+
+    /// <summary>
+    ///     Set decoded video chroma and dimensions. This only works in combination with
+    ///     <see cref="libvlc_video_set_callbacks" />.
+    /// </summary>
+    /// <param name="mp">the media player</param>
+    /// <param name="setup">callback to select the video format (cannot be NULL)</param>
+    /// <param name="cleanup">callback to release any allocated resources (or NULL)</param>
+    [LibVlcFunction(nameof(libvlc_video_set_format_callbacks), "2.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_video_set_format_callbacks(void* mp,
+        libvlc_video_format_cb setup,
+        libvlc_video_cleanup_cb cleanup);
+
+    /// <summary>
+    ///     Set a Win32/Win64 API window handle (HWND) where the media player should
+    ///     render its video output. If LibVLC was built without Win32/Win64 API output
+    ///     support, then this has no effects.
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <param name="drawable">windows handle of the drawable</param>
+    [LibVlcFunction(nameof(libvlc_media_player_set_hwnd))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_player_set_hwnd(void* p_mi, void* drawable);
+
+    /// <summary>
+    ///     Get the Windows API window handle (HWND) previously set with
+    ///     libvlc_media_player_set_hwnd(). The handle will be returned even if LibVLC
+    ///     is not currently outputting any video to it.
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <returns>a window handle or NULL if there are none.</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_get_hwnd))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void* libvlc_media_player_get_hwnd(void* p_mi);
+
+    /**
+     * Sets callbacks and private data for decoded audio.
+     *
+     * Use libvlc_audio_set_format() or libvlc_audio_set_format_callbacks()
+     * to configure the decoded audio format.
+     *
+     * \note The audio callbacks override any other audio output mechanism.
+     * If the callbacks are set, LibVLC will <b>not</b> output audio in any way.
+     *
+     * \param mp the media player
+     * \param play callback to play audio samples (must not be NULL)
+     * \param pause callback to pause playback (or NULL to ignore)
+     * \param resume callback to resume playback (or NULL to ignore)
+     * \param flush callback to flush audio buffers (or NULL to ignore)
+     * \param drain callback to drain audio buffers (or NULL to ignore)
+     * \param opaque private pointer for the audio callbacks (as first parameter)
+     * \version LibVLC 2.0.0 or later
+     */
+    /// <summary>
+    ///     Sets callbacks and private data for decoded audio.
+    ///     <para />
+    ///     Use <see cref="libvlc_audio_set_format" /> or <see cref="libvlc_audio_set_format_callbacks" />
+    ///     to configure the decoded audio format.
+    /// </summary>
+    /// <param name="mp">the media player</param>
+    /// <param name="play">callback to play audio samples (must not be NULL)</param>
+    /// <param name="pause">callback to pause playback (or NULL to ignore)</param>
+    /// <param name="resume">callback to resume playback (or NULL to ignore)</param>
+    /// <param name="flush">callback to flush audio buffers (or NULL to ignore)</param>
+    /// <param name="drain">callback to drain audio buffers (or NULL to ignore)</param>
+    /// <param name="opaque">private pointer for the audio callbacks (as first parameter)</param>
+    [LibVlcFunction(nameof(libvlc_audio_set_callbacks), "2.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_audio_set_callbacks(void* mp,
+        libvlc_audio_play_cb play,
+        libvlc_audio_pause_cb pause,
+        libvlc_audio_resume_cb resume,
+        libvlc_audio_flush_cb flush,
+        libvlc_audio_drain_cb drain,
+        void* opaque);
+
+    /// <summary>
+    ///     Set callbacks and private data for decoded audio. This only works in
+    ///     combination with <see cref="libvlc_audio_set_callbacks" />.
+    ///     <para />
+    ///     Use <see cref="libvlc_audio_set_format" /> or <see cref="libvlc_audio_set_format_callbacks" />
+    ///     to configure the decoded audio format.
+    /// </summary>
+    /// <param name="mp">the media player</param>
+    /// <param name="set_volume">callback to apply audio volume, or NULL to apply volume in software</param>
+    [LibVlcFunction(nameof(libvlc_audio_set_callbacks), "2.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_audio_set_volume_callback(void* mp,
+        libvlc_audio_set_volume_cb set_volume);
+
+    /// <summary>
+    ///     Sets decoded audio format via callbacks.
+    ///     <para />
+    ///     This only works in combination with <see cref="libvlc_audio_set_callbacks" />.
+    /// </summary>
+    /// <param name="mp">the media player</param>
+    /// <param name="setup">callback to select the audio format (cannot be NULL)</param>
+    /// <param name="cleanup">callback to release any allocated resources (or NULL)</param>
+    [LibVlcFunction(nameof(libvlc_audio_set_callbacks), "2.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_audio_set_format_callbacks(void* mp,
+        libvlc_audio_setup_cb setup,
+        libvlc_audio_cleanup_cb cleanup);
+
+    /// <summary>
+    ///     Sets a fixed decoded audio format.
+    ///     <para />
+    ///     This only works in combination with <see cref="libvlc_audio_set_callbacks" />,
+    ///     and is mutually exclusive with <see cref="libvlc_audio_set_format_callbacks" />.
+    /// </summary>
+    /// <param name="mp">the media player</param>
+    /// <param name="format">a four-characters string identifying the sample format (e.g. "S16N" or "FL32")</param>
+    /// <param name="rate">sample rate (expressed in Hz)</param>
+    /// <param name="channels">channels count</param>
+    [LibVlcFunction(nameof(libvlc_audio_set_callbacks), "2.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_audio_set_format(void* mp, byte* format, uint rate, uint channels);
+
+    /// <summary>
+    ///     Get the current movie length (in ms).
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <returns>the movie length (in ms), or -1 if there is no media.</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_get_length))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate long libvlc_media_player_get_length(void* p_mi);
+
+    /// <summary>
+    ///     Get the current movie time (in ms).
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <returns>the movie time (in ms), or -1 if there is no media.</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_get_time))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate long libvlc_media_player_get_time(void* p_mi);
+
+    /// <summary>
+    ///     Set the movie time (in ms). This has no effect if no media is being played.
+    ///     Not all formats and protocols support this.
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <param name="i_time">the movie time (in ms).</param>
+    [LibVlcFunction(nameof(libvlc_media_player_set_time))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_player_set_time(void* p_mi, long i_time);
+
+    /// <summary>
+    ///     Get movie position as percentage between 0.0 and 1.0.
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <returns>movie position, or -1. in case of error</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_get_position))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate float libvlc_media_player_get_position(void* p_mi);
+
+    /// <summary>
+    ///     Set movie position as percentage between 0.0 and 1.0.
+    ///     This has no effect if playback is not enabled.
+    ///     This might not work depending on the underlying input format and protocol.
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <param name="f_pos">the position</param>
+    [LibVlcFunction(nameof(libvlc_media_player_set_position))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_player_set_position(void* p_mi, float f_pos);
+
+    /// <summary>
+    ///     Set movie chapter (if applicable).
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <param name="i_chapter">chapter number to play</param>
+    [LibVlcFunction(nameof(libvlc_media_player_set_chapter))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_player_set_chapter(void* p_mi, int i_chapter);
+
+    /// <summary>
+    ///     Get movie chapter.
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <returns>chapter number currently playing, or -1 if there is no media.</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_get_chapter))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate int libvlc_media_player_get_chapter(void* p_mi);
+
+    /// <summary>
+    ///     Get movie chapter count
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <returns>number of chapters in movie, or -1.</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_get_chapter_count))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate int libvlc_media_player_get_chapter_count(void* p_mi);
+
+    /// <summary>
+    ///     Is the player able to play
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <returns></returns>
+    [LibVlcFunction(nameof(libvlc_media_player_will_play))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate bool libvlc_media_player_will_play(void* p_mi);
+
+    /// <summary>
+    ///     Get title chapter count
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <param name="i_title">title</param>
+    /// <returns>number of chapters in title, or -1</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_get_chapter_count_for_title))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate int libvlc_media_player_get_chapter_count_for_title(
+        void* p_mi, int i_title);
+
+    /// <summary>
+    ///     Set movie title
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <param name="i_title">title number to play</param>
+    [LibVlcFunction(nameof(libvlc_media_player_set_title))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_player_set_title(void* p_mi, int i_title);
+
+    /// <summary>
+    ///     Get movie title
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <returns>title number currently playing, or -1</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_get_title))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate int libvlc_media_player_get_title(void* p_mi);
+
+    /// <summary>
+    ///     Get movie title count
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <returns>title number count, or -1</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_get_title_count))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate int libvlc_media_player_get_title_count(void* p_mi);
+
+    /// <summary>
+    ///     Set previous chapter (if applicable)
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    [LibVlcFunction(nameof(libvlc_media_player_previous_chapter))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_player_previous_chapter(void* p_mi);
+
+    /// <summary>
+    ///     Set next chapter (if applicable)
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    [LibVlcFunction(nameof(libvlc_media_player_next_chapter))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_player_next_chapter(void* p_mi);
+
+    /// <summary>
+    ///     Get the requested movie play rate.
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <returns>movie play rate</returns>
+    /// <remarks>
+    ///     Depending on the underlying media, the requested rate may be
+    ///     different from the real playback rate.
+    /// </remarks>
+    [LibVlcFunction(nameof(libvlc_media_player_get_rate))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate float libvlc_media_player_get_rate(void* p_mi);
+
+    /// <summary>
+    ///     Set movie play rate
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <param name="rate">movie play rate to set</param>
+    /// <returns>
+    ///     -1 if an error was detected, 0 otherwise (but even then, it might
+    ///     not actually work depending on the underlying media protocol)
+    /// </returns>
+    [LibVlcFunction(nameof(libvlc_media_player_set_rate))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate int libvlc_media_player_set_rate(void* p_mi, float rate);
+
+    /// <summary>
+    ///     Get current movie state
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <returns>the current state of the media player (playing, paused, ...)</returns>
+    /// <seealso cref="libvlc_state_t" />
+    [LibVlcFunction(nameof(libvlc_media_player_get_state))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate libvlc_state_t libvlc_media_player_get_state(void* p_mi);
+
+    /// <summary>
+    ///     How many video outputs does this media player have?
+    /// </summary>
+    /// <param name="p_mi">the media player</param>
+    /// <returns>the number of video outputs</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_has_vout))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate uint libvlc_media_player_has_vout(void* p_mi);
+
+    /// <summary>
+    ///     Is this media player seekable?
+    /// </summary>
+    /// <param name="p_mi">the media player</param>
+    /// <returns>true if the media player can seek</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_is_seekable))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate bool libvlc_media_player_is_seekable(void* p_mi);
+
+    /// <summary>
+    ///     Can this media player be paused?
+    /// </summary>
+    /// <param name="p_mi">the media player</param>
+    /// <returns>true if the media player can pause</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_can_pause))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate bool libvlc_media_player_can_pause(void* p_mi);
+
+    /// <summary>
+    ///     Check if the current program is scrambled
+    /// </summary>
+    /// <param name="p_mi">the media player</param>
+    /// <returns>true if the current program is scrambled</returns>
+    [LibVlcFunction(nameof(libvlc_media_player_program_scrambled), "2.2.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate int libvlc_media_player_program_scrambled(void* p_mi);
+
+    /// <summary>
+    ///     Display the next frame (if supported)
+    /// </summary>
+    /// <param name="p_mi">the media player</param>
+    [LibVlcFunction(nameof(libvlc_media_player_next_frame))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_player_next_frame(void* p_mi);
+
+    /// <summary>
+    ///     Navigate through DVD Menu
+    /// </summary>
+    /// <param name="p_mi">the Media Player</param>
+    /// <param name="navigate">the Navigation mode</param>
+    [LibVlcFunction(nameof(libvlc_media_player_navigate), "2.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_player_navigate(void* p_mi,
+        libvlc_navigate_mode_t navigate);
+
+    /// <summary>
+    ///     Set if, and how, the video title will be shown when media is played.
+    /// </summary>
+    /// <param name="p_mi">the media player</param>
+    /// <param name="position">
+    ///     position at which to display the title, or
+    ///     <see cref="libvlc_position_t.libvlc_position_disable" /> to prevent the title from being displayed
+    /// </param>
+    /// <param name="timeout">
+    ///     title display timeout in milliseconds (ignored if
+    ///     <see cref="libvlc_position_t.libvlc_position_disable" />)
+    /// </param>
+    [LibVlcFunction(nameof(libvlc_media_player_set_video_title_display), "2.1.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_media_player_set_video_title_display(void* p_mi, libvlc_position_t position,
+        uint timeout);
+
+    /// <summary>
+    ///     Add a slave to the current media player.
+    /// </summary>
+    /// <param name="p_mi">the media player</param>
+    /// <param name="i_type">subtitle or audio</param>
+    /// <param name="psz_uri">Uri of the slave (should contain a valid scheme).</param>
+    /// <param name="b_select">True if this slave should be selected when it's loaded</param>
+    /// <returns>0 on success, -1 on error.</returns>
+    /// <remarks>
+    ///     If the player is playing, the slave will be added directly. This call
+    ///     will also update the slave list of the attached libvlc_media_t.
+    /// </remarks>
+    /// <seealso cref="libvlc_media_slaves_add" />
+    [LibVlcFunction(nameof(libvlc_media_player_add_slave), "3.0.0")]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate int libvlc_media_player_add_slave(void* p_mi,
+        libvlc_media_slave_type_t i_type,
+        byte* psz_uri, bool b_select);
+
+    /// <summary>
+    ///     Release (free) libvlc_track_description_t
+    /// </summary>
+    /// <param name="p_track_description">the structure to release</param>
+    [LibVlcFunction(nameof(libvlc_track_description_list_release))]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    public unsafe delegate void libvlc_track_description_list_release(libvlc_track_description_t* p_track_description);
+
+    namespace Video
+    {
+        /// <summary>
+        ///     Toggle fullscreen status on non-embedded video outputs.
+        /// </summary>
+        /// <param name="p_mi">the media player</param>
+        /// <remarks>
+        ///     The same limitations applies to this function
+        ///     as to libvlc_set_fullscreen().
+        /// </remarks>
+        [LibVlcFunction(nameof(libvlc_toggle_fullscreen))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_toggle_fullscreen(void* p_mi);
+
+        /// <summary>
+        ///     Enable or disable fullscreen.
+        /// </summary>
+        /// <param name="p_mi">the media player</param>
+        /// <param name="b_fullscreen">boolean for fullscreen status</param>
+        /// <remarks>
+        ///     With most window managers, only a top-level windows can be in
+        ///     full-screen mode. Hence, this function will not operate properly if
+        ///     libvlc_media_player_set_xwindow was used to embed the video in a
+        ///     non-top-level window. In that case, the embedding window must be reparented
+        ///     to the root window <b>before</b> fullscreen mode is enabled. You will want
+        ///     to reparent it back to its normal parent when disabling fullscreen.
+        /// </remarks>
+        [LibVlcFunction(nameof(libvlc_set_fullscreen))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_set_fullscreen(void* p_mi, bool b_fullscreen);
+
+        /// <summary>
+        ///     Get current fullscreen status.
+        /// </summary>
+        /// <param name="p_mi">the media player</param>
+        /// <returns>the fullscreen status (boolean)</returns>
+        [LibVlcFunction(nameof(libvlc_get_fullscreen))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate bool libvlc_get_fullscreen(void* p_mi);
+
+        /// <summary>
+        ///     Enable or disable key press events handling, according to the LibVLC hotkeys
+        ///     configuration. By default and for historical reasons, keyboard events are
+        ///     handled by the LibVLC video widget.
+        ///     On X11, there can be only one subscriber for key press and mouse
+        ///     click events per window. If your application has subscribed to those events
+        ///     for the X window ID of the video widget, then LibVLC will not be able to
+        ///     handle key presses and mouse clicks in any case.
+        /// </summary>
+        /// <param name="p_mi">the media player</param>
+        /// <param name="on">true to handle key press events, false to ignore them.</param>
+        /// <remarks>
+        ///     This function is only implemented for X11 and Win32 at the moment.
+        /// </remarks>
+        [LibVlcFunction(nameof(libvlc_video_set_key_input))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_video_set_key_input(void* p_mi, uint on);
+
+        /// <summary>
+        ///     Enable or disable mouse click events handling. By default, those events are
+        ///     handled. This is needed for DVD menus to work, as well as a few video
+        ///     filters such as "puzzle".
+        /// </summary>
+        /// <param name="p_mi">the media player</param>
+        /// <param name="on">true to handle mouse click events, false to ignore them.</param>
+        /// <remarks>
+        ///     This function is only implemented for X11 and Win32 at the moment.
+        /// </remarks>
+        /// <seealso cref="libvlc_video_set_key_input" />
+        [LibVlcFunction(nameof(libvlc_video_set_mouse_input))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_video_set_mouse_input(void* p_mi, uint on);
+
+        /// <summary>
+        ///     Get the pixel dimensions of a video.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <param name="num">number of the video (starting from, and most commonly 0)</param>
+        /// <param name="px">pointer to get the pixel width [OUT]</param>
+        /// <param name="py">pointer to get the pixel height [OUT]</param>
+        /// <returns>0 on success, -1 if the specified video does not exist</returns>
+        [LibVlcFunction(nameof(libvlc_video_get_size))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_video_get_size(void* p_mi, uint num, uint* px, uint* py);
+
+
+        /**
+         * Get the mouse pointer coordinates over a video.
+         * Coordinates are expressed in terms of the decoded video resolution,
+         * <b>not</b> in terms of pixels on the screen/viewport (to get the latter,
+         * you can query your windowing system directly).
+         *
+         * Either of the coordinates may be negative or larger than the corresponding
+         * dimension of the video, if the cursor is outside the rendering area.
+         *
+         * @warning The coordinates may be out-of-date if the pointer is not located
+         * on the video rendering area. LibVLC does not track the pointer if it is
+         * outside of the video widget.
+         *
+         * @note LibVLC does not support multiple pointers (it does of course support
+         * multiple input devices sharing the same pointer) at the moment.
+         *
+         * \param p_mi media player
+         * \param num number of the video (starting from, and most commonly 0)
+         * \param px pointer to get the abscissa [OUT]
+         * \param py pointer to get the ordinate [OUT]
+         * \return 0 on success, -1 if the specified video does not exist
+         */
+        [LibVlcFunction(nameof(libvlc_video_get_cursor))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_video_get_cursor(void* p_mi, uint num,
+            int* px, int* py);
+
+        /**
+         * Get the current video scaling factor.
+         * See also libvlc_video_set_scale().
+         *
+         * \param p_mi the media player
+         * \return the currently configured zoom factor, or 0. if the video is set
+         * to fit to the output window/drawable automatically.
+         */
+        [LibVlcFunction(nameof(libvlc_video_get_scale))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate float libvlc_video_get_scale(void* p_mi);
+
+        /**
+         * Set the video scaling factor. That is the ratio of the number of pixels on
+         * screen to the number of pixels in the original decoded video in each
+         * dimension. Zero is a special value; it will adjust the video to the output
+         * window/drawable (in windowed mode) or the entire screen.
+         *
+         * Note that not all video outputs support scaling.
+         *
+         * \param p_mi the media player
+         * \param f_factor the scaling factor, or zero
+         */
+        [LibVlcFunction(nameof(libvlc_video_set_scale))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_video_set_scale(void* p_mi, float f_factor);
+
+        /**
+         * Get current video aspect ratio.
+         *
+         * \param p_mi the media player
+         * \return the video aspect ratio or NULL if unspecified
+         * (the result must be released with free() or libvlc_free()).
+         */
+        [LibVlcFunction(nameof(libvlc_video_get_aspect_ratio))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate byte* libvlc_video_get_aspect_ratio(void* p_mi);
+
+        /**
+         * Set new video aspect ratio.
+         *
+         * \param p_mi the media player
+         * \param psz_aspect new video aspect-ratio or NULL to reset to default
+         * \note Invalid aspect ratios are ignored.
+         */
+        [LibVlcFunction(nameof(libvlc_video_set_aspect_ratio))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_video_set_aspect_ratio(void* p_mi, byte* psz_aspect);
+
+        /// <summary>
+        ///     Create a video viewpoint structure.
+        /// </summary>
+        /// <returns>video viewpoint or NULL (the result must be released with free() or libvlc_free()).</returns>
+        [LibVlcFunction(nameof(libvlc_video_new_viewpoint), "3.0.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate libvlc_video_viewpoint_t* libvlc_video_new_viewpoint();
+
+        /// <summary>
+        ///     Update the video viewpoint information.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <param name="p_viewpoint">video viewpoint allocated via <see cref="libvlc_video_new_viewpoint" /></param>
+        /// <param name="b_absolute">if true replace the old viewpoint with the new one. If false, increase/decrease it.</param>
+        /// <returns>-1 in case of error, 0 otherwise</returns>
+        /// <remarks>
+        ///     It is safe to call this function before the media player is started.
+        ///     <para />
+        ///     the values are set asynchronously, it will be used by the next frame displayed.
+        /// </remarks>
+        [LibVlcFunction(nameof(libvlc_video_update_viewpoint), "3.0.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_video_update_viewpoint(void* p_mi,
+            libvlc_video_viewpoint_t* p_viewpoint,
+            bool b_absolute);
+
+        /// <summary>
+        ///     Get current video subtitle.
+        /// </summary>
+        /// <param name="p_mi">the media player</param>
+        /// <returns>the video subtitle selected, or -1 if none</returns>
+        [LibVlcFunction(nameof(libvlc_video_get_spu))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_video_get_spu(void* p_mi);
+
+        /// <summary>
+        ///     Get the number of available video subtitles.
+        /// </summary>
+        /// <param name="p_mi">the media player</param>
+        /// <returns>the number of available video subtitles</returns>
+        [LibVlcFunction(nameof(libvlc_video_get_spu_count))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_video_get_spu_count(void* p_mi);
+
+        /// <summary>
+        ///     Get the description of available video subtitles.
+        /// </summary>
+        /// <param name="p_mi">the media player</param>
+        /// <returns>
+        ///     list containing description of available video subtitles. It must be freed with
+        ///     <see cref="libvlc_track_description_list_release" />
+        /// </returns>
+        [LibVlcFunction(nameof(libvlc_video_get_spu_description))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate libvlc_track_description_t* libvlc_video_get_spu_description(void* p_mi);
+
+        /// <summary>
+        ///     Set new video subtitle.
+        /// </summary>
+        /// <param name="p_mi">the media player</param>
+        /// <param name="i_spu">video subtitle track to select (i_id from track description)</param>
+        /// <returns>0 on success, -1 if out of range</returns>
+        [LibVlcFunction(nameof(libvlc_video_set_spu))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_video_set_spu(void* p_mi, int i_spu);
+
+        /// <summary>
+        ///     Get the current subtitle delay. Positive values means subtitles are being
+        ///     displayed later, negative values earlier.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <returns>time (in microseconds) the display of subtitles is being delayed</returns>
+        [LibVlcFunction(nameof(libvlc_video_get_spu_delay), "2.0.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate long libvlc_video_get_spu_delay(void* p_mi);
+
+        /// <summary>
+        ///     Set the subtitle delay. This affects the timing of when the subtitle will
+        ///     be displayed. Positive values result in subtitles being displayed later,
+        ///     while negative values will result in subtitles being displayed earlier.
+        ///     <para />
+        ///     The subtitle delay will be reset to zero each time the media changes.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <param name="i_delay">time (in microseconds) the display of subtitles should be delayed</param>
+        /// <returns>0 on success, -1 on error</returns>
+        [LibVlcFunction(nameof(libvlc_video_set_spu_delay), "2.0.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_video_set_spu_delay(void* p_mi, long i_delay);
+
+        /// <summary>
+        ///     Get the full description of available titles
+        /// </summary>
+        /// <param name="p_mi">the media player</param>
+        /// <param name="titles">
+        ///     address to store an allocated array of title descriptions
+        ///     descriptions (must be freed with <see cref="libvlc_title_descriptions_release" />
+        ///     by the caller) [OUT]
+        /// </param>
+        /// <returns>the number of titles (-1 on error)</returns>
+        [LibVlcFunction(nameof(libvlc_media_player_get_full_title_descriptions), "3.0.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_media_player_get_full_title_descriptions(void* p_mi,
+            libvlc_title_description_t*** titles);
+
+        /// <summary>
+        ///     Release a title description
+        /// </summary>
+        /// <param name="p_titles">title description array to release</param>
+        /// <param name="i_count">number of title descriptions to release</param>
+        [LibVlcFunction(nameof(libvlc_title_descriptions_release), "3.0.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_title_descriptions_release(libvlc_title_description_t** p_titles,
+            uint i_count);
+
+        /// <summary>
+        ///     Get the full description of available chapters
+        /// </summary>
+        /// <param name="p_mi">the media player</param>
+        /// <param name="i_chapters_of_title">index of the title to query for chapters (uses current title if set to -1)</param>
+        /// <param name="pp_chapters">
+        ///     address to store an allocated array of chapter descriptions
+        ///     descriptions (must be freed with <see cref="libvlc_chapter_descriptions_release" />
+        ///     by the caller) [OUT]
+        /// </param>
+        /// <returns>the number of chapters (-1 on error)</returns>
+        [LibVlcFunction(nameof(libvlc_media_player_get_full_chapter_descriptions), "3.0.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_media_player_get_full_chapter_descriptions(void* p_mi,
+            int i_chapters_of_title,
+            libvlc_chapter_description_t*** pp_chapters);
+
+        /// <summary>
+        ///     Release a chapter description
+        /// </summary>
+        /// <param name="p_chapters">chapter description array to release</param>
+        /// <param name="i_count">number of chapter descriptions to release</param>
+        [LibVlcFunction(nameof(libvlc_chapter_descriptions_release), "3.0.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_chapter_descriptions_release(libvlc_chapter_description_t** p_chapters,
+            uint i_count);
+
+        /// <summary>
+        ///     Get current crop filter geometry.
+        /// </summary>
+        /// <param name="p_mi">the media player</param>
+        /// <returns>the crop filter geometry or NULL if unset</returns>
+        [LibVlcFunction(nameof(libvlc_video_get_crop_geometry))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate byte* libvlc_video_get_crop_geometry(void* p_mi);
+
+        /// <summary>
+        ///     Set new crop filter geometry.
+        /// </summary>
+        /// <param name="p_mi">the media player</param>
+        /// <param name="psz_geometry">new crop filter geometry (NULL to unset)</param>
+        [LibVlcFunction(nameof(libvlc_video_set_crop_geometry))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_video_set_crop_geometry(void* p_mi, byte* psz_geometry);
+
+        /// <summary>
+        ///     Get current teletext page requested or 0 if it's disabled.
+        ///     <para />
+        ///     Teletext is disabled by default, call <see cref="libvlc_video_set_teletext" /> to enable it.
+        /// </summary>
+        /// <param name="p_mi">the media player</param>
+        /// <returns>the current teletext page requested.</returns>
+        [LibVlcFunction(nameof(libvlc_video_get_teletext))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_video_get_teletext(void* p_mi);
+
+        /// <summary>
+        ///     Set new teletext page to retrieve.
+        ///     <para />
+        ///     This function can also be used to send a teletext key.
+        /// </summary>
+        /// <param name="p_mi">the media player</param>
+        /// <param name="i_page">
+        ///     teletex page number requested. This value can be 0 to disable
+        ///     teletext, a number in the range ]0;1000[ to show the requested page, or a
+        ///     <see cref="libvlc_teletext_key_t" />. 100 is the default teletext page.
+        /// </param>
+        [LibVlcFunction(nameof(libvlc_video_set_teletext))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_video_set_teletext(void* p_mi, int i_page);
+
+        /// <summary>
+        ///     Get number of available video tracks.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <returns>the number of available video tracks (int)</returns>
+        [LibVlcFunction(nameof(libvlc_video_get_track_count))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_video_get_track_count(void* p_mi);
+
+        /// <summary>
+        ///     Get the description of available video tracks.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <returns>
+        ///     list with description of available video tracks, or NULL on error. It must be freed with
+        ///     <see cref="libvlc_track_description_list_release" />
+        /// </returns>
+        [LibVlcFunction(nameof(libvlc_video_get_track_count))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate libvlc_track_description_t* libvlc_video_get_track_description(void* p_mi);
+
+        /// <summary>
+        ///     Get current video track.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <returns>the video track ID (int) or -1 if no active input</returns>
+        [LibVlcFunction(nameof(libvlc_video_get_track))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_video_get_track(void* p_mi);
+
+        /// <summary>
+        ///     Set video track.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <param name="i_track">the track ID (i_id field from track description)</param>
+        /// <returns>0 on success, -1 if out of range</returns>
+        [LibVlcFunction(nameof(libvlc_video_set_track))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_video_set_track(void* p_mi, int i_track);
+
+        /// <summary>
+        ///     Take a snapshot of the current video window.
+        ///     If i_width AND i_height is 0, original size is used.
+        ///     If i_width XOR i_height is 0, original aspect-ratio is preserved.
+        /// </summary>
+        /// <param name="p_mi">media player instance</param>
+        /// <param name="num">number of video output (typically 0 for the first/only one)</param>
+        /// <param name="psz_filepath">the path of a file or a folder to save the screenshot into</param>
+        /// <param name="i_width">the snapshot's width</param>
+        /// <param name="i_height">the snapshot's height</param>
+        /// <returns>0 on success, -1 if the video was not found</returns>
+        [LibVlcFunction(nameof(libvlc_video_take_snapshot))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_video_take_snapshot(void* p_mi, uint num,
+            byte* psz_filepath, uint i_width,
+            uint i_height);
+
+        /// <summary>
+        ///     Enable or disable deinterlace filter
+        /// </summary>
+        /// <param name="p_mi">libvlc media player</param>
+        /// <param name="deinterlace">state -1: auto (default), 0: disabled, 1: enabled</param>
+        /// <param name="psz_mode">type of deinterlace filter, NULL for current/default filter</param>
+        [LibVlcFunction(nameof(libvlc_video_set_deinterlace), "4.0.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_video_set_deinterlace(void* p_mi,
+            int deinterlace,
+            byte* psz_mode);
+
+        /// <summary>
+        ///     Get an integer marquee option value
+        /// </summary>
+        /// <param name="p_mi">libvlc media player</param>
+        /// <param name="option">option marq option to get <see cref="libvlc_video_marquee_option_t" /></param>
+        /// <returns></returns>
+        [LibVlcFunction(nameof(libvlc_video_get_marquee_int))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_video_get_marquee_int(void* p_mi,
+            uint option);
+
+        /// <summary>
+        ///     Get a string marquee option value
+        /// </summary>
+        /// <param name="p_mi">libvlc media player</param>
+        /// <param name="option">option marq option to get <see cref="libvlc_video_marquee_option_t" /></param>
+        /// <returns></returns>
+        [LibVlcFunction(nameof(libvlc_video_get_marquee_string))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate byte* libvlc_video_get_marquee_string(void* p_mi,
+            uint option);
+
+        /// <summary>
+        ///     Enable, disable or set an integer marquee option
+        ///     <para />
+        ///     Setting libvlc_marquee_Enable has the side effect of enabling (arg !0)
+        ///     or disabling (arg 0) the marq filter.
+        /// </summary>
+        /// <param name="p_mi">libvlc media player</param>
+        /// <param name="option">option marq option to get <see cref="libvlc_video_marquee_option_t" /></param>
+        /// <param name="i_val">marq option value</param>
+        [LibVlcFunction(nameof(libvlc_video_set_marquee_int))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_video_set_marquee_int(void* p_mi,
+            uint option, int i_val);
+
+        /// <summary>
+        ///     Set a marquee string option
+        /// </summary>
+        /// <param name="p_mi">libvlc media player</param>
+        /// <param name="option">option marq option to get <see cref="libvlc_video_marquee_option_t" /></param>
+        /// <param name="psz_text">marq option value</param>
+        [LibVlcFunction(nameof(libvlc_video_set_marquee_string))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_video_set_marquee_string(void* p_mi,
+            uint option, byte* psz_text);
+
+        /// <summary>
+        ///     Get integer logo option.
+        /// </summary>
+        /// <param name="p_mi">libvlc media player instance</param>
+        /// <param name="option">logo option to get, values of <see cref="libvlc_video_logo_option_t" /></param>
+        /// <returns></returns>
+        [LibVlcFunction(nameof(libvlc_video_get_logo_int))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_video_get_logo_int(void* p_mi,
+            libvlc_video_logo_option_t option);
+
+        /**
+         * Set logo option as integer. Options that take a different type value
+         * are ignored.
+         * Passing libvlc_logo_enable as option value has the side effect of
+         * starting (arg !0) or stopping (arg 0) the logo filter.
+         *
+         * \param p_mi libvlc media player instance
+         * \param option logo option to set, values of libvlc_video_logo_option_t
+         * \param value logo option value
+         */
+        /// <summary>
+        ///     Set logo option as integer. Options that take a different type value
+        ///     are ignored.
+        ///     Passing libvlc_logo_enable as option value has the side effect of
+        ///     starting (arg !0) or stopping (arg 0) the logo filter.
+        /// </summary>
+        /// <param name="p_mi">libvlc media player instance</param>
+        /// <param name="option">logo option to set, values of <see cref="libvlc_video_logo_option_t" /></param>
+        /// <param name="value">logo option value</param>
+        [LibVlcFunction(nameof(libvlc_video_set_logo_int))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_video_set_logo_int(void* p_mi,
+            libvlc_video_logo_option_t option, int value);
+
+        /// <summary>
+        ///     Set logo option as string. Options that take a different type value
+        ///     are ignored.
+        /// </summary>
+        /// <param name="p_mi">libvlc media player instance</param>
+        /// <param name="option">logo option to set, values of <see cref="libvlc_video_logo_option_t" /></param>
+        /// <param name="psz_value">logo option value</param>
+        [LibVlcFunction(nameof(libvlc_video_set_logo_string))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_video_set_logo_string(void* p_mi,
+            libvlc_video_logo_option_t option, byte* psz_valueSubtitle);
+
+        /// <summary>
+        ///     Get integer adjust option.
+        /// </summary>
+        /// <param name="p_mi">libvlc media player instance</param>
+        /// <param name="option">adjust option to get, values of <see cref="libvlc_video_adjust_option_t" /></param>
+        /// <returns></returns>
+        [LibVlcFunction(nameof(libvlc_video_get_adjust_int), "1.1.1")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_video_get_adjust_int(void* p_mi,
+            libvlc_video_adjust_option_t option);
+
+        /// <summary>
+        ///     Set adjust option as integer. Options that take a different type value
+        ///     are ignored.
+        ///     Passing libvlc_adjust_enable as option value has the side effect of
+        ///     starting (arg !0) or stopping (arg 0) the adjust filter.
+        /// </summary>
+        /// <param name="p_mi">libvlc media player instance</param>
+        /// <param name="option">logo option to set, values of <see cref="libvlc_video_logo_option_t" /></param>
+        /// <param name="value">adjust option value</param>
+        [LibVlcFunction(nameof(libvlc_video_set_adjust_int), "1.1.1")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_video_set_adjust_int(void* p_mi,
+            libvlc_video_adjust_option_t option, int value);
+
+        /// <summary>
+        ///     Get float adjust option.
+        /// </summary>
+        /// <param name="p_mi">libvlc media player instance</param>
+        /// <param name="option">adjust option to get, values of <see cref="libvlc_video_adjust_option_t" /></param>
+        /// <returns></returns>
+        [LibVlcFunction(nameof(libvlc_video_get_adjust_float), "1.1.1")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate float libvlc_video_get_adjust_float(void* p_mi,
+            libvlc_video_adjust_option_t option);
+
+        /// <summary>
+        ///     Set adjust option as float. Options that take a different type value are ignored.
+        /// </summary>
+        /// <param name="p_mi">libvlc media player instance</param>
+        /// <param name="option">adust option to set, values of <see cref="libvlc_video_adjust_option_t" /></param>
+        /// <param name="value">adjust option value</param>
+        [LibVlcFunction(nameof(libvlc_video_set_adjust_float), "1.1.1")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_video_set_adjust_float(void* p_mi,
+            libvlc_video_adjust_option_t option, float value);
+    }
+
+    namespace Audio
+    {
+        /// <summary>
+        ///     Gets the list of available audio output modules.
+        /// </summary>
+        /// <param name="p_instance">libvlc instance</param>
+        /// <returns>
+        ///     list of available audio outputs. It must be freed with
+        ///     <see cref="libvlc_audio_output_list_release" /> <see cref="libvlc_audio_output_t" />.
+        ///     In case of error, NULL is returned.
+        /// </returns>
+        [LibVlcFunction(nameof(libvlc_audio_output_list_get))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate libvlc_audio_output_t* libvlc_audio_output_list_get(void* p_instance);
+
+        /// <summary>
+        ///     Frees the list of available audio output modules.
+        /// </summary>
+        /// <param name="p_list">list with audio outputs for release</param>
+        [LibVlcFunction(nameof(libvlc_audio_output_list_release))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_audio_output_list_release(libvlc_audio_output_t* p_list);
+
+        /// <summary>
+        ///     Selects an audio output module.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <param name="psz_name">name of audio output, use psz_name of <see cref="libvlc_audio_output_t" /></param>
+        /// <returns>0 if function succeeded, -1 on error</returns>
+        /// <remarks>
+        ///     Any change will take be effect only after playback is stopped and
+        ///     restarted. Audio output cannot be changed while playing.
+        /// </remarks>
+        [LibVlcFunction(nameof(libvlc_audio_output_set))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_audio_output_set(void* p_mi,
+            byte* psz_name);
+
+        /// <summary>
+        ///     Gets a list of potential audio output devices, <see cref="libvlc_audio_output_device_set" />
+        /// </summary>
+        /// <param name="mp">media player</param>
+        /// <returns>
+        ///     A NULL-terminated linked list of potential audio output devices.
+        ///     It must be freed with <see cref="libvlc_audio_output_device_list_release" />
+        /// </returns>
+        /// <remarks>
+        ///     Not all audio outputs support enumerating devices.
+        ///     The audio output may be functional even if the list is empty (NULL).
+        ///     <para />
+        ///     The list may not be exhaustive.
+        ///     <para />
+        ///     warning: Some audio output devices in the list might not actually work in
+        ///     some circumstances. By default, it is recommended to not specify any
+        ///     explicit audio device.
+        /// </remarks>
+        [LibVlcFunction(nameof(libvlc_audio_output_set), "2.2.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate libvlc_audio_output_device_t* libvlc_audio_output_device_enum(void* mp);
+
+        /// <summary>
+        ///     Gets a list of audio output devices for a given audio output module, <see cref="libvlc_audio_output_device_set" />.
+        /// </summary>
+        /// <param name="p_instance">libvlc instance</param>
+        /// <param name="aout">audio output name (as returned by <see cref="libvlc_audio_output_list_get" />)</param>
+        /// <returns>
+        ///     A NULL-terminated linked list of potential audio output devices. It must be freed with
+        ///     <see cref="libvlc_audio_output_device_list_release" />
+        /// </returns>
+        /// <remarks>
+        ///     Not all audio outputs support this. In particular, an empty (NULL)
+        ///     list of devices does <b>not</b> imply that the specified audio output does
+        ///     not work.
+        ///     <para />
+        ///     The list may not be exhaustive.
+        ///     <para />
+        ///     warning: Some audio output devices in the list might not actually work in
+        ///     some circumstances. By default, it is recommended to not specify any
+        ///     explicit audio device.
+        /// </remarks>
+        [LibVlcFunction(nameof(libvlc_audio_output_set), "2.1.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate libvlc_audio_output_device_t* libvlc_audio_output_device_list_get(void* p_instance,
+            byte* aout);
+
+        /// <summary>
+        ///     Frees a list of available audio output devices.
+        /// </summary>
+        /// <param name="p_list">list with audio outputs for release</param>
+        [LibVlcFunction(nameof(libvlc_audio_output_device_list_release), "2.1.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_audio_output_device_list_release(
+            libvlc_audio_output_device_t* p_list);
+
+        /// <summary>
+        ///     Configures an explicit audio output device.
+        ///     <para />
+        ///     If the module paramater is NULL, audio output will be moved to the device
+        ///     specified by the device identifier string immediately. This is the
+        ///     recommended usage.
+        ///     <para />
+        ///     A list of adequate potential device strings can be obtained with
+        ///     <see cref="libvlc_audio_output_device_enum" />.
+        ///     <para />
+        ///     However passing NULL is supported in LibVLC version 2.2.0 and later only;
+        ///     in earlier versions, this function would have no effects when the module
+        ///     parameter was NULL.
+        ///     <para />
+        ///     If the module parameter is not NULL, the device parameter of the
+        ///     corresponding audio output, if it exists, will be set to the specified
+        ///     string. Note that some audio output modules do not have such a parameter
+        ///     (notably MMDevice and PulseAudio).
+        ///     <para />
+        ///     A list of adequate potential device strings can be obtained with
+        ///     <see cref="libvlc_audio_output_device_list_get" />.
+        /// </summary>
+        /// <param name="mp">media player</param>
+        /// <param name="module">
+        ///     If NULL, current audio output module.
+        ///     if non-NULL, name of audio output module
+        ///     (<see cref="libvlc_audio_output_t" />)
+        /// </param>
+        /// <param name="device_id">device identifier string</param>
+        /// <remarks>
+        ///     note: This function does not select the specified audio output plugin.
+        ///     libvlc_audio_output_set() is used for that purpose.
+        ///     <para />
+        ///     warning: The syntax for the device parameter depends on the audio output.
+        ///     <para />
+        ///     Some audio output modules require further parameters (e.g. a channels map
+        ///     in the case of ALSA).
+        /// </remarks>
+        [LibVlcFunction(nameof(libvlc_audio_output_device_set))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_audio_output_device_set(void* mp,
+            byte* module,
+            byte* device_id);
+
+        /// <summary>
+        ///     Get the current audio output device identifier.
+        ///     <para />
+        ///     This complements <see cref="libvlc_audio_output_device_set" />.
+        /// </summary>
+        /// <param name="mp"></param>
+        /// <returns>
+        ///     the current audio output device identifier
+        ///     NULL if no device is selected or in case of error
+        ///     (the result must be released with free() or <see cref="libvlc_free" />).
+        /// </returns>
+        /// <remarks>
+        ///     warning: The initial value for the current audio output device identifier
+        ///     may not be set or may be some unknown value. A LibVLC application should
+        ///     compare this value against the known device identifiers (e.g. those that
+        ///     were previously retrieved by a call to <see cref="libvlc_audio_output_device_enum" /> or
+        ///     <see cref="libvlc_audio_output_device_list_get" />) to find the current audio output device.
+        ///     <para />
+        ///     It is possible that the selected audio output device changes (an external
+        ///     change) without a call to libvlc_audio_output_device_set. That may make this
+        ///     method unsuitable to use if a LibVLC application is attempting to track
+        ///     dynamic audio device changes as they happen.
+        /// </remarks>
+        [LibVlcFunction(nameof(libvlc_audio_output_device_get), "3.0.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate byte* libvlc_audio_output_device_get(void* mp);
+
+        /// <summary>
+        ///     Toggle mute status.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <remarks>
+        ///     warning: Toggling mute atomically is not always possible: On some platforms,
+        ///     other processes can mute the VLC audio playback stream asynchronously. Thus,
+        ///     there is a small race condition where toggling will not work.
+        ///     See also the limitations of <see cref="libvlc_audio_set_mute" />.
+        /// </remarks>
+        [LibVlcFunction(nameof(libvlc_audio_toggle_mute))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_audio_toggle_mute(void* p_mi);
+
+        /// <summary>
+        ///     Get current mute status.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <returns>the mute status (boolean) if defined, -1 if undefined/unapplicable</returns>
+        [LibVlcFunction(nameof(libvlc_audio_get_mute))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_audio_get_mute(void* p_mi);
+
+        /// <summary>
+        ///     Set mute status.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <param name="status">If status is true then mute, otherwise unmute</param>
+        /// <remarks>
+        ///     warning: This function does not always work. If there are no active audio
+        ///     playback stream, the mute status might not be available. If digital
+        ///     pass-through (S/PDIF, HDMI...) is in use, muting may be unapplicable. Also
+        ///     some audio output plugins do not support muting at all.
+        ///     note: To force silent playback, disable all audio tracks. This is more
+        ///     efficient and reliable than mute.
+        /// </remarks>
+        [LibVlcFunction(nameof(libvlc_audio_set_mute))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_audio_set_mute(void* p_mi, int status);
+
+        /// <summary>
+        ///     Get current software audio volume.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <returns>the software volume in percents (0 = mute, 100 = nominal / 0dB)</returns>
+        [LibVlcFunction(nameof(libvlc_audio_get_volume))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_audio_get_volume(void* p_mi);
+
+        /// <summary>
+        ///     Set current software audio volume.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <param name="i_volume">the volume in percents (0 = mute, 100 = 0dB)</param>
+        /// <returns>0 if the volume was set, -1 if it was out of range</returns>
+        [LibVlcFunction(nameof(libvlc_audio_set_volume))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_audio_set_volume(void* p_mi, int i_volume);
+
+        /// <summary>
+        ///     Get number of available audio tracks.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <returns>the number of available audio tracks (int), or -1 if unavailable</returns>
+        [LibVlcFunction(nameof(libvlc_audio_get_track_count))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_audio_get_track_count(void* p_mi);
+
+        /// <summary>
+        ///     Get the description of available audio tracks.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <returns>
+        ///     list with description of available audio tracks, or NULL. It must be freed with
+        ///     <see cref="libvlc_track_description_list_release" />
+        /// </returns>
+        [LibVlcFunction(nameof(libvlc_audio_get_track_count))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate libvlc_track_description_t* libvlc_audio_get_track_description(void* p_mi);
+
+        /// <summary>
+        ///     Get current audio track.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <returns>the audio track ID or -1 if no active input.</returns>
+        [LibVlcFunction(nameof(libvlc_audio_get_track))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_audio_get_track(void* p_mi);
+
+        /// <summary>
+        ///     Set current audio track.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <param name="i_track">the track ID (i_id field from track description)</param>
+        /// <returns>0 on success, -1 on error</returns>
+        [LibVlcFunction(nameof(libvlc_audio_set_track))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_audio_set_track(void* p_mi, int i_track);
+
+        /// <summary>
+        ///     Get current audio channel.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <returns>the audio channel <see cref="libvlc_audio_output_channel_t" /></returns>
+        [LibVlcFunction(nameof(libvlc_audio_get_channel))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate libvlc_audio_output_channel_t libvlc_audio_get_channel(void* p_mi);
+
+        /// <summary>
+        ///     Set current audio channel.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <param name="channel">the audio channel, <see cref="libvlc_audio_output_channel_t" /></param>
+        /// <returns>0 on success, -1 on error</returns>
+        [LibVlcFunction(nameof(libvlc_audio_set_channel))]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_audio_set_channel(void* p_mi, libvlc_audio_output_channel_t channel);
+
+        /// <summary>
+        ///     Get current audio delay.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <returns>the audio delay (microseconds)</returns>
+        [LibVlcFunction(nameof(libvlc_audio_get_delay), "1.1.1")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate long libvlc_audio_get_delay(void* p_mi);
+
+        /// <summary>
+        ///     Set current audio delay. The audio delay will be reset to zero each time the media changes.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <param name="i_delay">the audio delay (microseconds)</param>
+        /// <returns>0 on success, -1 on error</returns>
+        [LibVlcFunction(nameof(libvlc_audio_set_delay), "1.1.1")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_audio_set_delay(void* p_mi, long i_delay);
+
+        /// <summary>
+        ///     Get the number of equalizer presets.
+        /// </summary>
+        /// <returns>number of presets</returns>
+        [LibVlcFunction(nameof(libvlc_audio_equalizer_get_preset_count), "2.2.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public delegate uint libvlc_audio_equalizer_get_preset_count();
+
+        /// <summary>
+        ///     Get the name of a particular equalizer preset.
+        ///     <para />
+        ///     This name can be used, for example, to prepare a preset label or menu in a user
+        ///     interface.
+        /// </summary>
+        /// <param name="u_index">index of the preset, counting from zero</param>
+        /// <returns>preset name, or NULL if there is no such preset</returns>
+        [LibVlcFunction(nameof(libvlc_audio_equalizer_get_preset_name), "2.2.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate byte* libvlc_audio_equalizer_get_preset_name(uint u_index);
+
+        /// <summary>
+        ///     Get the number of distinct frequency bands for an equalizer.
+        /// </summary>
+        /// <returns>number of frequency bands</returns>
+        [LibVlcFunction(nameof(libvlc_audio_equalizer_get_band_count), "2.2.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public delegate uint libvlc_audio_equalizer_get_band_count();
+
+        /// <summary>
+        ///     Get a particular equalizer band frequency.
+        ///     <para />
+        ///     This value can be used, for example, to create a label for an equalizer band control
+        ///     in a user interface.
+        /// </summary>
+        /// <param name="u_index">index of the band, counting from zero</param>
+        /// <returns>equalizer band frequency (Hz), or -1 if there is no such band</returns>
+        [LibVlcFunction(nameof(libvlc_audio_equalizer_get_band_frequency), "2.2.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public delegate float libvlc_audio_equalizer_get_band_frequency(uint u_index);
+
+        /// <summary>
+        ///     Create a new default equalizer, with all frequency values zeroed.
+        ///     <para />
+        ///     The new equalizer can subsequently be applied to a media player by invoking
+        ///     <see cref="libvlc_media_player_set_equalizer" />.
+        ///     <para />
+        ///     The returned handle should be freed via <see cref="libvlc_audio_equalizer_release" /> when
+        ///     it is no longer needed.
+        /// </summary>
+        /// <returns>opaque equalizer handle, or NULL on error</returns>
+        [LibVlcFunction(nameof(libvlc_audio_equalizer_new), "2.2.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void* libvlc_audio_equalizer_new();
+
+        /// <summary>
+        ///     Create a new equalizer, with initial frequency values copied from an existing
+        ///     preset.
+        ///     <para />
+        ///     The new equalizer can subsequently be applied to a media player by invoking
+        ///     <see cref="libvlc_media_player_set_equalizer" />.
+        ///     <para />
+        ///     The returned handle should be freed via libvlc_audio_equalizer_release() when
+        ///     it is no longer needed.
+        /// </summary>
+        /// <param name="u_index">index of the preset, counting from zero</param>
+        /// <returns>opaque equalizer handle, or NULL on error</returns>
+        [LibVlcFunction(nameof(libvlc_audio_equalizer_new_from_preset), "2.2.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void* libvlc_audio_equalizer_new_from_preset(uint u_index);
+
+        /// <summary>
+        ///     Release a previously created equalizer instance.
+        ///     <para />
+        ///     The equalizer was previously created by using <see cref="libvlc_audio_equalizer_new" /> or
+        ///     <see cref="libvlc_audio_equalizer_new_from_preset" />.
+        ///     <para />
+        ///     It is safe to invoke this method with a NULL p_equalizer parameter for no effect.
+        /// </summary>
+        /// <param name="p_equalizer"></param>
+        [LibVlcFunction(nameof(libvlc_audio_equalizer_release), "2.2.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate void libvlc_audio_equalizer_release(void* p_equalizer);
+
+        /// <summary>
+        ///     Set a new pre-amplification value for an equalizer.
+        ///     <para />
+        ///     The new equalizer settings are subsequently applied to a media player by invoking
+        ///     libvlc_media_player_set_equalizer().
+        ///     <para />
+        ///     The supplied amplification value will be clamped to the -20.0 to +20.0 range.
+        /// </summary>
+        /// <param name="p_equalizer">valid equalizer handle, must not be NULL</param>
+        /// <param name="f_preamp">preamp value (-20.0 to 20.0 Hz)</param>
+        /// <returns>zero on success, -1 on error</returns>
+        [LibVlcFunction(nameof(libvlc_audio_equalizer_set_preamp), "2.2.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_audio_equalizer_set_preamp(void* p_equalizer, float f_preamp);
+
+        /// <summary>
+        ///     Get the current pre-amplification value from an equalizer.
+        /// </summary>
+        /// <param name="p_equalizer">p_equalizer valid equalizer handle, must not be NULL</param>
+        /// <returns> preamp value (Hz)</returns>
+        [LibVlcFunction(nameof(libvlc_audio_equalizer_get_preamp), "2.2.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate float libvlc_audio_equalizer_get_preamp(void* p_equalizer);
+
+        /// <summary>
+        ///     Set a new amplification value for a particular equalizer frequency band.
+        ///     The new equalizer settings are subsequently applied to a media player by invoking
+        ///     libvlc_media_player_set_equalizer().
+        ///     The supplied amplification value will be clamped to the -20.0 to +20.0 range.
+        /// </summary>
+        /// <param name="p_equalizer">valid equalizer handle, must not be NULL</param>
+        /// <param name="f_amp">amplification value (-20.0 to 20.0 Hz)</param>
+        /// <param name="u_band">index, counting from zero, of the frequency band to set</param>
+        /// <returns>zero on success, -1 on error</returns>
+        [LibVlcFunction(nameof(libvlc_audio_equalizer_set_amp_at_index), "2.2.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_audio_equalizer_set_amp_at_index(void* p_equalizer, float f_amp, uint u_band);
+
+        /// <summary>
+        ///     Get the amplification value for a particular equalizer frequency band.
+        /// </summary>
+        /// <param name="p_equalizer">valid equalizer handle, must not be NULL</param>
+        /// <param name="u_band">index, counting from zero, of the frequency band to get</param>
+        /// <returns>amplification value (Hz); NaN if there is no such frequency band</returns>
+        [LibVlcFunction(nameof(libvlc_audio_equalizer_get_amp_at_index), "2.2.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate float libvlc_audio_equalizer_get_amp_at_index(void* p_equalizer, uint u_band);
+
+        /// <summary>
+        ///     Apply new equalizer settings to a media player.
+        ///     The equalizer is first created by invoking libvlc_audio_equalizer_new() or
+        ///     libvlc_audio_equalizer_new_from_preset().
+        ///     It is possible to apply new equalizer settings to a media player whether the media
+        ///     player is currently playing media or not.
+        ///     Invoking this method will immediately apply the new equalizer settings to the audio
+        ///     output of the currently playing media if there is any.
+        ///     If there is no currently playing media, the new equalizer settings will be applied
+        ///     later if and when new media is played.
+        ///     Equalizer settings will automatically be applied to subsequently played media.
+        ///     To disable the equalizer for a media player invoke this method passing NULL for the
+        ///     p_equalizer parameter.
+        ///     The media player does not keep a reference to the supplied equalizer so it is safe
+        ///     for an application to release the equalizer reference any time after this method
+        ///     returns.
+        /// </summary>
+        /// <param name="p_mi">opaque media player handle</param>
+        /// <param name="p_equalizer">opaque equalizer handle, or NULL to disable the equalizer for this media player</param>
+        /// <returns>zero on success, -1 on error</returns>
+        [LibVlcFunction(nameof(libvlc_media_player_set_equalizer), "2.2.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_media_player_set_equalizer(void* p_mi, void* p_equalizer);
+
+        /// <summary>
+        ///     Gets the media role.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <returns>the media player role (<see cref="libvlc_media_player_role_t" />)</returns>
+        [LibVlcFunction(nameof(libvlc_media_player_get_role), "3.0.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate libvlc_media_player_role_t libvlc_media_player_get_role(void* p_mi);
+
+        /// <summary>
+        ///     Sets the media role.
+        /// </summary>
+        /// <param name="p_mi">media player</param>
+        /// <param name="role">the media player role (<see cref="libvlc_media_player_role_t" />)</param>
+        /// <returns>0 on success, -1 on error</returns>
+        [LibVlcFunction(nameof(libvlc_media_player_set_role), "3.0.0")]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public unsafe delegate int libvlc_media_player_set_role(void* p_mi, uint role);
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Interop/MediaPlayer/Struct.cs b/Meta.Vlc/Interop/MediaPlayer/Struct.cs
new file mode 100644
index 0000000..e4a602f
--- /dev/null
+++ b/Meta.Vlc/Interop/MediaPlayer/Struct.cs
@@ -0,0 +1,97 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: Struct.cs
+// Version: 20181231
+
+using System.Runtime.InteropServices;
+
+namespace Meta.Vlc.Interop.MediaPlayer
+{
+    /// <summary>
+    ///     Description for video, audio tracks and subtitles. It contains
+    ///     id, name (description string) and pointer to next record.
+    /// </summary>
+    /// [StructLayout(LayoutKind.Sequential)]
+    public unsafe struct libvlc_track_description_t
+    {
+        public int i_id;
+        public byte* psz_name;
+        public libvlc_track_description_t* p_next;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public unsafe struct libvlc_title_description_t
+    {
+        /// <summary>
+        ///     duration in milliseconds
+        /// </summary>
+        public long i_duration;
+
+        /// <summary>
+        ///     title name
+        /// </summary>
+        public byte* psz_name;
+
+        /// <summary>
+        ///     info if item was recognized as a menu, interactive or plain content by the demuxer
+        /// </summary>
+        public uint i_flags;
+    }
+
+    /**
+     * Description for chapters
+     */
+    [StructLayout(LayoutKind.Sequential)]
+    public unsafe struct libvlc_chapter_description_t
+    {
+        /// <summary>
+        ///     time-offset of the chapter in milliseconds
+        /// </summary>
+        public long i_time_offset;
+
+        /// <summary>
+        ///     duration of the chapter in milliseconds
+        /// </summary>
+        public long i_duration;
+
+        /// <summary>
+        ///     chapter name
+        /// </summary>
+        public byte* psz_name;
+    }
+
+    /// <summary>
+    ///     Description for audio output. It contains
+    ///     name, description and pointer to next record.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public unsafe struct libvlc_audio_output_t
+    {
+        public byte* psz_name;
+        public byte* psz_description;
+        public libvlc_audio_output_t* p_next;
+    }
+
+    /// <summary>
+    ///     Description for audio output device.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public unsafe struct libvlc_audio_output_device_t
+    {
+        /// <summary>
+        ///     Next entry in list
+        /// </summary>
+        public libvlc_audio_output_device_t* p_next;
+
+        /// <summary>
+        ///     Device identifier string
+        /// </summary>
+        public byte* psz_device;
+
+        /// <summary>
+        ///     User-friendly device description
+        /// </summary>
+        public byte* psz_description;
+
+        /* More fields may be added here in later versions */
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Interop/Platform.cs b/Meta.Vlc/Interop/Platform.cs
new file mode 100644
index 0000000..6246967
--- /dev/null
+++ b/Meta.Vlc/Interop/Platform.cs
@@ -0,0 +1,47 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: Platform.cs
+// Version: 20181231
+
+#if AnyCPU || x86
+#define ILP32
+#else
+#define LP64
+#endif
+
+namespace Meta.Vlc.Interop
+{
+    public static class Platform
+    {
+        public const int CharSize = 1;
+        public const int ShortSize = 2;
+        public const int UShortSize = ShortSize;
+        public const int FloatSize = 4;
+        public const int DoubleSize = 8;
+#if ILP32
+        public const int IntSize = 4;
+        public const int LongSize = 4;
+        public const int LongLongSize = 8;
+        public const int IntPtrSize = 4;
+#elif LP32
+        public const int IntSize = 2;
+        public const int LongSize = 4;
+        public const int LongLongSize = 8;
+        public const int IntPtrSize = 4;
+#elif LP64
+        public const int IntSize = 4;
+        public const int LongSize = 8;
+        public const int LongLongSize = 8;
+        public const int IntPtrSize = 8;
+#elif LLP64
+        public const int IntSize = 4;
+        public const int LongSize = 4;
+        public const int LongLongSize = 8;
+        public const int IntPtrSize = 8;
+#endif
+        public const int UIntSize = IntSize;
+        public const int ULongSize = LongSize;
+        public const int ULongLongSize = LongLongSize;
+        public const int SizeTSize = IntPtrSize;
+        public const int EnumSize = IntSize;
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/InteropHelper.cs b/Meta.Vlc/InteropHelper.cs
index d2a814a..fb6f5fa 100644
--- a/Meta.Vlc/InteropHelper.cs
+++ b/Meta.Vlc/InteropHelper.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: InteropHelper.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
 using System.Collections.Generic;
@@ -12,7 +12,7 @@ namespace Meta.Vlc
     /// <summary>
     ///     Some helper method of interopping with unmanaged dlls.
     /// </summary>
-    public static class InteropHelper
+    public static unsafe class InteropHelper
     {
         /// <summary>
         ///     Convert a pointer of string to manmaged <see cref="String" />.
@@ -22,23 +22,17 @@ public static class InteropHelper
         /// <param name="toBeFree">free this pointer when convert over</param>
         /// <param name="encoding">encoding of string</param>
         /// <returns>result string</returns>
-        public static String PtrToString(IntPtr ptr, int count = -1, bool toBeFree = false, Encoding encoding = null)
+        public static string PtrToString(IntPtr ptr, int count = -1, bool toBeFree = false, Encoding encoding = null)
         {
-            if (ptr == IntPtr.Zero)
-            {
-                return null;
-            }
-            if (encoding == null)
-            {
-                encoding = Encoding.UTF8;
-            }
+            if (ptr == IntPtr.Zero) return null;
+            if (encoding == null) encoding = Encoding.UTF8;
 
-            List<byte> buffer = new List<byte>(1024);
+            var buffer = new List<byte>(1024);
 
             if (count == -1)
             {
-                int offset = 0;
-                byte tmp = Marshal.ReadByte(ptr, offset);
+                var offset = 0;
+                var tmp = Marshal.ReadByte(ptr, offset);
                 while (tmp != 0)
                 {
                     buffer.Add(tmp);
@@ -49,19 +43,35 @@ public static String PtrToString(IntPtr ptr, int count = -1, bool toBeFree = fal
             else
             {
                 byte tmp = 0;
-                for (int i = 0; i < count; i++)
+                for (var i = 0; i < count; i++)
                 {
                     tmp = Marshal.ReadByte(ptr, i);
                     buffer.Add(tmp);
                 }
             }
 
-            if (toBeFree)
+            if (toBeFree) LibVlcManager.Free(ptr.ToPointer());
+
+            return encoding.GetString(buffer.ToArray());
+        }
+
+        public static string PtrToString(byte* ptr, Encoding encoding = null)
+        {
+            if (ptr == null) return null;
+            if (encoding == null) encoding = Encoding.UTF8;
+
+            var buffer = new List<byte>(1024);
+            byte lastByte;
+            var offset = 0;
+
+            while ((lastByte = ptr[offset]) != 0x00)
             {
-                LibVlcManager.Free(ptr);
+                buffer.Add(lastByte);
+                offset++;
+                lastByte = ptr[offset];
             }
 
-            return encoding.GetString(buffer.ToArray());
+            return encoding.GetString(buffer.ToArray(), 0, offset);
         }
 
         /// <summary>
@@ -70,7 +80,7 @@ public static String PtrToString(IntPtr ptr, int count = -1, bool toBeFree = fal
         /// </summary>
         /// <param name="str">string you need pinned</param>
         /// <returns>GCHandle of <see cref="String" />, you can call <see cref="GCHandle.AddrOfPinnedObject" /> to get pointer.</returns>
-        public static GCHandle StringToPtr(String str)
+        public static GCHandle StringToPtr(string str)
         {
             var handle = GCHandle.Alloc(Encoding.UTF8.GetBytes(str), GCHandleType.Pinned);
             return handle;
@@ -82,13 +92,10 @@ public static GCHandle StringToPtr(String str)
         /// <param name="ptrs">pointer array</param>
         /// <param name="length">length of pointer array</param>
         /// <returns><see cref="String" /> array</returns>
-        public static String[] PtrsToStringArray(IntPtr[] ptrs, int length)
+        public static string[] PtrsToStringArray(IntPtr[] ptrs, int length)
         {
-            String[] result = new String[length];
-            for (int i = 0; i < length; i++)
-            {
-                result[i] = ptrs[i] == IntPtr.Zero ? null : PtrToString(ptrs[i]);
-            }
+            var result = new string[length];
+            for (var i = 0; i < length; i++) result[i] = ptrs[i] == IntPtr.Zero ? null : PtrToString(ptrs[i]);
             return result;
         }
 
@@ -97,14 +104,11 @@ public static String[] PtrsToStringArray(IntPtr[] ptrs, int length)
         /// </summary>
         /// <param name="strings"><see cref="String" /> array</param>
         /// <returns>pointer of <see cref="String" /> array</returns>
-        public static IntPtr StringArrayToPtr(String[] strings)
+        public static IntPtr StringArrayToPtr(string[] strings)
         {
-            IntPtr[] ptrs = new IntPtr[strings.Length];
+            var ptrs = new IntPtr[strings.Length];
 
-            for (int i = 0; i < strings.Length; i++)
-            {
-                ptrs[i] = Marshal.StringToHGlobalAnsi(strings[i]);
-            }
+            for (var i = 0; i < strings.Length; i++) ptrs[i] = Marshal.StringToHGlobalAnsi(strings[i]);
 
             return Marshal.UnsafeAddrOfPinnedArrayElement(ptrs, 0);
         }
diff --git a/Meta.Vlc/LibVlcManager.cs b/Meta.Vlc/LibVlcManager.cs
index 1e99a10..54a8063 100644
--- a/Meta.Vlc/LibVlcManager.cs
+++ b/Meta.Vlc/LibVlcManager.cs
@@ -1,14 +1,14 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: LibVlcManager.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
+using System.Reflection;
 using Meta.Vlc.Interop;
 using Meta.Vlc.Interop.Core;
-using Meta.Vlc.Interop.Media;
-using Meta.Vlc.Interop.MediaPlayer;
 
 namespace Meta.Vlc
 {
@@ -16,17 +16,15 @@ namespace Meta.Vlc
     ///     LibVlc dlls manager, load LibVlc and initialize LibVlc to use. Some public method also in this class, like
     ///     <see cref="Free" /> method.
     /// </summary>
-    public static class LibVlcManager
+    public static unsafe class LibVlcManager
     {
-        private static LibVlcFunction<GetVersion> _getVersionFunction;
-        private static LibVlcFunction<GetCompiler> _getCompilerFunction;
-        private static LibVlcFunction<GetChangeset> _getChangesetFunction;
-        private static LibVlcFunction<Free> _freeFunction;
-        private static LibVlcFunction<ReleaseLibVlcModuleDescription> _releaseLibVlcModuleDescriptionFunction;
-        private static LibVlcFunction<ReleaseTrackDescription> _releaseTrackDescriptionFunction;
-        private static LibVlcFunction<ReleaseAudioDeviceList> _releaseAudioDeviceListFunction;
-        private static LibVlcFunction<ReleaseAudioOutputList> _releaseAudioOutputListFunction;
-        private static LibVlcFunction<ReleaseTracks> _releaseTracksFunction;
+        private static LibVlcFunction<libvlc_get_version> _getVersionFunction;
+        private static LibVlcFunction<libvlc_get_compiler> _getCompilerFunction;
+        private static LibVlcFunction<libvlc_get_changeset> _getChangeSetFunction;
+        private static LibVlcFunction<libvlc_free> _freeFunction;
+
+        private static readonly Dictionary<Type, Object> _cache =
+            new Dictionary<Type, Object>();
 
         /// <summary>
         ///     LibVlc loaded or not.
@@ -46,7 +44,7 @@ public static class LibVlcManager
         /// <summary>
         ///     Directory of LibVlc dlls.
         /// </summary>
-        public static String LibVlcDirectory { get; set; }
+        public static string LibVlcDirectory { get; set; }
 
         /// <summary>
         ///     Version infomation of LibVlc.
@@ -72,16 +70,16 @@ public static class LibVlcManager
         ///     At least one component of version represents a number greater than
         ///     <see cref="F:System.Int32.MaxValue" />.
         /// </exception>
-        public static void LoadLibVlc(String libVlcDirectory = null)
+        public static void LoadLibVlc(string libVlcDirectory = null)
         {
-            LibVlcDirectory = libVlcDirectory == null ? "" : libVlcDirectory;
-
             if (IsLibLoaded) return;
 
+            LibVlcDirectory = libVlcDirectory == null ? "" : libVlcDirectory;
+
             try
             {
-                FileInfo libcore = new FileInfo(Path.Combine(LibVlcDirectory, "libvlccore.dll"));
-                FileInfo libvlc = new FileInfo(Path.Combine(LibVlcDirectory, "libvlc.dll"));
+                var libcore = new FileInfo(Path.Combine(LibVlcDirectory, "libvlccore.dll"));
+                var libvlc = new FileInfo(Path.Combine(LibVlcDirectory, "libvlc.dll"));
                 LibVlcVCoreHandle = Win32Api.LoadLibrary(libcore.FullName);
                 LibVlcHandle = Win32Api.LoadLibrary(libvlc.FullName);
             }
@@ -90,31 +88,31 @@ public static void LoadLibVlc(String libVlcDirectory = null)
                 throw new LibVlcLoadLibraryException(e);
             }
 
-            _getVersionFunction = new LibVlcFunction<GetVersion>();
+            _getVersionFunction = new LibVlcFunction<libvlc_get_version>(LibVlcHandle, null);
+            _getCompilerFunction = new LibVlcFunction<libvlc_get_compiler>(LibVlcHandle, null);
+            _getChangeSetFunction = new LibVlcFunction<libvlc_get_changeset>(LibVlcHandle, null);
+            _freeFunction = new LibVlcFunction<libvlc_free>(LibVlcHandle, null);
+
+
             LibVlcVersion = new LibVlcVersion(GetVersion());
+            var functionArgs = new object[] {LibVlcHandle, LibVlcVersion};
 
-            _getCompilerFunction = new LibVlcFunction<GetCompiler>();
-            _getChangesetFunction = new LibVlcFunction<GetChangeset>();
-            _freeFunction = new LibVlcFunction<Free>();
-            _releaseLibVlcModuleDescriptionFunction = new LibVlcFunction<ReleaseLibVlcModuleDescription>();
-            _releaseAudioOutputListFunction = new LibVlcFunction<ReleaseAudioOutputList>();
-            _releaseAudioDeviceListFunction = new LibVlcFunction<ReleaseAudioDeviceList>();
-            _releaseTrackDescriptionFunction = new LibVlcFunction<ReleaseTrackDescription>();
-            _releaseTracksFunction = new LibVlcFunction<ReleaseTracks>();
-
-            Vlc.LoadLibVlc();
-            VlcError.LoadLibVlc();
-            VlcEventManager.LoadLibVlc();
-            VlcMedia.LoadLibVlc();
-            VlcMediaPlayer.LoadLibVlc();
-            AudioEqualizer.LoadLibVlc();
+            foreach (var type in Assembly.GetExecutingAssembly().GetTypes())
+            {
+                var attrs = type.GetCustomAttributes(typeof(LibVlcFunctionAttribute), false);
+                if (attrs.Length == 0) continue;
+
+                var functionType = typeof(LibVlcFunction<>).MakeGenericType(type);
+                var function = Activator.CreateInstance(functionType, functionArgs);
+                _cache.Add(type, function);
+            }
         }
 
         /// <summary>
         ///     Get version string of LibVlc.
         /// </summary>
         /// <returns></returns>
-        public static String GetVersion()
+        public static string GetVersion()
         {
             return InteropHelper.PtrToString(_getVersionFunction.Delegate());
         }
@@ -123,7 +121,7 @@ public static String GetVersion()
         ///     Get compiler infomation of LibVlc.
         /// </summary>
         /// <returns></returns>
-        public static String GetCompiler()
+        public static string GetCompiler()
         {
             return InteropHelper.PtrToString(_getCompilerFunction.Delegate());
         }
@@ -132,9 +130,9 @@ public static String GetCompiler()
         ///     Get changeset of LibVlc.
         /// </summary>
         /// <returns></returns>
-        public static String GetChangeset()
+        public static string GetChangeSet()
         {
-            return InteropHelper.PtrToString(_getChangesetFunction.Delegate());
+            return InteropHelper.PtrToString(_getChangeSetFunction.Delegate());
         }
 
         /// <summary>
@@ -142,60 +140,14 @@ public static String GetChangeset()
         /// </summary>
         /// <param name="pointer">the pointer of object to be released </param>
         /// <exception cref="Exception">A delegate callback throws an exception.</exception>
-        public static void Free(IntPtr pointer)
+        public static void Free(void* pointer)
         {
             _freeFunction.Delegate(pointer);
         }
 
-        /// <summary>
-        ///     Release a list of module descriptions.
-        /// </summary>
-        /// <param name="moduleDescriptionList">the list to be released </param>
-        /// <exception cref="Exception">A delegate callback throws an exception.</exception>
-        public static void ReleaseModuleDescriptionList(IntPtr moduleDescriptionList)
-        {
-            _releaseLibVlcModuleDescriptionFunction.Delegate(moduleDescriptionList);
-        }
-
-        /// <summary>
-        ///     Frees the list of available audio output modules.
-        /// </summary>
-        /// <param name="pointer">a pointer of first <see cref="Interop.MediaPlayer.AudioOutput" />. </param>
-        /// <exception cref="Exception">A delegate callback throws an exception.</exception>
-        public static void ReleaseAudioOutputList(IntPtr pointer)
-        {
-            _releaseAudioOutputListFunction.Delegate(pointer);
-        }
-
-        /// <summary>
-        ///     Frees a list of available audio output devices.
-        /// </summary>
-        /// <param name="pointer">a pointer of first <see cref="Interop.MediaPlayer.AudioDevice" />. </param>
-        /// <exception cref="Exception">A delegate callback throws an exception.</exception>
-        public static void ReleaseAudioDeviceList(IntPtr pointer)
-        {
-            _releaseAudioDeviceListFunction.Delegate(pointer);
-        }
-
-        /// <summary>
-        ///     Release (free) pointer of <see cref="TrackDescriptionList" />.
-        /// </summary>
-        /// <param name="pointer"></param>
-        /// <exception cref="Exception">A delegate callback throws an exception.</exception>
-        public static void ReleaseTrackDescriptionList(IntPtr pointer)
-        {
-            _releaseTrackDescriptionFunction.Delegate(pointer);
-        }
-
-        /// <summary>
-        ///     Release media descriptor's elementary streams description array.
-        /// </summary>
-        /// <param name="pointer">pointer tracks info array to release </param>
-        /// <param name="count">number of elements in the array </param>
-        /// <exception cref="Exception">A delegate callback throws an exception.</exception>
-        public static void ReleaseTracks(IntPtr pointer, uint count)
+        public static T GetFunctionDelegate<T>() where T : Delegate
         {
-            _releaseTracksFunction.Delegate(pointer, count);
+            return ((LibVlcFunction<T>)_cache[typeof(T)]).Delegate;
         }
     }
 }
\ No newline at end of file
diff --git a/Meta.Vlc/MediaMetaType.cs b/Meta.Vlc/MediaMetaType.cs
new file mode 100644
index 0000000..7539ddc
--- /dev/null
+++ b/Meta.Vlc/MediaMetaType.cs
@@ -0,0 +1,38 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: MediaMetaType.cs
+// Version: 20181231
+
+using Meta.Vlc.Interop.Media;
+
+namespace Meta.Vlc
+{
+    public enum MediaMetaType
+    {
+        Title = libvlc_meta_t.libvlc_meta_Title,
+        Artist = libvlc_meta_t.libvlc_meta_Artist,
+        Genre = libvlc_meta_t.libvlc_meta_Genre,
+        Copyright = libvlc_meta_t.libvlc_meta_Copyright,
+        Album = libvlc_meta_t.libvlc_meta_Album,
+        TrackNumber = libvlc_meta_t.libvlc_meta_TrackNumber,
+        Description = libvlc_meta_t.libvlc_meta_Description,
+        Rating = libvlc_meta_t.libvlc_meta_Rating,
+        Date = libvlc_meta_t.libvlc_meta_Date,
+        Setting = libvlc_meta_t.libvlc_meta_Setting,
+        URL = libvlc_meta_t.libvlc_meta_URL,
+        Language = libvlc_meta_t.libvlc_meta_Language,
+        NowPlaying = libvlc_meta_t.libvlc_meta_NowPlaying,
+        Publisher = libvlc_meta_t.libvlc_meta_Publisher,
+        EncodedBy = libvlc_meta_t.libvlc_meta_EncodedBy,
+        ArtworkURL = libvlc_meta_t.libvlc_meta_ArtworkURL,
+        TrackID = libvlc_meta_t.libvlc_meta_TrackID,
+        TrackTotal = libvlc_meta_t.libvlc_meta_TrackTotal,
+        Director = libvlc_meta_t.libvlc_meta_Director,
+        Season = libvlc_meta_t.libvlc_meta_Season,
+        Episode = libvlc_meta_t.libvlc_meta_Episode,
+        ShowName = libvlc_meta_t.libvlc_meta_ShowName,
+        Actors = libvlc_meta_t.libvlc_meta_Actors,
+        AlbumArtist = libvlc_meta_t.libvlc_meta_AlbumArtist,
+        DiscNumber = libvlc_meta_t.libvlc_meta_DiscNumber,
+        DiscTotal = libvlc_meta_t.libvlc_meta_DiscTotal
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/MediaParseOption.cs b/Meta.Vlc/MediaParseOption.cs
new file mode 100644
index 0000000..d618e65
--- /dev/null
+++ b/Meta.Vlc/MediaParseOption.cs
@@ -0,0 +1,43 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: MediaParseOption.cs
+// Version: 20181231
+
+using System;
+using Meta.Vlc.Interop.Media;
+
+namespace Meta.Vlc
+{
+    /// <summary>
+    ///     Parse flags used by <see cref="VlcMedia.ParseWithOptionAsync" />
+    /// </summary>
+    [Flags]
+    public enum MediaParseOption
+    {
+        /// <summary>
+        ///     Parse media if it's a local file
+        /// </summary>
+        ParseLocal = libvlc_media_parse_flag_t.libvlc_media_parse_local,
+
+        /// <summary>
+        ///     Parse media even if it's a network file
+        /// </summary>
+        ParseNetwork = libvlc_media_parse_flag_t.libvlc_media_parse_network,
+
+        /// <summary>
+        ///     Fetch meta and covert art using local resources
+        /// </summary>
+        FetchLocal = libvlc_media_parse_flag_t.libvlc_media_fetch_local,
+
+        /// <summary>
+        ///     Fetch meta and covert art using network resources
+        /// </summary>
+        FetchNetwork = libvlc_media_parse_flag_t.libvlc_media_fetch_network,
+
+        /// <summary>
+        ///     Interact with the user (via libvlc_dialog_cbs) when preparsing this item
+        ///     (and not its sub items). Set this flag in order to receive a callback
+        ///     when the input is asking for credentials.
+        /// </summary>
+        DoInteract = libvlc_media_parse_flag_t.libvlc_media_do_interact
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/MediaParsedStatus.cs b/Meta.Vlc/MediaParsedStatus.cs
new file mode 100644
index 0000000..c5f891d
--- /dev/null
+++ b/Meta.Vlc/MediaParsedStatus.cs
@@ -0,0 +1,22 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: MediaParsedStatus.cs
+// Version: 20181231
+
+using Meta.Vlc.Interop.Media;
+
+namespace Meta.Vlc
+{
+    /// <summary>
+    ///     Parse status used sent by <see cref="libvlc_media_parse_with_options" /> or returned by
+    ///     <see cref="libvlc_media_get_parsed_status" />()
+    /// </summary>
+    /// <seealso cref="libvlc_media_parse_with_options" />
+    /// <seealso cref="libvlc_media_get_parsed_status" />
+    public enum MediaParsedStatus
+    {
+        Skipped = libvlc_media_parsed_status_t.libvlc_media_parsed_status_skipped,
+        Failed = libvlc_media_parsed_status_t.libvlc_media_parsed_status_failed,
+        Timeout = libvlc_media_parsed_status_t.libvlc_media_parsed_status_timeout,
+        Done = libvlc_media_parsed_status_t.libvlc_media_parsed_status_done
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/MediaState.cs b/Meta.Vlc/MediaState.cs
new file mode 100644
index 0000000..35f990e
--- /dev/null
+++ b/Meta.Vlc/MediaState.cs
@@ -0,0 +1,24 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: MediaState.cs
+// Version: 20181231
+
+using System;
+using Meta.Vlc.Interop.Media;
+
+namespace Meta.Vlc
+{
+    public enum MediaState
+    {
+        NothingSpecial = libvlc_state_t.libvlc_NothingSpecial,
+        Opening = libvlc_state_t.libvlc_Opening,
+
+        [Obsolete(
+            "Deprecated value. Check the VlcMediaPlayer.Buffering event to know the buffering state of a VlcMediaPlayer")]
+        Buffering = libvlc_state_t.libvlc_Buffering,
+        Playing = libvlc_state_t.libvlc_Playing,
+        Paused = libvlc_state_t.libvlc_Paused,
+        Stopped = libvlc_state_t.libvlc_Stopped,
+        Ended = libvlc_state_t.libvlc_Ended,
+        Error = libvlc_state_t.libvlc_Error
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/MediaStats.cs b/Meta.Vlc/MediaStats.cs
new file mode 100644
index 0000000..12cbaab
--- /dev/null
+++ b/Meta.Vlc/MediaStats.cs
@@ -0,0 +1,38 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: MediaStats.cs
+// Version: 20181231
+
+using Meta.Vlc.Interop.Media;
+
+namespace Meta.Vlc
+{
+    public class MediaStats
+    {
+        internal libvlc_media_stats_t Struct;
+
+        internal MediaStats()
+        {
+        }
+
+        public int ReadBytes => Struct.i_read_bytes;
+        public float InputBitRate => Struct.i_read_bytes;
+
+        public int DemuxReadBytes => Struct.i_demux_read_bytes;
+        public float DemuxBitRate => Struct.f_demux_bitrate;
+        public int DemuxCorrupted => Struct.i_demux_corrupted;
+        public int DemuxDiscontinuity => Struct.i_demux_discontinuity;
+
+        public int DecodedVideo => Struct.i_decoded_video;
+        public int DecodedAudio => Struct.i_decoded_audio;
+
+        public int DisplayedPictures => Struct.i_displayed_pictures;
+        public int LostPictures => Struct.i_lost_pictures;
+
+        public int PlayedAudioBuffers => Struct.i_played_abuffers;
+        public int LostAudioBuffers => Struct.i_lost_abuffers;
+
+        public int SentPackets => Struct.i_sent_packets;
+        public int SentBytes => Struct.i_sent_bytes;
+        public float SendBitRate => Struct.f_send_bitrate;
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/MediaTrack.cs b/Meta.Vlc/MediaTrack.cs
index ca408ae..4f2eca3 100644
--- a/Meta.Vlc/MediaTrack.cs
+++ b/Meta.Vlc/MediaTrack.cs
@@ -1,21 +1,25 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: MediaTrack.cs
-// Version: 20160214
+// Version: 20181231
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
 using Meta.Vlc.Interop.Media;
 
 namespace Meta.Vlc
 {
+    public enum TrackType
+    {
+        Unknown = libvlc_track_type_t.libvlc_track_unknown,
+        Audio = libvlc_track_type_t.libvlc_track_audio,
+        Video = libvlc_track_type_t.libvlc_track_video,
+        Text = libvlc_track_type_t.libvlc_track_text
+    }
+
     /// <summary>
-    ///     A warpper for <see cref="Interop.Media.MediaTrack" /> struct.
+    ///     A wrapper for <see cref="libvlc_media_track_t" /> struct.
     /// </summary>
-    public abstract class MediaTrack
+    public abstract unsafe class MediaTrack
     {
-        protected MediaTrack(Interop.Media.MediaTrack mediaTrack)
+        protected MediaTrack(libvlc_media_track_t* mediaTrack)
         {
             Initialize(mediaTrack);
         }
@@ -27,57 +31,53 @@ protected MediaTrack(Interop.Media.MediaTrack mediaTrack)
         public int Profile { get; private set; }
         public int Level { get; private set; }
         public uint Bitrate { get; private set; }
-        public String Language { get; private set; }
-        public String Description { get; private set; }
-        protected IntPtr Track { get; private set; }
+        public string Language { get; private set; }
+        public string Description { get; private set; }
 
         /// <summary>
         ///     Create a media track from a pointer, it will distinguish type of media track auto.
         /// </summary>
         /// <param name="pointer">pointer of media track</param>
-        /// <returns>a audio track, video track, subtitle track or unknow track</returns>
-        public static MediaTrack CreateFromPointer(IntPtr pointer)
+        /// <returns>a audio track, video track, subtitle track or unknown track</returns>
+        public static MediaTrack CreateFromPointer(libvlc_media_track_t* pointer)
         {
-            var track = (Interop.Media.MediaTrack) Marshal.PtrToStructure(pointer, typeof (Interop.Media.MediaTrack));
-
-            switch (track.Type)
+            switch ((TrackType) pointer->i_type)
             {
                 case TrackType.Audio:
-                    return new AudioTrack(track);
+                    return new AudioTrack(pointer);
 
                 case TrackType.Video:
-                    return new VideoTrack(track);
+                    return new VideoTrack(pointer);
 
                 case TrackType.Text:
-                    return new SubtitleTrack(track);
+                    return new SubtitleTrack(pointer);
 
-                case TrackType.Unkown:
+                case TrackType.Unknown:
                 default:
-                    return new UnkownTrack(track);
+                    return new UnknownTrack(pointer);
             }
         }
 
-        protected virtual void Initialize(Interop.Media.MediaTrack mediaTrack)
+        protected virtual void Initialize(libvlc_media_track_t* mediaTrack)
         {
-            Codec = mediaTrack.Codec;
-            OriginalFourcc = mediaTrack.OriginalFourcc;
-            Id = mediaTrack.Id;
-            Type = mediaTrack.Type;
-            Profile = mediaTrack.Profile;
-            Level = mediaTrack.Level;
-            Bitrate = mediaTrack.Bitrate;
-            Language = InteropHelper.PtrToString(mediaTrack.Language);
-            Description = InteropHelper.PtrToString(mediaTrack.Description);
-            Track = mediaTrack.Track;
+            Codec = mediaTrack->i_codec;
+            OriginalFourcc = mediaTrack->i_original_fourcc;
+            Id = mediaTrack->i_id;
+            Type = (TrackType) mediaTrack->i_type;
+            Profile = mediaTrack->i_profile;
+            Level = mediaTrack->i_level;
+            Bitrate = mediaTrack->i_bitrate;
+            Language = InteropHelper.PtrToString(mediaTrack->psz_language);
+            Description = InteropHelper.PtrToString(mediaTrack->psz_description);
         }
     }
 
     /// <summary>
-    ///     A warpper for <see cref="Interop.Media.AudioTrack" /> struct.
+    ///     A wrapper for <see cref="libvlc_audio_track_t" /> struct.
     /// </summary>
-    public class AudioTrack : MediaTrack
+    public unsafe class AudioTrack : MediaTrack
     {
-        internal AudioTrack(Interop.Media.MediaTrack mediaTrack) : base(mediaTrack)
+        internal AudioTrack(libvlc_media_track_t* mediaTrack) : base(mediaTrack)
         {
         }
 
@@ -85,23 +85,21 @@ internal AudioTrack(Interop.Media.MediaTrack mediaTrack) : base(mediaTrack)
 
         public uint Rate { get; private set; }
 
-        protected override void Initialize(Interop.Media.MediaTrack mediaTrack)
+        protected override void Initialize(libvlc_media_track_t* mediaTrack)
         {
             base.Initialize(mediaTrack);
-
-            var audioTrack = (Interop.Media.AudioTrack) Marshal.PtrToStructure(Track, typeof (Interop.Media.AudioTrack));
-
-            Channels = audioTrack.Channels;
-            Rate = audioTrack.Rate;
+            var audioData = (libvlc_audio_track_t*) mediaTrack->data;
+            Channels = audioData->i_channels;
+            Rate = audioData->i_rate;
         }
     }
 
     /// <summary>
-    ///     A warpper for <see cref="Interop.Media.VideoTrack" /> struct.
+    ///     A wrapper for <see cref="libvlc_video_track_t" /> struct.
     /// </summary>
-    public class VideoTrack : MediaTrack
+    public unsafe class VideoTrack : MediaTrack
     {
-        internal VideoTrack(Interop.Media.MediaTrack mediaTrack) : base(mediaTrack)
+        internal VideoTrack(libvlc_media_track_t* mediaTrack) : base(mediaTrack)
         {
         }
 
@@ -112,106 +110,68 @@ internal VideoTrack(Interop.Media.MediaTrack mediaTrack) : base(mediaTrack)
         public uint FrameRateNum { get; private set; }
         public uint FrameRateDen { get; private set; }
 
-        protected override void Initialize(Interop.Media.MediaTrack mediaTrack)
+        protected override void Initialize(libvlc_media_track_t* mediaTrack)
         {
             base.Initialize(mediaTrack);
 
-            var videoTrack = (Interop.Media.VideoTrack) Marshal.PtrToStructure(Track, typeof (Interop.Media.VideoTrack));
-
-            Height = videoTrack.Height;
-            Width = videoTrack.Width;
-            SarNum = videoTrack.SarNum;
-            SarDen = videoTrack.SarDen;
-            FrameRateNum = videoTrack.FrameRateNum;
-            FrameRateDen = videoTrack.FrameRateDen;
+            var videoData = (libvlc_video_track_t*)mediaTrack->data;
+            Height = videoData->i_height;
+            Width = videoData->i_width;
+            SarNum = videoData->i_sar_num;
+            SarDen = videoData->i_sar_den;
+            FrameRateNum = videoData->i_frame_rate_num;
+            FrameRateDen = videoData->i_frame_rate_den;
         }
     }
 
     /// <summary>
-    ///     A warpper for <see cref="Interop.Media.SubtitleTrack" /> struct.
+    ///     A wrapper for <see cref="libvlc_subtitle_track_t" /> struct.
     /// </summary>
-    public class SubtitleTrack : MediaTrack
+    public unsafe class SubtitleTrack : MediaTrack
     {
-        internal SubtitleTrack(Interop.Media.MediaTrack mediaTrack) : base(mediaTrack)
+        internal SubtitleTrack(libvlc_media_track_t* mediaTrack) : base(mediaTrack)
         {
         }
 
-        public String Encoding { get; private set; }
+        public string Encoding { get; private set; }
 
-        protected override void Initialize(Interop.Media.MediaTrack mediaTrack)
+        protected override void Initialize(libvlc_media_track_t* mediaTrack)
         {
             base.Initialize(mediaTrack);
 
-            var subtitleTrack =
-                (Interop.Media.SubtitleTrack) Marshal.PtrToStructure(Track, typeof (Interop.Media.SubtitleTrack));
-
-            Encoding = InteropHelper.PtrToString(subtitleTrack.Encoding);
+            var subtitleData = (libvlc_subtitle_track_t*)mediaTrack->data;
+            Encoding = InteropHelper.PtrToString(subtitleData->psz_encoding);
         }
     }
 
     /// <summary>
-    ///     A warpper for orther media track.
+    ///     A wrapper for other media track.
     /// </summary>
-    public class UnkownTrack : MediaTrack
+    public unsafe class UnknownTrack : MediaTrack
     {
-        internal UnkownTrack(Interop.Media.MediaTrack mediaTrack) : base(mediaTrack)
-        {
-        }
-
-        public IntPtr TrackPointer
+        internal UnknownTrack(libvlc_media_track_t* mediaTrack) : base(mediaTrack)
         {
-            get { return Track; }
         }
     }
 
     /// <summary>
-    ///     A list warpper for <see cref="Interop.Media.MediaTrack" /> struct.
+    ///     A list wrapper for <see cref="libvlc_media_track_t" /> struct.
     /// </summary>
-    public class MediaTrackList : IEnumerable<MediaTrack>, IEnumerable
+    public unsafe class MediaTrackList : VlcUnmanagedList<MediaTrack>
     {
-        private List<MediaTrack> _list;
-
-        /// <summary>
-        ///     Create a list of media track from a pointer of array.
-        /// </summary>
-        /// <param name="pointer">pointer of media track array</param>
-        /// <param name="count">count of media track array</param>
-        public MediaTrackList(IntPtr pointer, uint count)
-        {
-            _list = new List<MediaTrack>();
-
-            if (pointer == IntPtr.Zero) return;
-
-            var tmp = pointer;
-
-            for (var i = 0; i < count; i++)
-            {
-                var p = Marshal.ReadIntPtr(tmp);
-                _list.Add(MediaTrack.CreateFromPointer(p));
-                tmp = (IntPtr) ((Int64) tmp + IntPtr.Size);
-            }
-
-            LibVlcManager.ReleaseTracks(pointer, count);
-        }
-
-        public int Count
-        {
-            get { return _list.Count; }
-        }
-
-        public MediaTrack this[int index]
+        public MediaTrackList(void** pointer, uint count) : base(pointer, count)
         {
-            get { return _list[index]; }
         }
 
-        public IEnumerator<MediaTrack> GetEnumerator()
+        protected override MediaTrack CreateItem(void* data)
         {
-            return _list.GetEnumerator();
+            return MediaTrack.CreateFromPointer((libvlc_media_track_t*) data);
         }
 
-        IEnumerator IEnumerable.GetEnumerator()
+        protected override void Release(void** data)
         {
-            return GetEnumerator();
+            LibVlcManager.GetFunctionDelegate<libvlc_media_tracks_release>()
+                .Invoke((libvlc_media_track_t**) data, (uint) Count);
         }
     }
 }
\ No newline at end of file
diff --git a/Meta.Vlc/MediaTrackInfo.cs b/Meta.Vlc/MediaTrackInfo.cs
new file mode 100644
index 0000000..49f136e
--- /dev/null
+++ b/Meta.Vlc/MediaTrackInfo.cs
@@ -0,0 +1,127 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: MediaTrackInfo.cs
+// Version: 20181231
+
+using Meta.Vlc.Interop.Core;
+using Meta.Vlc.Interop.Media;
+
+namespace Meta.Vlc
+{
+    /// <summary>
+    ///     A wrapper for <see cref="libvlc_media_track_info_t" /> struct.
+    /// </summary>
+    public abstract unsafe class MediaTrackInfo
+    {
+        protected MediaTrackInfo(libvlc_media_track_info_t* mediaTrack)
+        {
+            Initialize(mediaTrack);
+        }
+
+        public uint Codec { get; private set; }
+        public int Id { get; private set; }
+        public TrackType Type { get; private set; }
+        public int Profile { get; private set; }
+        public int Level { get; private set; }
+
+        /// <summary>
+        ///     Create a media track from a pointer, it will distinguish type of media track auto.
+        /// </summary>
+        /// <param name="pointer">pointer of media track</param>
+        /// <returns>a audio track, video track, subtitle track or unknown track</returns>
+        public static MediaTrackInfo CreateFromPointer(libvlc_media_track_info_t* pointer)
+        {
+            switch ((TrackType) pointer->i_type)
+            {
+                case TrackType.Audio:
+                    return new AudioTrackInfo(pointer);
+
+                case TrackType.Video:
+                    return new VideoTrackInfo(pointer);
+
+                default:
+                    return new UnknownTrackInfo(pointer);
+            }
+        }
+
+        protected virtual void Initialize(libvlc_media_track_info_t* mediaTrack)
+        {
+            Codec = mediaTrack->i_codec;
+            Id = mediaTrack->i_id;
+            Type = (TrackType) mediaTrack->i_type;
+            Profile = mediaTrack->i_profile;
+            Level = mediaTrack->i_level;
+        }
+    }
+
+    /// <summary>
+    ///     A wrapper for <see cref="libvlc_media_track_info_t_audio" /> struct.
+    /// </summary>
+    public unsafe class AudioTrackInfo : MediaTrackInfo
+    {
+        internal AudioTrackInfo(libvlc_media_track_info_t* mediaTrack) : base(mediaTrack)
+        {
+        }
+
+        public uint Channels { get; private set; }
+
+        public uint Rate { get; private set; }
+
+        protected override void Initialize(libvlc_media_track_info_t* mediaTrack)
+        {
+            base.Initialize(mediaTrack);
+            Channels = mediaTrack->audio.i_channels;
+            Rate = mediaTrack->audio.i_rate;
+        }
+    }
+
+    /// <summary>
+    ///     A wrapper for <see cref="libvlc_media_track_info_t_video" /> struct.
+    /// </summary>
+    public unsafe class VideoTrackInfo : MediaTrackInfo
+    {
+        internal VideoTrackInfo(libvlc_media_track_info_t* mediaTrack) : base(mediaTrack)
+        {
+        }
+
+        public uint Height { get; private set; }
+        public uint Width { get; private set; }
+
+        protected override void Initialize(libvlc_media_track_info_t* mediaTrack)
+        {
+            base.Initialize(mediaTrack);
+
+            Height = mediaTrack->video.i_height;
+            Width = mediaTrack->video.i_width;
+        }
+    }
+
+    /// <summary>
+    ///     A wrapper for other media track info.
+    /// </summary>
+    public unsafe class UnknownTrackInfo : MediaTrackInfo
+    {
+        internal UnknownTrackInfo(libvlc_media_track_info_t* mediaTrack) : base(mediaTrack)
+        {
+        }
+    }
+
+    /// <summary>
+    ///     A list wrapper for <see cref="libvlc_media_track_info_t" /> struct.
+    /// </summary>
+    public unsafe class MediaTrackInfoList : VlcUnmanagedList<MediaTrackInfo>
+    {
+        public MediaTrackInfoList(void** pointer, uint count) : base(pointer, count)
+        {
+        }
+
+        protected override MediaTrackInfo CreateItem(void* data)
+        {
+            return MediaTrackInfo.CreateFromPointer((libvlc_media_track_info_t*) data);
+        }
+
+        protected override void Release(void** data)
+        {
+            LibVlcManager.GetFunctionDelegate<libvlc_free>().Invoke(data);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Meta.Vlc - .Net 2.0.csproj b/Meta.Vlc/Meta.Vlc - .Net 2.0.csproj
deleted file mode 100644
index 4de90ee..0000000
--- a/Meta.Vlc/Meta.Vlc - .Net 2.0.csproj	
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{966C7E4A-C5BE-411C-B822-A17E9FCA0B69}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Meta.Vlc</RootNamespace>
-    <AssemblyName>Meta.Vlc</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\Debug\.NET 2.0\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DotNet20;AnyCPU</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\Release\.NET 2.0\</OutputPath>
-    <DefineConstants>TRACE;DotNet20;AnyCPU</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\Release\.NET 2.0\Meta.Vlc.XML</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\x64\Debug\.NET 2.0\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DotNet20;X64</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>..\x64\Release\.NET 2.0\</OutputPath>
-    <DefineConstants>TRACE;DotNet20;X64</DefineConstants>
-    <DocumentationFile>..\x64\Release\.NET 2.0\Meta.Vlc.XML</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\x86\Debug\.NET 2.0\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DotNet20;X86</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\x86\Release\.NET 2.0\</OutputPath>
-    <DefineConstants>TRACE;DotNet20;X86</DefineConstants>
-    <DocumentationFile>..\x86\Release\.NET 2.0\Meta.Vlc.XML</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>higan.pfx</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AudioDevice.cs" />
-    <Compile Include="AudioEqualizer.cs" />
-    <Compile Include="AudioOutput.cs" />
-    <Compile Include="Exceptions.cs" />
-    <Compile Include="HandleManager.cs" />
-    <Compile Include="InteropHelper.cs" />
-    <Compile Include="Interop\LibVlc.Core.cs" />
-    <Compile Include="Interop\LibVlc.Media.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Audio.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Audio.Equalizer.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Audio.Output.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Video.cs" />
-    <Compile Include="Interop\LibVlc.Time.cs" />
-    <Compile Include="Interop\LibVlc.VLM.cs" />
-    <Compile Include="Interop\LibVlcFunction.cs" />
-    <Compile Include="Interop\LibVlcFunctionAttribute.cs" />
-    <Compile Include="Interop\LibVlcVersion.cs" />
-    <Compile Include="IVlcObject.cs" />
-    <Compile Include="MediaTrack.cs" />
-    <Compile Include="ModuleDescription.cs" />
-    <Compile Include="PresetAudioEqualizerType.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Size.cs" />
-    <Compile Include="TrackDescription.cs" />
-    <Compile Include="Vlc.cs" />
-    <Compile Include="VlcError.cs" />
-    <Compile Include="VlcEventManager.cs" />
-    <Compile Include="LibVlcManager.cs" />
-    <Compile Include="VlcMedia.cs" />
-    <Compile Include="VlcMediaPlayer.cs" />
-    <Compile Include="VlcSettingsAttribute.cs" />
-    <Compile Include="Vlc.Vlm.cs" />
-    <Compile Include="Win32Api.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="higan.pfx" />
-    <None Include="Interop\Meta.Vlc.Interop.cd" />
-    <None Include="Meta.Vlc.cd" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/Meta.Vlc/Meta.Vlc - .Net 2.0.csproj.DotSettings b/Meta.Vlc/Meta.Vlc - .Net 2.0.csproj.DotSettings
new file mode 100644
index 0000000..195c460
--- /dev/null
+++ b/Meta.Vlc/Meta.Vlc - .Net 2.0.csproj.DotSettings	
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">Latest</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Meta.Vlc/Meta.Vlc - .Net 3.0.csproj b/Meta.Vlc/Meta.Vlc - .Net 3.0.csproj
deleted file mode 100644
index 53a1c91..0000000
--- a/Meta.Vlc/Meta.Vlc - .Net 3.0.csproj	
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{0B31FAEE-5591-402F-B8EA-3358174BF594}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Meta.Vlc</RootNamespace>
-    <AssemblyName>Meta.Vlc</AssemblyName>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\Debug\.NET 3.0\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DotNet30;AnyCPU</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\Release\.NET 3.0\</OutputPath>
-    <DefineConstants>TRACE;DotNet30;AnyCPU</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\Release\.NET 3.0\Meta.Vlc.XML</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\x64\Debug\.NET 3.0\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DotNet30;X64</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>..\x64\Release\.NET 3.0\</OutputPath>
-    <DefineConstants>TRACE;DotNet30;X64</DefineConstants>
-    <DocumentationFile>..\x64\Release\.NET 3.0\Meta.Vlc.XML</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\x86\Debug\.NET 3.0\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DotNet30;X86</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\x86\Release\.NET 3.0\</OutputPath>
-    <DefineConstants>TRACE;DotNet30;X86</DefineConstants>
-    <DocumentationFile>..\x86\Release\.NET 3.0\Meta.Vlc.XML</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>higan.pfx</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AudioDevice.cs" />
-    <Compile Include="AudioEqualizer.cs" />
-    <Compile Include="AudioOutput.cs" />
-    <Compile Include="Exceptions.cs" />
-    <Compile Include="HandleManager.cs" />
-    <Compile Include="InteropHelper.cs" />
-    <Compile Include="Interop\LibVlc.Core.cs" />
-    <Compile Include="Interop\LibVlc.Media.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Audio.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Audio.Equalizer.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Audio.Output.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Video.cs" />
-    <Compile Include="Interop\LibVlc.Time.cs" />
-    <Compile Include="Interop\LibVlc.VLM.cs" />
-    <Compile Include="Interop\LibVlcFunction.cs" />
-    <Compile Include="Interop\LibVlcFunctionAttribute.cs" />
-    <Compile Include="Interop\LibVlcVersion.cs" />
-    <Compile Include="IVlcObject.cs" />
-    <Compile Include="LibVlcManager.cs" />
-    <Compile Include="MediaTrack.cs" />
-    <Compile Include="ModuleDescription.cs" />
-    <Compile Include="PresetAudioEqualizerType.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Size.cs" />
-    <Compile Include="TrackDescription.cs" />
-    <Compile Include="Vlc.cs" />
-    <Compile Include="Vlc.Vlm.cs" />
-    <Compile Include="VlcError.cs" />
-    <Compile Include="VlcEventManager.cs" />
-    <Compile Include="VlcMedia.cs" />
-    <Compile Include="VlcMediaPlayer.cs" />
-    <Compile Include="VlcSettingsAttribute.cs" />
-    <Compile Include="Win32Api.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="higan.pfx" />
-    <None Include="Interop\Meta.Vlc.Interop.cd" />
-    <None Include="Meta.Vlc.cd" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/Meta.Vlc/Meta.Vlc - .Net 3.5.csproj b/Meta.Vlc/Meta.Vlc - .Net 3.5.csproj
index a54e01a..ec78382 100644
--- a/Meta.Vlc/Meta.Vlc - .Net 3.5.csproj	
+++ b/Meta.Vlc/Meta.Vlc - .Net 3.5.csproj	
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6F34CA47-D818-42B2-9C41-2FADEB7024CF}</ProjectGuid>
+    <ProjectGuid>{966C7E4A-C5BE-411C-B822-A17E9FCA0B69}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Meta.Vlc</RootNamespace>
@@ -17,57 +17,69 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Debug\.NET 3.5\</OutputPath>
+    <OutputPath>..\Debug\.NET 2.0\</OutputPath>
     <DefineConstants>TRACE;DEBUG;DotNet35;AnyCPU</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Release\.NET 3.5\</OutputPath>
-    <DefineConstants>TRACE;DotNet35;AnyCPU</DefineConstants>
+    <OutputPath>..\Release\.NET 2.0\</OutputPath>
+    <DefineConstants>TRACE;DotNet20;AnyCPU</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\Release\.NET 3.5\Meta.Vlc.XML</DocumentationFile>
+    <DocumentationFile>..\Release\.NET 2.0\Meta.Vlc.XML</DocumentationFile>
+    <LangVersion>latest</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\x64\Debug\.NET 3.5\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DotNet35;X64</DefineConstants>
+    <OutputPath>..\x64\Debug\.NET 2.0\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;DotNet20;X64</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>..\x64\Release\.NET 3.5\</OutputPath>
-    <DefineConstants>TRACE;DotNet35;X64</DefineConstants>
-    <DocumentationFile>..\x64\Release\.NET 3.5\Meta.Vlc.XML</DocumentationFile>
+    <OutputPath>..\x64\Release\.NET 2.0\</OutputPath>
+    <DefineConstants>TRACE;DotNet20;X64</DefineConstants>
+    <DocumentationFile>..\x64\Release\.NET 2.0\Meta.Vlc.XML</DocumentationFile>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\x86\Debug\.NET 3.5\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DotNet35;X86</DefineConstants>
+    <OutputPath>..\x86\Debug\.NET 2.0\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;DotNet20;X86</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\x86\Release\.NET 3.5\</OutputPath>
-    <DefineConstants>TRACE;DotNet35;X86</DefineConstants>
-    <DocumentationFile>..\x86\Release\.NET 3.5\Meta.Vlc.XML</DocumentationFile>
+    <OutputPath>..\x86\Release\.NET 2.0\</OutputPath>
+    <DefineConstants>TRACE;DotNet20;X86</DefineConstants>
+    <DocumentationFile>..\x86\Release\.NET 2.0\Meta.Vlc.XML</DocumentationFile>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>
@@ -82,36 +94,62 @@
     <Compile Include="AudioDevice.cs" />
     <Compile Include="AudioEqualizer.cs" />
     <Compile Include="AudioOutput.cs" />
+    <Compile Include="AudioOutputChannel.cs" />
+    <Compile Include="EventType.cs" />
     <Compile Include="Exceptions.cs" />
-    <Compile Include="HandleManager.cs" />
+    <Compile Include="Event\MediaDurationChangedEventArgs.cs" />
+    <Compile Include="Event\MediaFreedEventArgs.cs" />
+    <Compile Include="Event\MediaMetaChangedEventArgs.cs" />
+    <Compile Include="MediaMetaType.cs" />
+    <Compile Include="MediaParsedStatus.cs" />
+    <Compile Include="Event\MediaParsedStatusChangedEventArgs.cs" />
+    <Compile Include="MediaParseOption.cs" />
+    <Compile Include="Event\MediaPlayerBufferingEventArgs.cs" />
+    <Compile Include="Event\MediaPlayerValueChangedEventArgs.cs" />
+    <Compile Include="MediaState.cs" />
+    <Compile Include="Event\MediaStateChangedEventArgs.cs" />
+    <Compile Include="Event\MediaSubItemAddedEventArgs.cs" />
+    <Compile Include="MediaStats.cs" />
+    <Compile Include="MediaTrackInfo.cs" />
+    <Compile Include="MouseButton.cs" />
+    <Compile Include="Event\ObjectEventArgs.cs" />
+    <Compile Include="Position.cs" />
+    <Compile Include="StringHandle.cs" />
+    <Compile Include="VlcObjectManager.cs" />
     <Compile Include="InteropHelper.cs" />
-    <Compile Include="Interop\LibVlc.Core.cs" />
-    <Compile Include="Interop\LibVlc.Media.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Audio.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Audio.Equalizer.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Audio.Output.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Video.cs" />
-    <Compile Include="Interop\LibVlc.Time.cs" />
+    <Compile Include="Interop\Core\Callback.cs" />
+    <Compile Include="Interop\Core\Enum.cs" />
+    <Compile Include="Interop\Core\Function.cs" />
+    <Compile Include="Interop\Core\Struct.cs" />
     <Compile Include="Interop\LibVlc.VLM.cs" />
     <Compile Include="Interop\LibVlcFunction.cs" />
     <Compile Include="Interop\LibVlcFunctionAttribute.cs" />
     <Compile Include="Interop\LibVlcVersion.cs" />
+    <Compile Include="Interop\MediaPlayer\Callback.cs" />
+    <Compile Include="Interop\MediaPlayer\Enum.cs" />
+    <Compile Include="Interop\MediaPlayer\Function.cs" />
+    <Compile Include="Interop\MediaPlayer\Struct.cs" />
+    <Compile Include="Interop\Media\Callback.cs" />
+    <Compile Include="Interop\Media\Enum.cs" />
+    <Compile Include="Interop\Media\Function.cs" />
+    <Compile Include="Interop\Media\Struct.cs" />
     <Compile Include="IVlcObject.cs" />
-    <Compile Include="LibVlcManager.cs" />
     <Compile Include="MediaTrack.cs" />
     <Compile Include="ModuleDescription.cs" />
+    <Compile Include="Interop\Platform.cs" />
     <Compile Include="PresetAudioEqualizerType.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Size.cs" />
     <Compile Include="TrackDescription.cs" />
     <Compile Include="Vlc.cs" />
-    <Compile Include="Vlc.Vlm.cs" />
     <Compile Include="VlcError.cs" />
     <Compile Include="VlcEventManager.cs" />
+    <Compile Include="LibVlcManager.cs" />
     <Compile Include="VlcMedia.cs" />
     <Compile Include="VlcMediaPlayer.cs" />
     <Compile Include="VlcSettingsAttribute.cs" />
+    <Compile Include="VlcUnmanagedLinkedList.cs" />
+    <Compile Include="VlcUnmanagedList.cs" />
     <Compile Include="Win32Api.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Meta.Vlc/Meta.Vlc - .Net 3.5.csproj.DotSettings b/Meta.Vlc/Meta.Vlc - .Net 3.5.csproj.DotSettings
new file mode 100644
index 0000000..195c460
--- /dev/null
+++ b/Meta.Vlc/Meta.Vlc - .Net 3.5.csproj.DotSettings	
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">Latest</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Meta.Vlc/Meta.Vlc - .Net 4.0.csproj b/Meta.Vlc/Meta.Vlc - .Net 4.0.csproj
index 06d01ca..7aeb627 100644
--- a/Meta.Vlc/Meta.Vlc - .Net 4.0.csproj	
+++ b/Meta.Vlc/Meta.Vlc - .Net 4.0.csproj	
@@ -22,6 +22,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,6 +34,8 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <DocumentationFile>..\Release\.NET 4.0\Meta.Vlc.XML</DocumentationFile>
+    <LangVersion>latest</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -41,6 +45,8 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>..\x64\Release\.NET 4.0\</OutputPath>
@@ -51,6 +57,8 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -60,6 +68,8 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -70,6 +80,8 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>
@@ -84,36 +96,62 @@
     <Compile Include="AudioDevice.cs" />
     <Compile Include="AudioEqualizer.cs" />
     <Compile Include="AudioOutput.cs" />
+    <Compile Include="AudioOutputChannel.cs" />
+    <Compile Include="EventType.cs" />
     <Compile Include="Exceptions.cs" />
-    <Compile Include="HandleManager.cs" />
+    <Compile Include="Event\MediaDurationChangedEventArgs.cs" />
+    <Compile Include="Event\MediaFreedEventArgs.cs" />
+    <Compile Include="Event\MediaMetaChangedEventArgs.cs" />
+    <Compile Include="MediaMetaType.cs" />
+    <Compile Include="MediaParsedStatus.cs" />
+    <Compile Include="Event\MediaParsedStatusChangedEventArgs.cs" />
+    <Compile Include="MediaParseOption.cs" />
+    <Compile Include="Event\MediaPlayerBufferingEventArgs.cs" />
+    <Compile Include="Event\MediaPlayerValueChangedEventArgs.cs" />
+    <Compile Include="MediaState.cs" />
+    <Compile Include="Event\MediaStateChangedEventArgs.cs" />
+    <Compile Include="Event\MediaSubItemAddedEventArgs.cs" />
+    <Compile Include="MediaStats.cs" />
+    <Compile Include="MediaTrackInfo.cs" />
+    <Compile Include="MouseButton.cs" />
+    <Compile Include="Event\ObjectEventArgs.cs" />
+    <Compile Include="Position.cs" />
+    <Compile Include="StringHandle.cs" />
+    <Compile Include="VlcObjectManager.cs" />
     <Compile Include="InteropHelper.cs" />
-    <Compile Include="Interop\LibVlc.Core.cs" />
-    <Compile Include="Interop\LibVlc.Media.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Audio.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Audio.Equalizer.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Audio.Output.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Video.cs" />
-    <Compile Include="Interop\LibVlc.Time.cs" />
+    <Compile Include="Interop\Core\Callback.cs" />
+    <Compile Include="Interop\Core\Enum.cs" />
+    <Compile Include="Interop\Core\Function.cs" />
+    <Compile Include="Interop\Core\Struct.cs" />
     <Compile Include="Interop\LibVlc.VLM.cs" />
     <Compile Include="Interop\LibVlcFunction.cs" />
     <Compile Include="Interop\LibVlcFunctionAttribute.cs" />
     <Compile Include="Interop\LibVlcVersion.cs" />
+    <Compile Include="Interop\MediaPlayer\Callback.cs" />
+    <Compile Include="Interop\MediaPlayer\Enum.cs" />
+    <Compile Include="Interop\MediaPlayer\Function.cs" />
+    <Compile Include="Interop\MediaPlayer\Struct.cs" />
+    <Compile Include="Interop\Media\Callback.cs" />
+    <Compile Include="Interop\Media\Enum.cs" />
+    <Compile Include="Interop\Media\Function.cs" />
+    <Compile Include="Interop\Media\Struct.cs" />
     <Compile Include="IVlcObject.cs" />
-    <Compile Include="LibVlcManager.cs" />
     <Compile Include="MediaTrack.cs" />
     <Compile Include="ModuleDescription.cs" />
+    <Compile Include="Interop\Platform.cs" />
     <Compile Include="PresetAudioEqualizerType.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Size.cs" />
     <Compile Include="TrackDescription.cs" />
     <Compile Include="Vlc.cs" />
-    <Compile Include="Vlc.Vlm.cs" />
     <Compile Include="VlcError.cs" />
     <Compile Include="VlcEventManager.cs" />
+    <Compile Include="LibVlcManager.cs" />
     <Compile Include="VlcMedia.cs" />
     <Compile Include="VlcMediaPlayer.cs" />
     <Compile Include="VlcSettingsAttribute.cs" />
+    <Compile Include="VlcUnmanagedLinkedList.cs" />
+    <Compile Include="VlcUnmanagedList.cs" />
     <Compile Include="Win32Api.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Meta.Vlc/Meta.Vlc - .Net 4.0.csproj.DotSettings b/Meta.Vlc/Meta.Vlc - .Net 4.0.csproj.DotSettings
new file mode 100644
index 0000000..195c460
--- /dev/null
+++ b/Meta.Vlc/Meta.Vlc - .Net 4.0.csproj.DotSettings	
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">Latest</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Meta.Vlc/Meta.Vlc - .Net 4.5.csproj b/Meta.Vlc/Meta.Vlc - .Net 4.5.csproj
index b41bb99..bf2cbcf 100644
--- a/Meta.Vlc/Meta.Vlc - .Net 4.5.csproj	
+++ b/Meta.Vlc/Meta.Vlc - .Net 4.5.csproj	
@@ -22,6 +22,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,6 +34,8 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <DocumentationFile>..\Release\.NET 4.5\Meta.Vlc.XML</DocumentationFile>
+    <LangVersion>latest</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -41,6 +45,8 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>..\x64\Release\.NET 4.5\</OutputPath>
@@ -51,6 +57,8 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -60,6 +68,8 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\x86\Release\.NET 4.5\</OutputPath>
@@ -70,6 +80,8 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>
@@ -84,36 +96,62 @@
     <Compile Include="AudioDevice.cs" />
     <Compile Include="AudioEqualizer.cs" />
     <Compile Include="AudioOutput.cs" />
+    <Compile Include="AudioOutputChannel.cs" />
+    <Compile Include="EventType.cs" />
     <Compile Include="Exceptions.cs" />
-    <Compile Include="HandleManager.cs" />
+    <Compile Include="Event\MediaDurationChangedEventArgs.cs" />
+    <Compile Include="Event\MediaFreedEventArgs.cs" />
+    <Compile Include="Event\MediaMetaChangedEventArgs.cs" />
+    <Compile Include="MediaMetaType.cs" />
+    <Compile Include="MediaParsedStatus.cs" />
+    <Compile Include="Event\MediaParsedStatusChangedEventArgs.cs" />
+    <Compile Include="MediaParseOption.cs" />
+    <Compile Include="Event\MediaPlayerBufferingEventArgs.cs" />
+    <Compile Include="Event\MediaPlayerValueChangedEventArgs.cs" />
+    <Compile Include="MediaState.cs" />
+    <Compile Include="Event\MediaStateChangedEventArgs.cs" />
+    <Compile Include="Event\MediaSubItemAddedEventArgs.cs" />
+    <Compile Include="MediaStats.cs" />
+    <Compile Include="MediaTrackInfo.cs" />
+    <Compile Include="MouseButton.cs" />
+    <Compile Include="Event\ObjectEventArgs.cs" />
+    <Compile Include="Position.cs" />
+    <Compile Include="StringHandle.cs" />
+    <Compile Include="VlcObjectManager.cs" />
     <Compile Include="InteropHelper.cs" />
-    <Compile Include="Interop\LibVlc.Core.cs" />
-    <Compile Include="Interop\LibVlc.Media.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Audio.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Audio.Output.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Audio.Equalizer.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.cs" />
-    <Compile Include="Interop\LibVlc.MediaPlayer.Video.cs" />
-    <Compile Include="Interop\LibVlc.Time.cs" />
+    <Compile Include="Interop\Core\Callback.cs" />
+    <Compile Include="Interop\Core\Enum.cs" />
+    <Compile Include="Interop\Core\Function.cs" />
+    <Compile Include="Interop\Core\Struct.cs" />
     <Compile Include="Interop\LibVlc.VLM.cs" />
     <Compile Include="Interop\LibVlcFunction.cs" />
     <Compile Include="Interop\LibVlcFunctionAttribute.cs" />
     <Compile Include="Interop\LibVlcVersion.cs" />
+    <Compile Include="Interop\MediaPlayer\Callback.cs" />
+    <Compile Include="Interop\MediaPlayer\Enum.cs" />
+    <Compile Include="Interop\MediaPlayer\Function.cs" />
+    <Compile Include="Interop\MediaPlayer\Struct.cs" />
+    <Compile Include="Interop\Media\Callback.cs" />
+    <Compile Include="Interop\Media\Enum.cs" />
+    <Compile Include="Interop\Media\Function.cs" />
+    <Compile Include="Interop\Media\Struct.cs" />
     <Compile Include="IVlcObject.cs" />
-    <Compile Include="LibVlcManager.cs" />
     <Compile Include="MediaTrack.cs" />
     <Compile Include="ModuleDescription.cs" />
+    <Compile Include="Interop\Platform.cs" />
     <Compile Include="PresetAudioEqualizerType.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Size.cs" />
     <Compile Include="TrackDescription.cs" />
     <Compile Include="Vlc.cs" />
-    <Compile Include="Vlc.Vlm.cs" />
     <Compile Include="VlcError.cs" />
     <Compile Include="VlcEventManager.cs" />
+    <Compile Include="LibVlcManager.cs" />
     <Compile Include="VlcMedia.cs" />
     <Compile Include="VlcMediaPlayer.cs" />
     <Compile Include="VlcSettingsAttribute.cs" />
+    <Compile Include="VlcUnmanagedLinkedList.cs" />
+    <Compile Include="VlcUnmanagedList.cs" />
     <Compile Include="Win32Api.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Meta.Vlc/Meta.Vlc - .Net 4.5.csproj.DotSettings b/Meta.Vlc/Meta.Vlc - .Net 4.5.csproj.DotSettings
new file mode 100644
index 0000000..195c460
--- /dev/null
+++ b/Meta.Vlc/Meta.Vlc - .Net 4.5.csproj.DotSettings	
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">Latest</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Meta.Vlc/ModuleDescription.cs b/Meta.Vlc/ModuleDescription.cs
index 6c21f48..f2d0a06 100644
--- a/Meta.Vlc/ModuleDescription.cs
+++ b/Meta.Vlc/ModuleDescription.cs
@@ -1,100 +1,60 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: ModuleDescription.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
+using Meta.Vlc.Interop.Core;
 
 namespace Meta.Vlc
 {
     /// <summary>
-    ///     A warpper for <see cref="Interop.Core.ModuleDescription" /> struct.
+    ///     A wrapper for <see cref="libvlc_module_description_t" /> struct.
     /// </summary>
-    public class ModuleDescription
+    public unsafe class ModuleDescription
     {
-        internal IntPtr _pointer;
-
-        internal Interop.Core.ModuleDescription _struct;
-
-        internal ModuleDescription(IntPtr pointer)
+        internal ModuleDescription(libvlc_module_description_t* pointer)
         {
-            _pointer = pointer;
-            if (pointer != IntPtr.Zero)
-            {
-                _struct =
-                    (Interop.Core.ModuleDescription)
-                        Marshal.PtrToStructure(pointer, typeof (Interop.Core.ModuleDescription));
-                Name = InteropHelper.PtrToString(_struct.Name);
-                ShortName = InteropHelper.PtrToString(_struct.ShortName);
-                LongName = InteropHelper.PtrToString(_struct.LongName);
-                Help = InteropHelper.PtrToString(_struct.Help);
-            }
+            if (pointer == null) return;
+            Name = InteropHelper.PtrToString(pointer->psz_name);
+            ShortName = InteropHelper.PtrToString(pointer->psz_shortname);
+            LongName = InteropHelper.PtrToString(pointer->psz_longname);
+            Help = InteropHelper.PtrToString(pointer->psz_help);
         }
 
-        public String Name { get; private set; }
+        public string Name { get; }
 
-        public String ShortName { get; private set; }
+        public string ShortName { get; }
 
-        public String LongName { get; private set; }
+        public string LongName { get; }
 
-        public String Help { get; private set; }
+        public string Help { get; }
     }
 
     /// <summary>
-    ///     A list warpper for <see cref="Interop.Core.ModuleDescription" /> linklist struct.
+    ///     A list wrapper for <see cref="libvlc_module_description_t" /> linked list struct.
     /// </summary>
-    public class ModuleDescriptionList : IDisposable, IEnumerable<ModuleDescription>, IEnumerable
+    public unsafe class ModuleDescriptionList : VlcUnmanagedLinkedList<ModuleDescription>
     {
-        private List<ModuleDescription> _list;
-        private IntPtr _pointer;
-
-        /// <summary>
-        ///     Create a readonly list by a pointer of <see cref="Interop.Core.ModuleDescription" />.
-        /// </summary>
-        /// <param name="pointer"></param>
-        public ModuleDescriptionList(IntPtr pointer)
-        {
-            _list = new List<ModuleDescription>();
-            _pointer = pointer;
-
-            while (pointer != IntPtr.Zero)
-            {
-                var ModuleDescription = new ModuleDescription(pointer);
-                _list.Add(ModuleDescription);
-
-                pointer = ModuleDescription._struct.Next;
-            }
-        }
-
-        public int Count
-        {
-            get { return _list.Count; }
-        }
-
-        public ModuleDescription this[int index]
+        public ModuleDescriptionList(void* pointer) : base(pointer)
         {
-            get { return _list[index]; }
         }
 
-        public void Dispose()
+        protected override ModuleDescription CreateItem(void* data)
         {
-            if (_pointer == IntPtr.Zero) return;
-
-            LibVlcManager.ReleaseModuleDescriptionList(_pointer);
-            _pointer = IntPtr.Zero;
-            _list.Clear();
+            return new ModuleDescription((libvlc_module_description_t*) data);
         }
 
-        public IEnumerator<ModuleDescription> GetEnumerator()
+        protected override void* NextItem(void* data)
         {
-            return _list.GetEnumerator();
+            return ((libvlc_module_description_t*) data)->p_next;
         }
 
-        IEnumerator IEnumerable.GetEnumerator()
+        protected override void Release(void* data)
         {
-            return GetEnumerator();
+            LibVlcManager.GetFunctionDelegate<libvlc_module_description_list_release>()
+                .Invoke((libvlc_module_description_t*) data);
         }
     }
 }
\ No newline at end of file
diff --git a/Meta.Vlc/MouseButton.cs b/Meta.Vlc/MouseButton.cs
new file mode 100644
index 0000000..e8a9ee6
--- /dev/null
+++ b/Meta.Vlc/MouseButton.cs
@@ -0,0 +1,43 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: MouseButton.cs
+// Version: 20181231
+
+using Meta.Vlc.Interop.MediaPlayer;
+
+namespace Meta.Vlc
+{
+    /// <summary>
+    ///     A enum of mouse button.
+    /// </summary>
+    public enum MouseButton
+    {
+        /// <summary>
+        ///     The left button of mouse.
+        /// </summary>
+        Left,
+
+        /// <summary>
+        ///     The right button of mouse.
+        /// </summary>
+        Right,
+
+        /// <summary>
+        ///     Other buttons of mouse, it is not commonly used.
+        /// </summary>
+        Other
+    }
+
+
+    /// <summary>
+    ///     Navigation mode
+    /// </summary>
+    public enum NavigateMode : uint
+    {
+        Activate = libvlc_navigate_mode_t.libvlc_navigate_activate,
+        Up = libvlc_navigate_mode_t.libvlc_navigate_up,
+        Down = libvlc_navigate_mode_t.libvlc_navigate_down,
+        Left = libvlc_navigate_mode_t.libvlc_navigate_left,
+        Right = libvlc_navigate_mode_t.libvlc_navigate_right,
+        Popup = libvlc_navigate_mode_t.libvlc_navigate_popup
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Position.cs b/Meta.Vlc/Position.cs
new file mode 100644
index 0000000..69e13ba
--- /dev/null
+++ b/Meta.Vlc/Position.cs
@@ -0,0 +1,25 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: Position.cs
+// Version: 20181231
+
+using Meta.Vlc.Interop.MediaPlayer;
+
+namespace Meta.Vlc
+{
+    /// <summary>
+    ///     Enumeration of values used to set position (e.g. of video title).
+    /// </summary>
+    public enum Position
+    {
+        Disable = libvlc_position_t.libvlc_position_disable,
+        Center = libvlc_position_t.libvlc_position_center,
+        Left = libvlc_position_t.libvlc_position_left,
+        Right = libvlc_position_t.libvlc_position_right,
+        Top = libvlc_position_t.libvlc_position_top,
+        TopLeft = libvlc_position_t.libvlc_position_top_left,
+        TopRight = libvlc_position_t.libvlc_position_top_right,
+        Bottom = libvlc_position_t.libvlc_position_bottom,
+        BottomLeft = libvlc_position_t.libvlc_position_bottom_left,
+        BottomRight = libvlc_position_t.libvlc_position_bottom_right
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/PresetAudioEqualizerType.cs b/Meta.Vlc/PresetAudioEqualizerType.cs
index 3d16775..58ea1e8 100644
--- a/Meta.Vlc/PresetAudioEqualizerType.cs
+++ b/Meta.Vlc/PresetAudioEqualizerType.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: PresetAudioEqualizerType.cs
-// Version: 20160214
+// Version: 20181231
 
 namespace Meta.Vlc
 {
diff --git a/Meta.Vlc/Properties/AssemblyInfo.cs b/Meta.Vlc/Properties/AssemblyInfo.cs
index d336e65..72133a6 100644
--- a/Meta.Vlc/Properties/AssemblyInfo.cs
+++ b/Meta.Vlc/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: AssemblyInfo.cs
-// Version: 20160214
+// Version: 20181231
 
 using System.Reflection;
 using System.Runtime.InteropServices;
diff --git a/Meta.Vlc/Size.cs b/Meta.Vlc/Size.cs
index 64d4611..4cee72f 100644
--- a/Meta.Vlc/Size.cs
+++ b/Meta.Vlc/Size.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: Size.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
 
@@ -14,7 +14,7 @@ public struct Size
     {
         public Size(double width, double height)
             : this()
-            //needed for VS2013 to compile, else complains that "this" is used before all of its fields have been assigned
+        //needed for VS2013 to compile, else complains that "this" is used before all of its fields have been assigned
         {
             Width = width;
             Height = height;
@@ -45,13 +45,13 @@ public Size(double width, double height)
 
         public bool Equals(Size size)
         {
-            return (size == this);
+            return size == this;
         }
 
         public override bool Equals(object obj)
         {
-            if (obj is Size)
-                return (Size) obj == this;
+            if (obj is Size size)
+                return size == this;
             return false;
         }
 
diff --git a/Meta.Vlc/StringHandle.cs b/Meta.Vlc/StringHandle.cs
new file mode 100644
index 0000000..54d535f
--- /dev/null
+++ b/Meta.Vlc/StringHandle.cs
@@ -0,0 +1,57 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: StringHandle.cs
+// Version: 20181231
+
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Meta.Vlc
+{
+    public unsafe class StringHandle : IDisposable
+    {
+        private bool _disposedValue;
+        private readonly GCHandle? _handle;
+
+        public StringHandle(string value, Encoding encoding = null)
+        {
+            if (value == null)
+            {
+                _handle = null;
+                return;
+            }
+
+            if (encoding == null) encoding = Encoding.UTF8;
+
+            _handle = GCHandle.Alloc(encoding.GetBytes(value), GCHandleType.Pinned);
+        }
+
+        public IntPtr Pointer => _handle?.AddrOfPinnedObject() ?? IntPtr.Zero;
+
+        public byte* UnsafePointer => (byte*) Pointer.ToPointer();
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposedValue)
+            {
+                if (disposing)
+                {
+                }
+
+                _handle?.Free();
+                _disposedValue = true;
+            }
+        }
+
+        ~StringHandle()
+        {
+            Dispose(false);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/TrackDescription.cs b/Meta.Vlc/TrackDescription.cs
index b58751b..ffc80d4 100644
--- a/Meta.Vlc/TrackDescription.cs
+++ b/Meta.Vlc/TrackDescription.cs
@@ -1,94 +1,52 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: TrackDescription.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
+using Meta.Vlc.Interop.MediaPlayer;
 
 namespace Meta.Vlc
 {
     /// <summary>
-    ///     A warpper for <see cref="Interop.MediaPlayer.TrackDescription" /> struct.
+    ///     A wrapper for <see cref="libvlc_track_description_t" /> struct.
     /// </summary>
-    public class TrackDescription
+    public unsafe class TrackDescription
     {
-        private IntPtr _pointer;
-
-        internal Interop.MediaPlayer.TrackDescription Struct;
-
-        internal TrackDescription(IntPtr pointer)
+        internal TrackDescription(libvlc_track_description_t* pointer)
         {
-            _pointer = pointer;
-            if (pointer != IntPtr.Zero)
-            {
-                Struct =
-                    (Interop.MediaPlayer.TrackDescription)
-                        Marshal.PtrToStructure(pointer, typeof (Interop.MediaPlayer.TrackDescription));
-                Name = InteropHelper.PtrToString(Struct.Name);
-                Id = Struct.Id;
-            }
+            if (pointer == null) return;
+            Name = InteropHelper.PtrToString(pointer->psz_name);
+            Id = pointer->i_id;
         }
 
-        public String Name { get; private set; }
+        public string Name { get; }
 
-        public int Id { get; private set; }
+        public int Id { get; }
     }
 
     /// <summary>
-    ///     A list warpper for <see cref="Interop.MediaPlayer.TrackDescription" /> linklist struct.
+    ///     A list wrapper for <see cref="libvlc_track_description_t" /> linked list struct.
     /// </summary>
-    public class TrackDescriptionList : IDisposable, IEnumerable<TrackDescription>, IEnumerable
+    public unsafe class TrackDescriptionList : VlcUnmanagedLinkedList<TrackDescription>
     {
-        private List<TrackDescription> _list;
-        private IntPtr _pointer;
-
-        /// <summary>
-        ///     Create a readonly list by a pointer of <see cref="Interop.MediaPlayer.TrackDescription" />.
-        /// </summary>
-        /// <param name="pointer"></param>
-        public TrackDescriptionList(IntPtr pointer)
-        {
-            _list = new List<TrackDescription>();
-            _pointer = pointer;
-
-            while (pointer != IntPtr.Zero)
-            {
-                var trackDescription = new TrackDescription(pointer);
-                _list.Add(trackDescription);
-
-                pointer = trackDescription.Struct.Next;
-            }
-        }
-
-        public int Count
-        {
-            get { return _list.Count; }
-        }
-
-        public TrackDescription this[int index]
+        public TrackDescriptionList(void* pointer) : base(pointer)
         {
-            get { return _list[index]; }
         }
 
-        public void Dispose()
+        protected override TrackDescription CreateItem(void* data)
         {
-            if (_pointer == IntPtr.Zero) return;
-
-            LibVlcManager.ReleaseTrackDescriptionList(_pointer);
-            _pointer = IntPtr.Zero;
-            _list.Clear();
+            return new TrackDescription((libvlc_track_description_t*) data);
         }
 
-        public IEnumerator<TrackDescription> GetEnumerator()
+        protected override void* NextItem(void* data)
         {
-            return _list.GetEnumerator();
+            return ((libvlc_track_description_t*) data)->p_next;
         }
 
-        IEnumerator IEnumerable.GetEnumerator()
+        protected override void Release(void* data)
         {
-            return GetEnumerator();
+            LibVlcManager.GetFunctionDelegate<libvlc_track_description_list_release>()
+                .Invoke((libvlc_track_description_t*) data);
         }
     }
 }
\ No newline at end of file
diff --git a/Meta.Vlc/Vlc.Vlm.cs b/Meta.Vlc/Vlc.Vlm.cs
deleted file mode 100644
index 4082a33..0000000
--- a/Meta.Vlc/Vlc.Vlm.cs
+++ /dev/null
@@ -1,426 +0,0 @@
-// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
-// Filename: Vlc.Vlm.cs
-// Version: 20160214
-
-using System;
-using System.Runtime.InteropServices;
-using Meta.Vlc.Interop;
-using Meta.Vlc.Interop.Core.Events;
-using Meta.Vlc.Interop.VLM;
-
-namespace Meta.Vlc
-{
-    public partial class Vlc : IVlcObjectWithEvent
-    {
-        private static LibVlcFunction<ReleaseVlmInstance> _releaseVlmInstanceFunction;
-        private static LibVlcFunction<NewBroadCastInput> _newBroadCastInputFunction;
-        private static LibVlcFunction<NewVodInput> _newVodInputFunction;
-        private static LibVlcFunction<DelBoroadcastOrOvd> _delBoroadcastOrOvdFunction;
-        private static LibVlcFunction<MediaSwitch> _mediaSwitchFunction;
-        private static LibVlcFunction<SetMediaOutput> _setMediaOutputFunction;
-        private static LibVlcFunction<SetMediaInput> _setMediaInputFunction;
-        private static LibVlcFunction<AddMediaInput> _addMediaInputFunction;
-        private static LibVlcFunction<SetMediaLoop> _setMediaLoopFunction;
-        private static LibVlcFunction<SetVodMuxer> _setVodMuxerFunction;
-        private static LibVlcFunction<EditMediaParas> _editMediaParasFunction;
-        private static LibVlcFunction<PlayNamedBroadcast> _playNamedBroadcastFunction;
-        private static LibVlcFunction<StopNamedBroadcast> _stopNamedBroadcastFunction;
-        private static LibVlcFunction<PauseNamedBroadcast> _pauseNamedBroadcastFunction;
-        private static LibVlcFunction<SeekInNamedBroadcast> _seekInNamedBroadcastFunction;
-        private static LibVlcFunction<ReturnJsonMessage> _returnJsonMessageFunction;
-        private static LibVlcFunction<GetMediaPosition> _getMediaPositionFunction;
-        private static LibVlcFunction<GetMediaTime> _getMediaTimeFunction;
-        private static LibVlcFunction<GetMediaLength> _getMediaLengthFunction;
-        private static LibVlcFunction<GetMediaBackRate> _getMediaBackRateFunction;
-        private static LibVlcFunction<GetMediaEventManager> _getMediaEventManagerFunction;
-
-        private readonly LibVlcEventCallBack _onVlmMediaAdded;
-        private readonly LibVlcEventCallBack _onVlmMediaChanged;
-        private readonly LibVlcEventCallBack _onVlmMediaInstanceStarted;
-        private readonly LibVlcEventCallBack _onVlmMediaInstanceStatusEnd;
-        private readonly LibVlcEventCallBack _onVlmMediaInstanceStatusError;
-        private readonly LibVlcEventCallBack _onVlmMediaInstanceStatusInit;
-        private readonly LibVlcEventCallBack _onVlmMediaInstanceStatusOpening;
-        private readonly LibVlcEventCallBack _onVlmMediaInstanceStatusPause;
-        private readonly LibVlcEventCallBack _onVlmMediaInstanceStatusPlaying;
-        private readonly LibVlcEventCallBack _onVlmMediaInstanceStopped;
-        private readonly LibVlcEventCallBack _onVlmMediaRemoved;
-
-        private GCHandle _onVlmMediaAddedHandle;
-        private GCHandle _onVlmMediaChangedHandle;
-        private GCHandle _onVlmMediaInstanceStartedHandle;
-        private GCHandle _onVlmMediaInstanceStatusEndHandle;
-        private GCHandle _onVlmMediaInstanceStatusErrorHandle;
-        private GCHandle _onVlmMediaInstanceStatusInitHandle;
-        private GCHandle _onVlmMediaInstanceStatusOpeningHandle;
-        private GCHandle _onVlmMediaInstanceStatusPauseHandle;
-        private GCHandle _onVlmMediaInstanceStatusPlayingHandle;
-        private GCHandle _onVlmMediaInstanceStoppedHandle;
-        private GCHandle _onVlmMediaRemovedHandle;
-
-        public VlcEventManager EventManager { get; private set; }
-
-        public void VlmRelease()
-        {
-            _releaseVlmInstanceFunction.Delegate(InstancePointer);
-        }
-
-        public bool VlmAddBroadcast(String name, String input, String output, int options, String[] additionalOptions,
-            int enable, int loop)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-            var inputHandle = InteropHelper.StringToPtr(input);
-            var outputHandle = InteropHelper.StringToPtr(output);
-
-            var result = _newBroadCastInputFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject(),
-                inputHandle.AddrOfPinnedObject(), outputHandle.AddrOfPinnedObject(), options,
-                InteropHelper.StringArrayToPtr(additionalOptions), enable, loop) == 0;
-
-            nameHandle.Free();
-            inputHandle.Free();
-            outputHandle.Free();
-
-            return result;
-        }
-
-        public bool VlmAddVod(String name, String input, int options, String[] additionalOptions, int enable,
-            String muxer)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-            var inputHandle = InteropHelper.StringToPtr(input);
-            var muxerHandle = InteropHelper.StringToPtr(muxer);
-
-            var result = _newVodInputFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject(),
-                inputHandle.AddrOfPinnedObject(), options, InteropHelper.StringArrayToPtr(additionalOptions), enable,
-                muxerHandle.AddrOfPinnedObject()) == 0;
-
-            nameHandle.Free();
-            inputHandle.Free();
-            muxerHandle.Free();
-
-            return result;
-        }
-
-        public bool VlmDeleteMedia(String name)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-
-            var result = _delBoroadcastOrOvdFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject()) == 0;
-
-            nameHandle.Free();
-
-            return result;
-        }
-
-        public bool VlmSetEnable(String name, int enable)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-
-            var result = _mediaSwitchFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject(), enable) == 0;
-
-            nameHandle.Free();
-
-            return result;
-        }
-
-        public bool VlmSetOutput(String name, String output)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-            var outputHandle = InteropHelper.StringToPtr(output);
-
-            var result =
-                _setMediaOutputFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject(),
-                    outputHandle.AddrOfPinnedObject()) == 0;
-
-            nameHandle.Free();
-            outputHandle.Free();
-
-            return result;
-        }
-
-        public bool VlmSetInput(String name, String input)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-            var inputHandle = InteropHelper.StringToPtr(input);
-
-            var result =
-                _setMediaInputFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject(),
-                    inputHandle.AddrOfPinnedObject()) == 0;
-
-            nameHandle.Free();
-            inputHandle.Free();
-
-            return result;
-        }
-
-        public bool VlmAddInput(String name, String input)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-            var inputHandle = InteropHelper.StringToPtr(input);
-
-            var result =
-                _addMediaInputFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject(),
-                    inputHandle.AddrOfPinnedObject()) == 0;
-
-            nameHandle.Free();
-            inputHandle.Free();
-
-            return result;
-        }
-
-        public bool VlmSetLoop(String name, int loop)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-
-            var result = _setMediaLoopFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject(), loop) == 0;
-
-            nameHandle.Free();
-
-            return result;
-        }
-
-        public bool VlmSetMuxer(String name, String muxer)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-            var muxerHandle = InteropHelper.StringToPtr(muxer);
-
-            var result =
-                _setVodMuxerFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject(),
-                    muxerHandle.AddrOfPinnedObject()) == 0;
-
-            nameHandle.Free();
-            muxerHandle.Free();
-
-            return result;
-        }
-
-        public bool VlmChangeMedia(String name, String input, String output, int options, String[] additionalOptions,
-            int enable, int loop)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-            var inputHandle = InteropHelper.StringToPtr(input);
-            var outputHandle = InteropHelper.StringToPtr(output);
-
-            var result = _editMediaParasFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject(),
-                inputHandle.AddrOfPinnedObject(), outputHandle.AddrOfPinnedObject(), options,
-                InteropHelper.StringArrayToPtr(additionalOptions), enable, loop) == 0;
-
-            nameHandle.Free();
-            inputHandle.Free();
-            outputHandle.Free();
-
-            return result;
-        }
-
-        public bool VlmPlay(String name)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-
-            var result = _playNamedBroadcastFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject()) == 0;
-
-            nameHandle.Free();
-
-            return result;
-        }
-
-        public bool VlmStop(String name)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-
-            var result = _stopNamedBroadcastFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject()) == 0;
-
-            nameHandle.Free();
-
-            return result;
-        }
-
-        public bool VlmPause(String name)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-
-            var result = _pauseNamedBroadcastFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject()) == 0;
-
-            nameHandle.Free();
-
-            return result;
-        }
-
-        public bool VlmSeek(String name, float percentage)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-
-            var result =
-                _seekInNamedBroadcastFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject(), percentage) ==
-                0;
-
-            nameHandle.Free();
-
-            return result;
-        }
-
-        public String VlmGetInfomation(String name)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-
-            var result = _returnJsonMessageFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject());
-
-            nameHandle.Free();
-
-            return InteropHelper.PtrToString(result);
-        }
-
-        public float VlmGetPosition(String name, int id)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-
-            var result = _getMediaPositionFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject(), id);
-
-            nameHandle.Free();
-
-            return result;
-        }
-
-        public int VlmGetTime(String name, int id)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-
-            var result = _getMediaTimeFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject(), id);
-
-            nameHandle.Free();
-
-            return result;
-        }
-
-        public int VlmGetLength(String name, int id)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-
-            var result = _getMediaLengthFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject(), id);
-
-            nameHandle.Free();
-
-            return result;
-        }
-
-        public int VlmGetRate(String name, int id)
-        {
-            var nameHandle = InteropHelper.StringToPtr(name);
-
-            var result = _getMediaBackRateFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject(), id);
-
-            nameHandle.Free();
-
-            return result;
-        }
-
-        private void OnVlmMediaAdded(ref LibVlcEventArgs arg, IntPtr userData)
-        {
-            if (VlmMediaAdded != null)
-            {
-                VlmMediaAdded(this, new ObjectEventArgs<VlmMediaEventArgs>(arg.VlmMediaEvent));
-            }
-        }
-
-        public event EventHandler<ObjectEventArgs<VlmMediaEventArgs>> VlmMediaAdded;
-
-        private void OnVlmMediaRemoved(ref LibVlcEventArgs arg, IntPtr userData)
-        {
-            if (VlmMediaRemoved != null)
-            {
-                VlmMediaRemoved(this, new ObjectEventArgs<VlmMediaEventArgs>(arg.VlmMediaEvent));
-            }
-        }
-
-        public event EventHandler<ObjectEventArgs<VlmMediaEventArgs>> VlmMediaRemoved;
-
-        private void OnVlmMediaChanged(ref LibVlcEventArgs arg, IntPtr userData)
-        {
-            if (VlmMediaChanged != null)
-            {
-                VlmMediaChanged(this, new ObjectEventArgs<VlmMediaEventArgs>(arg.VlmMediaEvent));
-            }
-        }
-
-        public event EventHandler<ObjectEventArgs<VlmMediaEventArgs>> VlmMediaChanged;
-
-        private void OnVlmMediaInstanceStarted(ref LibVlcEventArgs arg, IntPtr userData)
-        {
-            if (VlmMediaInstanceStarted != null)
-            {
-                VlmMediaInstanceStarted(this, new ObjectEventArgs<VlmMediaEventArgs>(arg.VlmMediaEvent));
-            }
-        }
-
-        public event EventHandler<ObjectEventArgs<VlmMediaEventArgs>> VlmMediaInstanceStarted;
-
-        private void OnVlmMediaInstanceStopped(ref LibVlcEventArgs arg, IntPtr userData)
-        {
-            if (VlmMediaInstanceStopped != null)
-            {
-                VlmMediaInstanceStopped(this, new ObjectEventArgs<VlmMediaEventArgs>(arg.VlmMediaEvent));
-            }
-        }
-
-        public event EventHandler<ObjectEventArgs<VlmMediaEventArgs>> VlmMediaInstanceStopped;
-
-        private void OnVlmMediaInstanceStatusInit(ref LibVlcEventArgs arg, IntPtr userData)
-        {
-            if (VlmMediaInstanceStatusInit != null)
-            {
-                VlmMediaInstanceStatusInit(this, new ObjectEventArgs<VlmMediaEventArgs>(arg.VlmMediaEvent));
-            }
-        }
-
-        public event EventHandler<ObjectEventArgs<VlmMediaEventArgs>> VlmMediaInstanceStatusInit;
-
-        private void OnVlmMediaInstanceStatusOpening(ref LibVlcEventArgs arg, IntPtr userData)
-        {
-            if (VlmMediaInstanceStatusOpening != null)
-            {
-                VlmMediaInstanceStatusOpening(this, new ObjectEventArgs<VlmMediaEventArgs>(arg.VlmMediaEvent));
-            }
-        }
-
-        public event EventHandler<ObjectEventArgs<VlmMediaEventArgs>> VlmMediaInstanceStatusOpening;
-
-        private void OnVlmMediaInstanceStatusPlaying(ref LibVlcEventArgs arg, IntPtr userData)
-        {
-            if (VlmMediaInstanceStatusPlaying != null)
-            {
-                VlmMediaInstanceStatusPlaying(this, new ObjectEventArgs<VlmMediaEventArgs>(arg.VlmMediaEvent));
-            }
-        }
-
-        public event EventHandler<ObjectEventArgs<VlmMediaEventArgs>> VlmMediaInstanceStatusPlaying;
-
-        private void OnVlmMediaInstanceStatusPause(ref LibVlcEventArgs arg, IntPtr userData)
-        {
-            if (VlmMediaInstanceStatusPause != null)
-            {
-                VlmMediaInstanceStatusPause(this, new ObjectEventArgs<VlmMediaEventArgs>(arg.VlmMediaEvent));
-            }
-        }
-
-        public event EventHandler<ObjectEventArgs<VlmMediaEventArgs>> VlmMediaInstanceStatusPause;
-
-        private void OnVlmMediaInstanceStatusEnd(ref LibVlcEventArgs arg, IntPtr userData)
-        {
-            if (VlmMediaInstanceStatusEnd != null)
-            {
-                VlmMediaInstanceStatusEnd(this, new ObjectEventArgs<VlmMediaEventArgs>(arg.VlmMediaEvent));
-            }
-        }
-
-        public event EventHandler<ObjectEventArgs<VlmMediaEventArgs>> VlmMediaInstanceStatusEnd;
-
-        private void OnVlmMediaInstanceStatusError(ref LibVlcEventArgs arg, IntPtr userData)
-        {
-            if (VlmMediaInstanceStatusError != null)
-            {
-                VlmMediaInstanceStatusError(this, new ObjectEventArgs<VlmMediaEventArgs>(arg.VlmMediaEvent));
-            }
-        }
-
-        public event EventHandler<ObjectEventArgs<VlmMediaEventArgs>> VlmMediaInstanceStatusError;
-    }
-}
\ No newline at end of file
diff --git a/Meta.Vlc/Vlc.cs b/Meta.Vlc/Vlc.cs
index b14aead..c060359 100644
--- a/Meta.Vlc/Vlc.cs
+++ b/Meta.Vlc/Vlc.cs
@@ -1,93 +1,24 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: Vlc.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using Meta.Vlc.Interop;
 using Meta.Vlc.Interop.Core;
-using Meta.Vlc.Interop.Core.Events;
-using Meta.Vlc.Interop.VLM;
 
 namespace Meta.Vlc
 {
-    public partial class Vlc
+    public unsafe class Vlc : IVlcObject
     {
-        #region --- Fields ---
-
         private bool _disposed;
 
-        #region LibVlcFunctions
-
-        /// <summary>
-        ///     创建并初始化一个 LibVlc 实例,并提供相应的参数,这些参数和命令行提供的参数类似,会影响到 LibVlc 实例的默认配置.
-        ///     有效参数的列表取决于 LibVlc 版本,操作系统,可用 LibVlc 插件和平台.无效或不支持的参数会导致实例创建失败
-        /// </summary>
-        private static LibVlcFunction<NewInstance> _newInstanceFunction;
-
-        /// <summary>
-        ///     递减 LibVlc 实例的引用计数,如果它达到零,将会释放这个实例
-        /// </summary>
-        private static LibVlcFunction<ReleaseInstance> _releaseInstanceFunction;
-
-        /// <summary>
-        ///     递增 LibVlc 实例的引用计数,当调用 NewInstance 初始化成功时,引用计数将初始化为1
-        /// </summary>
-        private static LibVlcFunction<RetainInstance> _retainInstanceFunction;
-
-        /// <summary>
-        ///     尝试启动一个用户接口,用于 LibVlc 实例
-        /// </summary>
-        private static LibVlcFunction<AddInterface> _addInterfaceFunction;
-
-        /// <summary>
-        ///     为 LibVlc 设置一个回调,该回调将会在 LibVlc 退出时被调用,不能与 <see cref="Wait" /> 一起使用.
-        ///     而且,这个函数应该在播放一个列表或者开始一个用户接口前被调用,否则可能导致 LibVlc 在注册该回调前退出
-        /// </summary>
-        private static LibVlcFunction<SetExitHandler> _setExitHandlerFunction;
-
-        /// <summary>
-        ///     等待,直到一个接口导致 LibVlc 实例退出为止,在使用之前,应该使用 <see cref="AddInterface" /> 添加至少一个用户接口.
-        ///     实际上这个方法只会导致一个线程阻塞,建议使用 <see cref="SetExitHandler" />
-        /// </summary>
-        private static LibVlcFunction<Wait> _waitFunction;
-
-        /// <summary>
-        ///     设置一个用户代理字符串,当一个协议需要它的时候,LibVlc 将会提供该字符串
-        /// </summary>
-        private static LibVlcFunction<SetUserAgent> _setUserAgentFunction;
-
-        /// <summary>
-        ///     设置一些元信息关于该应用程序
-        /// </summary>
-        private static LibVlcFunction<SetAppId> _setAppIdFunction;
-
-        /// <summary>
-        ///     获取可用的音频过滤器
-        /// </summary>
-        private static LibVlcFunction<GetAudioFilterList> _getAudioFilterListFunction;
+        private GCHandle _onExitHandle;
 
         /// <summary>
-        ///     获取可用的视频过滤器
+        ///     Create a Vlc instance by default options.
         /// </summary>
-        private static LibVlcFunction<GetVideoFilterList> _getVideoFilterListFunction;
-
-        #endregion LibVlcFunctions
-
-        #endregion --- Fields ---
-
-        #region --- Initialization ---
-
-        static Vlc()
-        {
-            IsLibLoaded = false;
-        }
-
-        /// <summary>
-        ///     使用默认的参数初始化一个 Vlc 实例
-        /// </summary>
-        /// <exception cref="VlcCreateFailException">Can't create a Vlc instence, check your Vlc options.</exception>
+        /// <exception cref="VlcCreateFailException">Can't create a Vlc instance, check your Vlc options.</exception>
         /// <exception cref="Exception">A delegate callback throws an exception.</exception>
         public Vlc() :
             this(new[]
@@ -99,271 +30,139 @@ public Vlc() :
         }
 
         /// <summary>
-        ///     提供指定的参数初始化一个 Vlc 实例
+        ///     Create a Vlc instance by options.
         /// </summary>
         /// <param name="argv"></param>
         /// <exception cref="VlcCreateFailException">Can't create a Vlc instence, check your Vlc options.</exception>
         /// <exception cref="Exception">A delegate callback throws an exception.</exception>
-        public Vlc(String[] argv)
+        public Vlc(string[] argv)
         {
             InstancePointer = argv == null
-                ? _newInstanceFunction.Delegate(0, IntPtr.Zero)
-                : _newInstanceFunction.Delegate(argv.Length, InteropHelper.StringArrayToPtr(argv));
-
-            if (InstancePointer == IntPtr.Zero)
-            {
-                var ex = VlcError.GetErrorMessage();
-                throw new VlcCreateFailException(ex);
-            }
-
-            EventManager = new VlcEventManager(this, _getMediaEventManagerFunction.Delegate(InstancePointer));
-
-            _onVlmMediaAdded = OnVlmMediaAdded;
-            _onVlmMediaRemoved = OnVlmMediaRemoved;
-            _onVlmMediaChanged = OnVlmMediaChanged;
-            _onVlmMediaInstanceStarted = OnVlmMediaInstanceStarted;
-            _onVlmMediaInstanceStopped = OnVlmMediaInstanceStopped;
-            _onVlmMediaInstanceStatusInit = OnVlmMediaInstanceStatusInit;
-            _onVlmMediaInstanceStatusOpening = OnVlmMediaInstanceStatusOpening;
-            _onVlmMediaInstanceStatusPlaying = OnVlmMediaInstanceStatusPlaying;
-            _onVlmMediaInstanceStatusPause = OnVlmMediaInstanceStatusPause;
-            _onVlmMediaInstanceStatusEnd = OnVlmMediaInstanceStatusEnd;
-            _onVlmMediaInstanceStatusError = OnVlmMediaInstanceStatusError;
-
-            _onVlmMediaAddedHandle = GCHandle.Alloc(_onVlmMediaAdded);
-            _onVlmMediaRemovedHandle = GCHandle.Alloc(_onVlmMediaRemoved);
-            _onVlmMediaChangedHandle = GCHandle.Alloc(_onVlmMediaChanged);
-            _onVlmMediaInstanceStartedHandle = GCHandle.Alloc(_onVlmMediaInstanceStarted);
-            _onVlmMediaInstanceStoppedHandle = GCHandle.Alloc(_onVlmMediaInstanceStopped);
-            _onVlmMediaInstanceStatusInitHandle = GCHandle.Alloc(_onVlmMediaInstanceStatusInit);
-            _onVlmMediaInstanceStatusOpeningHandle = GCHandle.Alloc(_onVlmMediaInstanceStatusOpening);
-            _onVlmMediaInstanceStatusPlayingHandle = GCHandle.Alloc(_onVlmMediaInstanceStatusPlaying);
-            _onVlmMediaInstanceStatusPauseHandle = GCHandle.Alloc(_onVlmMediaInstanceStatusPause);
-            _onVlmMediaInstanceStatusEndHandle = GCHandle.Alloc(_onVlmMediaInstanceStatusEnd);
-            _onVlmMediaInstanceStatusErrorHandle = GCHandle.Alloc(_onVlmMediaInstanceStatusError);
-
-            HandleManager.Add(this);
-
-            EventManager.Attach(EventTypes.VlmMediaAdded, _onVlmMediaAdded, IntPtr.Zero);
-            EventManager.Attach(EventTypes.VlmMediaRemoved, _onVlmMediaRemoved, IntPtr.Zero);
-            EventManager.Attach(EventTypes.VlmMediaChanged, _onVlmMediaChanged, IntPtr.Zero);
-            EventManager.Attach(EventTypes.VlmMediaInstanceStarted, _onVlmMediaInstanceStarted, IntPtr.Zero);
-            EventManager.Attach(EventTypes.VlmMediaInstanceStopped, _onVlmMediaInstanceStopped, IntPtr.Zero);
-            EventManager.Attach(EventTypes.VlmMediaInstanceStatusInit, _onVlmMediaInstanceStatusInit, IntPtr.Zero);
-            EventManager.Attach(EventTypes.VlmMediaInstanceStatusOpening, _onVlmMediaInstanceStatusOpening, IntPtr.Zero);
-            EventManager.Attach(EventTypes.VlmMediaInstanceStatusPlaying, _onVlmMediaInstanceStatusPlaying, IntPtr.Zero);
-            EventManager.Attach(EventTypes.VlmMediaInstanceStatusPause, _onVlmMediaInstanceStatusPause, IntPtr.Zero);
-            EventManager.Attach(EventTypes.VlmMediaInstanceStatusEnd, _onVlmMediaInstanceStatusEnd, IntPtr.Zero);
-            EventManager.Attach(EventTypes.VlmMediaInstanceStatusError, _onVlmMediaInstanceStatusError, IntPtr.Zero);
-        }
-
-        #endregion --- Initialization ---
-
-        #region --- Cleanup ---
-
-        protected void Dispose(bool disposing)
-        {
-            if (_disposed)
-                return;
+                ? LibVlcManager.GetFunctionDelegate<libvlc_new>().Invoke(0, IntPtr.Zero)
+                : LibVlcManager.GetFunctionDelegate<libvlc_new>()
+                    .Invoke(argv.Length, InteropHelper.StringArrayToPtr(argv));
 
-            HandleManager.Remove(this);
+            if (InstancePointer == null) throw new VlcCreateFailException(VlcError.GetErrorMessage());
 
-            _releaseInstanceFunction.Delegate(InstancePointer);
+            ExitHandler onExit = OnExit;
+            _onExitHandle = GCHandle.Alloc(onExit);
+            LibVlcManager.GetFunctionDelegate<libvlc_set_exit_handler>().Invoke(InstancePointer, onExit, null);
 
-            InstancePointer = IntPtr.Zero;
-
-            _onVlmMediaAddedHandle.Free();
-            _onVlmMediaRemovedHandle.Free();
-            _onVlmMediaChangedHandle.Free();
-            _onVlmMediaInstanceStartedHandle.Free();
-            _onVlmMediaInstanceStoppedHandle.Free();
-            _onVlmMediaInstanceStatusInitHandle.Free();
-            _onVlmMediaInstanceStatusOpeningHandle.Free();
-            _onVlmMediaInstanceStatusPlayingHandle.Free();
-            _onVlmMediaInstanceStatusPauseHandle.Free();
-            _onVlmMediaInstanceStatusEndHandle.Free();
-            _onVlmMediaInstanceStatusErrorHandle.Free();
-
-            _disposed = true;
+            VlcObjectManager.Add(this);
         }
 
-        /// <summary>
-        ///     释放当前 Vlc 资源
-        /// </summary>
         public void Dispose()
         {
             Dispose(true);
         }
 
-        #endregion --- Cleanup ---
-
-        #region --- Properties ---
+        public void* InstancePointer { get; private set; }
 
-        /// <summary>
-        ///     获取一个值,该值指示当前模块是否被载入
-        /// </summary>
-        public static bool IsLibLoaded { get; private set; }
+        public Vlc VlcInstance => this;
 
-        /// <summary>
-        ///     获取 Vlc 实例的指针
-        /// </summary>
-        public IntPtr InstancePointer { get; private set; }
-
-        public Vlc VlcInstance
-        {
-            get { return this; }
-        }
-
-        #endregion --- Properties ---
-
-        #region --- Methods ---
-
-        /// <exception cref="TypeLoadException">A custom attribute type cannot be loaded. </exception>
-        /// <exception cref="NoLibVlcFunctionAttributeException">
-        ///     For LibVlcFunction, need LibVlcFunctionAttribute to get Infomation
-        ///     of function.
-        /// </exception>
-        /// <exception cref="FunctionNotFoundException">Can't find function in dll.</exception>
-        internal static void LoadLibVlc()
+        protected void Dispose(bool disposing)
         {
-            if (IsLibLoaded) return;
-
-            _newInstanceFunction = new LibVlcFunction<NewInstance>();
-            _releaseInstanceFunction = new LibVlcFunction<ReleaseInstance>();
-            _retainInstanceFunction = new LibVlcFunction<RetainInstance>();
-            _addInterfaceFunction = new LibVlcFunction<AddInterface>();
-            _setExitHandlerFunction = new LibVlcFunction<SetExitHandler>();
-            _waitFunction = new LibVlcFunction<Wait>();
-            _setUserAgentFunction = new LibVlcFunction<SetUserAgent>();
-            _setAppIdFunction = new LibVlcFunction<SetAppId>();
-            _getAudioFilterListFunction = new LibVlcFunction<GetAudioFilterList>();
-            _getVideoFilterListFunction = new LibVlcFunction<GetVideoFilterList>();
-            _releaseVlmInstanceFunction = new LibVlcFunction<ReleaseVlmInstance>();
-            _newBroadCastInputFunction = new LibVlcFunction<NewBroadCastInput>();
-            _newVodInputFunction = new LibVlcFunction<NewVodInput>();
-            _delBoroadcastOrOvdFunction = new LibVlcFunction<DelBoroadcastOrOvd>();
-            _mediaSwitchFunction = new LibVlcFunction<MediaSwitch>();
-            _setMediaOutputFunction = new LibVlcFunction<SetMediaOutput>();
-            _setMediaInputFunction = new LibVlcFunction<SetMediaInput>();
-            _addMediaInputFunction = new LibVlcFunction<AddMediaInput>();
-            _setMediaLoopFunction = new LibVlcFunction<SetMediaLoop>();
-            _setVodMuxerFunction = new LibVlcFunction<SetVodMuxer>();
-            _editMediaParasFunction = new LibVlcFunction<EditMediaParas>();
-            _playNamedBroadcastFunction = new LibVlcFunction<PlayNamedBroadcast>();
-            _stopNamedBroadcastFunction = new LibVlcFunction<StopNamedBroadcast>();
-            _pauseNamedBroadcastFunction = new LibVlcFunction<PauseNamedBroadcast>();
-            _seekInNamedBroadcastFunction = new LibVlcFunction<SeekInNamedBroadcast>();
-            _returnJsonMessageFunction = new LibVlcFunction<ReturnJsonMessage>();
-            _getMediaPositionFunction = new LibVlcFunction<GetMediaPosition>();
-            _getMediaTimeFunction = new LibVlcFunction<GetMediaTime>();
-            _getMediaLengthFunction = new LibVlcFunction<GetMediaLength>();
-            _getMediaBackRateFunction = new LibVlcFunction<GetMediaBackRate>();
-            _getMediaEventManagerFunction = new LibVlcFunction<GetMediaEventManager>();
-            IsLibLoaded = true;
-        }
+            if (_disposed)
+                return;
 
-        /// <summary>
-        ///     递增引用计数,在使用 Meta.Vlc 时,一般是不需要调用此方法,引用计数是由 Vlc 类托管的
-        /// </summary>
-        public void Retain()
-        {
-            _retainInstanceFunction.Delegate(InstancePointer);
-        }
+            _onExitHandle.Free();
+            VlcObjectManager.Remove(this);
+            LibVlcManager.GetFunctionDelegate<libvlc_release>().Invoke(InstancePointer);
+            InstancePointer = null;
 
-        /// <summary>
-        ///     尝试添加一个用户接口
-        /// </summary>
-        /// <param name="name">接口名,为 NULL 则为默认</param>
-        /// <returns>是否成功添加接口</returns>
-        public bool AddInterface(String name)
-        {
-            var handle = GCHandle.Alloc(Encoding.UTF8.GetBytes(name), GCHandleType.Pinned);
-            var result = _addInterfaceFunction.Delegate(InstancePointer, handle.AddrOfPinnedObject()) == 0;
-            handle.Free();
-            return result;
+            _disposed = true;
         }
 
         /// <summary>
-        ///     等待,直到一个接口导致实例退出为止,在使用之前,应该使用 <see cref="AddInterface" /> 添加至少一个用户接口.
-        ///     实际上这个方法只会导致线程阻塞
+        ///     Try to start a user interface for the libvlc instance.
         /// </summary>
-        public void Wait()
+        /// <param name="name">interface name, or NULL for default</param>
+        /// <returns>true on success, false on error.</returns>
+        public bool AddInterface(string name)
         {
-            _waitFunction.Delegate(InstancePointer);
+            using (var handle = new StringHandle(name))
+            {
+                return LibVlcManager.GetFunctionDelegate<libvlc_add_intf>()
+                           .Invoke(InstancePointer, handle.UnsafePointer) == 0;
+            }
         }
 
         /// <summary>
-        ///     设置一个用户代理字符串,当一个协议需要它的时候,将会提供该字符串
+        ///     Sets the application name. LibVLC passes this as the user agent string when a protocol requires it.
         /// </summary>
-        /// <param name="name">应用程序名称,类似于 "FooBar player 1.2.3",实际上只要能标识应用程序,任何字符串都是可以的</param>
-        /// <param name="http">HTTP 用户代理,类似于 "FooBar/1.2.3 Python/2.6.0"</param>
-        public void SetUserAgent(String name, String http)
+        /// <param name="name">human-readable application name, e.g. "FooBar player 1.2.3"</param>
+        /// <param name="http">HTTP User Agent, e.g. "FooBar/1.2.3 Python/2.6.0"</param>
+        public void SetUserAgent(string name, string http)
         {
-            var nameHandle = GCHandle.Alloc(Encoding.UTF8.GetBytes(name), GCHandleType.Pinned);
-            var httpHandle = GCHandle.Alloc(Encoding.UTF8.GetBytes(http), GCHandleType.Pinned);
-            _setUserAgentFunction.Delegate(InstancePointer, nameHandle.AddrOfPinnedObject(),
-                httpHandle.AddrOfPinnedObject());
-            nameHandle.Free();
-            httpHandle.Free();
+            using (var nameHandle = new StringHandle(name))
+            {
+                using (var httpHandle = new StringHandle(http))
+                {
+                    LibVlcManager.GetFunctionDelegate<libvlc_set_user_agent>().Invoke(InstancePointer,
+                        nameHandle.UnsafePointer, httpHandle.UnsafePointer);
+                }
+            }
         }
 
         /// <summary>
-        ///     设置一些元信息关于该应用程序
+        ///     Sets some meta-information about the application.
         /// </summary>
-        /// <param name="id">Java 风格的应用标识符,类似于 "com.acme.foobar"</param>
-        /// <param name="version">应用程序版本,类似于 "1.2.3"</param>
-        /// <param name="icon">应用程序图标,类似于 "foobar"</param>
-        public void SetAppId(String id, String version, String icon)
+        /// <param name="id">Java-style application identifier, e.g. "com.acme.foobar"</param>
+        /// <param name="version">application version numbers, e.g. "1.2.3"</param>
+        /// <param name="icon">application icon name, e.g. "foobar"</param>
+        public void SetAppId(string id, string version, string icon)
         {
-            var idHandle = GCHandle.Alloc(Encoding.UTF8.GetBytes(id), GCHandleType.Pinned);
-            var versionHandle = GCHandle.Alloc(Encoding.UTF8.GetBytes(version), GCHandleType.Pinned);
-            var iconHandle = GCHandle.Alloc(Encoding.UTF8.GetBytes(icon), GCHandleType.Pinned);
-            _setAppIdFunction.Delegate(InstancePointer, idHandle.AddrOfPinnedObject(),
-                versionHandle.AddrOfPinnedObject(), iconHandle.AddrOfPinnedObject());
-            idHandle.Free();
-            versionHandle.Free();
-            iconHandle.Free();
+            using (var idHandle = new StringHandle(id))
+            {
+                using (var versionHandle = new StringHandle(version))
+                {
+                    using (var iconHandle = new StringHandle(icon))
+                    {
+                        LibVlcManager.GetFunctionDelegate<libvlc_set_app_id>().Invoke(InstancePointer,
+                            idHandle.UnsafePointer, versionHandle.UnsafePointer, iconHandle.UnsafePointer);
+                    }
+                }
+            }
         }
 
         /// <summary>
-        ///     获取可用的音频过滤器
+        ///     Returns a list of audio filters that are available.
         /// </summary>
-        public ModuleDescriptionList GetAudioFilterList()
+        public List<ModuleDescription> GetAudioFilterList()
         {
-            return new ModuleDescriptionList(_getAudioFilterListFunction.Delegate(InstancePointer));
+            using (var list = new ModuleDescriptionList(LibVlcManager
+                .GetFunctionDelegate<libvlc_audio_filter_list_get>().Invoke(InstancePointer)))
+            {
+                return new List<ModuleDescription>(list);
+            }
         }
 
         /// <summary>
-        ///     获取可用的视频过滤器
+        ///     Returns a list of video filters that are available.
         /// </summary>
-        public ModuleDescriptionList GetVideoFilterList()
+        public List<ModuleDescription> GetVideoFilterList()
         {
-            return new ModuleDescriptionList(_getVideoFilterListFunction.Delegate(InstancePointer));
+            using (var list = new ModuleDescriptionList(LibVlcManager
+                .GetFunctionDelegate<libvlc_video_filter_list_get>().Invoke(InstancePointer)))
+            {
+                return new List<ModuleDescription>(list);
+            }
         }
 
         /// <summary>
         ///     通过名称创建一个新的 VlcMedia
         /// </summary>
         /// <param name="name">媒体名称</param>
-        public VlcMedia CreateMediaAsNewNode(String name)
+        public VlcMedia CreateMediaAsNewNode(string name)
         {
             return VlcMedia.CreateAsNewNode(this, name);
         }
 
-        /// <summary>
-        ///     通过给定的文件描述符创建一个新的 VlcMedia
-        /// </summary>
-        /// <param name="fileDescriptor">文件描述符</param>
-        public VlcMedia CreateMediaFromFileDescriptor(int fileDescriptor)
-        {
-            return VlcMedia.CreateFormFileDescriptor(this, fileDescriptor);
-        }
-
         /// <summary>
         ///     通过给定的文件 Url 创建一个新的 VlcMedia,该 Url 的格式必须以 "file://" 开头,参见 "RFC3986".
         /// </summary>
         /// <param name="url">文件 Url</param>
-        public VlcMedia CreateMediaFromLocation(String url)
+        public VlcMedia CreateMediaFromLocation(string url)
         {
             return VlcMedia.CreateFormLocation(this, url);
         }
@@ -372,7 +171,7 @@ public VlcMedia CreateMediaFromLocation(String url)
         ///     通过给定的文件路径创建一个新的 VlcMedia
         /// </summary>
         /// <param name="path">文件路径</param>
-        public VlcMedia CreateMediaFromPath(String path)
+        public VlcMedia CreateMediaFromPath(string path)
         {
             return VlcMedia.CreateFormPath(this, path);
         }
@@ -382,11 +181,11 @@ public VlcMediaPlayer CreateMediaPlayer()
             return VlcMediaPlayer.Create(this);
         }
 
-        public void SetExitHandler(ExitHandler handler, IntPtr args)
+        public event EventHandler<EventArgs> Exit;
+
+        private void OnExit(void* data)
         {
-            _setExitHandlerFunction.Delegate(InstancePointer, handler, args);
+            Exit?.Invoke(this, new EventArgs());
         }
-
-        #endregion --- Methods ---
     }
 }
\ No newline at end of file
diff --git a/Meta.Vlc/VlcError.cs b/Meta.Vlc/VlcError.cs
index 00bb1d1..62e593c 100644
--- a/Meta.Vlc/VlcError.cs
+++ b/Meta.Vlc/VlcError.cs
@@ -1,41 +1,22 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: VlcError.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
-using Meta.Vlc.Interop;
 using Meta.Vlc.Interop.Core.Error;
 
 namespace Meta.Vlc
 {
-    public static class VlcError
+    public static unsafe class VlcError
     {
-        private static LibVlcFunction<ErrorMessage> _errorMessageFunction;
-        private static LibVlcFunction<CleanError> _cleanErrorFunction;
-
-        /// <summary>
-        ///     LibVlc error module loaded or not.
-        /// </summary>
-        public static bool IsLibLoaded { get; private set; }
-
-        internal static void LoadLibVlc()
-        {
-            if (!IsLibLoaded)
-            {
-                _errorMessageFunction = new LibVlcFunction<ErrorMessage>();
-                _cleanErrorFunction = new LibVlcFunction<CleanError>();
-                IsLibLoaded = true;
-            }
-        }
-
         /// <summary>
         ///     Get a readable error message.
         /// </summary>
         /// <returns>return a readable LibVlc error message, if there are no error will return <see cref="null" /></returns>
         /// <exception cref="Exception">A delegate callback throws an exception.</exception>
-        public static String GetErrorMessage()
+        public static string GetErrorMessage()
         {
-            return InteropHelper.PtrToString(_errorMessageFunction.Delegate());
+            return InteropHelper.PtrToString(LibVlcManager.GetFunctionDelegate<libvlc_errmsg>().Invoke());
         }
 
         /// <summary>
@@ -44,7 +25,7 @@ public static String GetErrorMessage()
         /// <exception cref="Exception">A delegate callback throws an exception.</exception>
         public static void CleanError()
         {
-            _cleanErrorFunction.Delegate();
+            LibVlcManager.GetFunctionDelegate<libvlc_clearerr>().Invoke();
         }
     }
 }
\ No newline at end of file
diff --git a/Meta.Vlc/VlcEventManager.cs b/Meta.Vlc/VlcEventManager.cs
index 4ba1b9c..f6d90fe 100644
--- a/Meta.Vlc/VlcEventManager.cs
+++ b/Meta.Vlc/VlcEventManager.cs
@@ -1,97 +1,85 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: VlcEventManager.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
-using Meta.Vlc.Interop;
-using Meta.Vlc.Interop.Core.Events;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using Meta.Vlc.Interop.Core.Event;
 
 namespace Meta.Vlc
 {
     /// <summary>
     ///     A manager of LibVlc event system.
     /// </summary>
-    public class VlcEventManager : IVlcObject
+    public unsafe class VlcEventManager : IVlcObject
     {
-        private static LibVlcFunction<EventAttach> _eventAttachFunction;
-        private static LibVlcFunction<EventDetach> _eventDetachFunction;
-        private static LibVlcFunction<GetTypeName> _getTypeNameFunction;
-
-        static VlcEventManager()
-        {
-            IsLibLoaded = false;
-        }
+        private readonly HashSet<EventType> _attachedEvents = new HashSet<EventType>();
+        private readonly libvlc_callback_t _onVlcEventFired;
+        private GCHandle _onVlcEventFiredHandle;
 
         /// <summary>
         ///     Create a event manager with parent Vlc object and pointer of event manager.
         /// </summary>
         /// <param name="parentVlcObject"></param>
         /// <param name="pointer"></param>
-        public VlcEventManager(IVlcObject parentVlcObject, IntPtr pointer)
+        public VlcEventManager(IVlcObject parentVlcObject, void* pointer)
         {
             VlcInstance = parentVlcObject.VlcInstance;
             InstancePointer = pointer;
-            HandleManager.Add(this);
-        }
+            VlcObjectManager.Add(this);
 
-        /// <summary>
-        ///     LibVlc event module loaded or not.
-        /// </summary>
-        public static bool IsLibLoaded { get; private set; }
+            _onVlcEventFired = OnVlcEventFired;
+            _onVlcEventFiredHandle = GCHandle.Alloc(_onVlcEventFired);
+        }
 
         /// <summary>
         ///     Pointer of this event manager.
         /// </summary>
-        public IntPtr InstancePointer { get; private set; }
+        public void* InstancePointer { get; }
 
         /// <summary>
         ///     A relation <see cref="Vlc" /> of this object.
         /// </summary>
-        public Vlc VlcInstance { get; private set; }
+        public Vlc VlcInstance { get; }
 
-        /// <summary>
-        ///     Release this event manager.
-        /// </summary>
-        /// <exception cref="Exception">A delegate callback throws an exception.</exception>
         public void Dispose()
         {
-            HandleManager.Remove(this);
-            // We should not free libvlc_event_manager instances as their life cycles are
-            // managed by their parent libvlc_media_player or libvlc_media instances.
-            InstancePointer = IntPtr.Zero;
-        }
-
-        internal static void LoadLibVlc()
-        {
-            if (!IsLibLoaded)
-            {
-                _eventAttachFunction = new LibVlcFunction<EventAttach>();
-                _eventDetachFunction = new LibVlcFunction<EventDetach>();
-                _getTypeNameFunction = new LibVlcFunction<GetTypeName>();
-                IsLibLoaded = true;
-            }
+            ReleaseUnmanagedResources();
+            GC.SuppressFinalize(this);
         }
 
         /// <summary>
         ///     Attach a event with a callback.
         /// </summary>
         /// <param name="type">event type</param>
-        /// <param name="callback">callback which will be called when event case</param>
-        /// <param name="userData">some custom data</param>
-        public void Attach(EventTypes type, LibVlcEventCallBack callback, IntPtr userData)
+        public void Attach(EventType type)
         {
-            _eventAttachFunction.Delegate(InstancePointer, type, callback, userData);
+            if (_attachedEvents.Contains(type)) return;
+
+            _attachedEvents.Add(type);
+            LibVlcManager.GetFunctionDelegate<libvlc_event_attach>()
+                .Invoke(InstancePointer, (libvlc_event_e) type, _onVlcEventFired, null);
         }
 
         /// <summary>
         ///     Deattach a event with a callback.
         /// </summary>
         /// <param name="type">event type</param>
-        /// <param name="callback">callback which will be called when event case</param>
-        /// <param name="userData">some custom data</param>
-        public void Detach(EventTypes type, LibVlcEventCallBack callback, IntPtr userData)
+        public void Detach(EventType type)
         {
-            _eventDetachFunction.Delegate(InstancePointer, type, callback, userData);
+            if (!_attachedEvents.Contains(type)) return;
+
+            _attachedEvents.Remove(type);
+            LibVlcManager.GetFunctionDelegate<libvlc_event_detach>()
+                .Invoke(InstancePointer, (libvlc_event_e) type, _onVlcEventFired, null);
+        }
+
+        public event EventHandler<VlcEventArgs> VlcEventFired;
+
+        private void OnVlcEventFired(libvlc_event_t* p_event, void* data)
+        {
+            VlcEventFired?.Invoke(this, new VlcEventArgs((EventType) p_event->type, p_event));
         }
 
         /// <summary>
@@ -99,9 +87,34 @@ public void Detach(EventTypes type, LibVlcEventCallBack callback, IntPtr userDat
         /// </summary>
         /// <param name="type"></param>
         /// <returns></returns>
-        public static String GetEventTypeName(EventTypes type)
+        public static string GetEventTypeName(EventType type)
+        {
+            return InteropHelper.PtrToString(LibVlcManager.GetFunctionDelegate<libvlc_event_type_name>()
+                .Invoke((libvlc_event_e) type));
+        }
+
+        private void ReleaseUnmanagedResources()
+        {
+            foreach (var eventType in new List<EventType>(_attachedEvents)) Detach(eventType);
+            _onVlcEventFiredHandle.Free();
+        }
+
+        ~VlcEventManager()
         {
-            return InteropHelper.PtrToString(_getTypeNameFunction.Delegate(type));
+            ReleaseUnmanagedResources();
         }
     }
-}
+
+    public unsafe class VlcEventArgs : EventArgs
+    {
+        internal VlcEventArgs(EventType type, libvlc_event_t* eventArgs)
+        {
+            EventArgs = eventArgs;
+            Type = type;
+        }
+
+        public libvlc_event_t* EventArgs { get; }
+
+        public EventType Type { get; }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/VlcMedia.cs b/Meta.Vlc/VlcMedia.cs
index 1edd006..3fb115f 100644
--- a/Meta.Vlc/VlcMedia.cs
+++ b/Meta.Vlc/VlcMedia.cs
@@ -1,139 +1,68 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: VlcMedia.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Text;
-using Meta.Vlc.Interop;
-using Meta.Vlc.Interop.Core.Events;
+using System.Collections.Generic;
+using Meta.Vlc.Event;
 using Meta.Vlc.Interop.Media;
 
 namespace Meta.Vlc
 {
     /// <summary>
-    ///     The API warpper of LibVlc media.
+    ///     The API wrapper of LibVlc media.
     /// </summary>
-    public class VlcMedia : IVlcObjectWithEvent
+    public unsafe class VlcMedia : IVlcObjectWithEvent
     {
-        private static LibVlcFunction<MediaAddOption> _addOptionFunction;
-        private static LibVlcFunction<MediaAddOptionFlag> _addOptionFlagFunction;
-        private static LibVlcFunction<MediaDuplicate> _duplicateFunction;
-        private static LibVlcFunction<GetEventManager> _getEventManagerFunction;
-        private static LibVlcFunction<GetCodecDescription> _getCodecDescriptionFunction;
-        private static LibVlcFunction<GetDuration> _getDurationFunction;
-        private static LibVlcFunction<GetMeta> _getMetaFunction;
-        private static LibVlcFunction<GetMrl> _getMrlFunction;
-        private static LibVlcFunction<GetState> _getStateFunction;
-        private static LibVlcFunction<GetStats> _getStatsFunction;
-        private static LibVlcFunction<GetTracksInfo> _getTracksInfoFunction;
-        private static LibVlcFunction<GetUserData> _getUserDataFunction;
-        private static LibVlcFunction<IsParsed> _isParsedFunction;
-        private static LibVlcFunction<CreateMediaAsNewNode> _createMediaAsNewNodeFunction;
-        private static LibVlcFunction<CreateMediaFromFileDescriptor> _createMediaFromFileDescriptorFunction;
-        private static LibVlcFunction<CreateMediaFromLocation> _createMediaFromLocationFunction;
-        private static LibVlcFunction<CreateMediaFromPath> _createMediaFromPathFunction;
-        private static LibVlcFunction<ParseMedia> _parseMediaFunction;
-        private static LibVlcFunction<ParseMediaAsync> _parseMediaAsyncFunction;
-        private static LibVlcFunction<ParseMediaWithOptionAsync> _parseMediaWithOptionAsyncFunction;
-        private static LibVlcFunction<ReleaseMedia> _releaseMediaFunction;
-        private static LibVlcFunction<RetainMedia> _retainMediaFunction;
-        private static LibVlcFunction<SaveMeta> _saveMetaFunction;
-        private static LibVlcFunction<SetMeta> _setMetaFunction;
-        private static LibVlcFunction<SetUserData> _setUserDataFunction;
-        private static LibVlcFunction<GetSubitems> _getSubitemsFunction;
-        private static LibVlcFunction<GetTracks> _getTracksFunction;
-        private readonly LibVlcEventCallBack _onDurationChanged;
-        private readonly LibVlcEventCallBack _onFreed;
-
-        private readonly LibVlcEventCallBack _onMetaChanged;
-        private readonly LibVlcEventCallBack _onParsedChanged;
-        private readonly LibVlcEventCallBack _onStateChanged;
-        private readonly LibVlcEventCallBack _onSubItemAdded;
-
-        private bool _disposed;
-        private GCHandle _onDurationChangedHandle;
-        private GCHandle _onFreedHandle;
-
-        private GCHandle _onMetaChangedHandle;
-        private GCHandle _onParsedChangedHandle;
-        private GCHandle _onStateChangedHandle;
-        private GCHandle _onSubItemAddedHandle;
-
-        private MediaStats _stats;
-
-        static VlcMedia()
-        {
-            IsLibLoaded = false;
-        }
+        private readonly MediaStats _stats = new MediaStats();
 
-        private VlcMedia(IVlcObject parentVlcObject, IntPtr pointer)
+        private VlcMedia(IVlcObject parentVlcObject, void* pointer)
         {
             VlcInstance = parentVlcObject.VlcInstance;
             InstancePointer = pointer;
-            EventManager = new VlcEventManager(this, _getEventManagerFunction.Delegate(InstancePointer));
-
-            _onMetaChanged = OnMetaChanged;
-            _onSubItemAdded = OnSubItemAdded;
-            _onDurationChanged = OnDurationChanged;
-            _onParsedChanged = OnParsedChanged;
-            _onFreed = OnFreed;
-            _onStateChanged = OnStateChanged;
-
-            _onMetaChangedHandle = GCHandle.Alloc(_onMetaChanged);
-            _onSubItemAddedHandle = GCHandle.Alloc(_onSubItemAdded);
-            _onDurationChangedHandle = GCHandle.Alloc(_onDurationChanged);
-            _onParsedChangedHandle = GCHandle.Alloc(_onParsedChanged);
-            _onFreedHandle = GCHandle.Alloc(_onFreed);
-            _onStateChangedHandle = GCHandle.Alloc(_onStateChanged);
-
-            HandleManager.Add(this);
-
-            EventManager.Attach(EventTypes.MediaMetaChanged, _onMetaChanged, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaSubItemAdded, _onSubItemAdded, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaDurationChanged, _onDurationChanged, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaParsedChanged, _onParsedChanged, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaFreed, _onFreed, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaStateChanged, _onStateChanged, IntPtr.Zero);
-        }
+            VlcObjectManager.Add(this);
 
-        /// <summary>
-        ///     获取一个值,该值指示当前模块是否被载入
-        /// </summary>
-        public static bool IsLibLoaded { get; private set; }
+            EventManager = new VlcEventManager(this,
+                LibVlcManager.GetFunctionDelegate<libvlc_media_event_manager>().Invoke(InstancePointer));
+
+            EventManager.Attach(EventType.MediaMetaChanged);
+            EventManager.Attach(EventType.MediaSubItemAdded);
+            EventManager.Attach(EventType.MediaDurationChanged);
+            EventManager.Attach(EventType.MediaParsedChanged);
+            EventManager.Attach(EventType.MediaFreed);
+            EventManager.Attach(EventType.MediaStateChanged);
+            EventManager.Attach(EventType.MediaSubItemTreeAdded);
+
+            EventManager.VlcEventFired += OnVlcEventFired;
+        }
 
         /// <summary>
-        ///     获取媒体的时间长度
+        ///     Get duration of media descriptor object item.
         /// </summary>
-        public TimeSpan Duration
-        {
-            get { return new TimeSpan(_getDurationFunction.Delegate(InstancePointer)*10000); }
-        }
+        public TimeSpan Duration =>
+            new TimeSpan(LibVlcManager.GetFunctionDelegate<libvlc_media_get_duration>().Invoke(InstancePointer) *
+                         10000);
 
         /// <summary>
-        ///     获取该媒体的媒体资源地址
+        ///     Get the media resource locator (mrl) from a media descriptor object.
         /// </summary>
-        public String Mrl
-        {
-            get { return InteropHelper.PtrToString(_getMrlFunction.Delegate(InstancePointer)); }
-        }
+        public string Mrl =>
+            InteropHelper.PtrToString(LibVlcManager.GetFunctionDelegate<libvlc_media_get_mrl>()
+                .Invoke(InstancePointer));
 
         /// <summary>
-        ///     获取媒体当前状态
+        ///     Get current state of media descriptor object.
         /// </summary>
         public MediaState State
         {
             get
             {
-                if (InstancePointer == IntPtr.Zero)
+                if (InstancePointer == null)
                     return MediaState.NothingSpecial;
 
-                var state = _getStateFunction.Delegate(InstancePointer);
-                if (state == MediaState.Error)
-                {
-                    Error = VlcError.GetErrorMessage();
-                }
+                var state = (MediaState) LibVlcManager.GetFunctionDelegate<libvlc_media_get_state>()
+                    .Invoke(InstancePointer);
+                if (state == MediaState.Error) Error = VlcError.GetErrorMessage();
                 return state;
             }
         }
@@ -141,361 +70,313 @@ public MediaState State
         public string Error { get; private set; }
 
         /// <summary>
-        ///     获取媒体当前统计
+        ///     Get the current statistics about the media
         /// </summary>
         public MediaStats Stats
         {
             get
             {
-                if (_getStatsFunction.Delegate(InstancePointer, ref _stats))
+                fixed (libvlc_media_stats_t* pointer = &_stats.Struct)
                 {
-                    return _stats;
+                    if (LibVlcManager.GetFunctionDelegate<libvlc_media_get_stats>().Invoke(InstancePointer, pointer))
+                        return _stats;
                 }
-                throw new Exception("无法获取媒体统计信息");
+
+                throw new Exception("Statistics about the media is unavailable");
             }
         }
 
         /// <summary>
-        ///     获取或设置由用户定义的媒体数据
+        ///     Get media descriptor's user_data. user_data is specialized data
+        ///     accessed by the host application, VLC.framework uses it as a pointer to
+        ///     an native object that references a <see cref="VlcMedia" /> pointer.
         /// </summary>
         public IntPtr UserData
         {
-            get { return _getUserDataFunction.Delegate(InstancePointer); }
+            get => new IntPtr(LibVlcManager.GetFunctionDelegate<libvlc_media_get_user_data>().Invoke(InstancePointer));
 
-            set { _setUserDataFunction.Delegate(InstancePointer, value); }
+            set => LibVlcManager.GetFunctionDelegate<libvlc_media_set_user_data>()
+                .Invoke(InstancePointer, value.ToPointer());
         }
 
+        [Obsolete("Use 'ParsedStatus' instead")]
+        public bool IsParsed =>
+            LibVlcManager.GetFunctionDelegate<libvlc_media_get_parsed_status>().Invoke(InstancePointer) ==
+            libvlc_media_parsed_status_t.libvlc_media_parsed_status_done;
+
         /// <summary>
-        ///     获取一个值表示该媒体是否已经解析
+        ///     Get Parsed status for media descriptor object.
         /// </summary>
-        public bool IsParsed
-        {
-            get { return _isParsedFunction.Delegate(InstancePointer); }
-        }
-
-        public IntPtr Subitems
-        {
-            get { return _getSubitemsFunction.Delegate(InstancePointer); }
-        }
+        public MediaParsedStatus ParsedStatus => (MediaParsedStatus) LibVlcManager
+            .GetFunctionDelegate<libvlc_media_get_parsed_status>().Invoke(InstancePointer);
 
         /// <summary>
-        ///     获取 Media 实例指针
+        ///     Get sub items of media descriptor object. This will increment
+        ///     the reference count of supplied media descriptor object. Use
+        ///     libvlc_media_list_release to decrement the reference counting.
         /// </summary>
-        public IntPtr InstancePointer { get; private set; }
+        public IntPtr SubItems =>
+            new IntPtr(LibVlcManager.GetFunctionDelegate<libvlc_media_subitems>().Invoke(InstancePointer));
 
-        public Vlc VlcInstance { get; private set; }
+        public void* InstancePointer { get; private set; }
 
-        public VlcEventManager EventManager { get; private set; }
+        public Vlc VlcInstance { get; }
 
-        /// <summary>
-        ///     释放 VlcMedia 资源
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-        }
+        public VlcEventManager EventManager { get; }
 
-        /// <summary>
-        ///     载入 LibVlc 的 Media 模块,该方法会在 <see cref="Vlc.LoadLibVlc()" /> 中自动被调用
-        /// </summary>
-        /// <param name="libHandle"></param>
-        /// <param name="libVersion"></param>
-        /// <param name="devString"></param>
-        internal static void LoadLibVlc()
+        public void Dispose()
         {
-            if (!IsLibLoaded)
-            {
-                _addOptionFunction = new LibVlcFunction<MediaAddOption>();
-                _addOptionFlagFunction = new LibVlcFunction<MediaAddOptionFlag>();
-                _duplicateFunction = new LibVlcFunction<MediaDuplicate>();
-                _getEventManagerFunction = new LibVlcFunction<GetEventManager>();
-                _getCodecDescriptionFunction = new LibVlcFunction<GetCodecDescription>();
-                _getDurationFunction = new LibVlcFunction<GetDuration>();
-                _getMetaFunction = new LibVlcFunction<GetMeta>();
-                _getMrlFunction = new LibVlcFunction<GetMrl>();
-                _getStateFunction = new LibVlcFunction<GetState>();
-                _getStatsFunction = new LibVlcFunction<GetStats>();
-                _getTracksInfoFunction = new LibVlcFunction<GetTracksInfo>();
-                _getUserDataFunction = new LibVlcFunction<GetUserData>();
-                _isParsedFunction = new LibVlcFunction<IsParsed>();
-                _createMediaAsNewNodeFunction = new LibVlcFunction<CreateMediaAsNewNode>();
-                _createMediaFromFileDescriptorFunction = new LibVlcFunction<CreateMediaFromFileDescriptor>();
-                _createMediaFromLocationFunction = new LibVlcFunction<CreateMediaFromLocation>();
-                _createMediaFromPathFunction = new LibVlcFunction<CreateMediaFromPath>();
-                
-                _parseMediaFunction = new LibVlcFunction<ParseMedia>();
-                _parseMediaAsyncFunction = new LibVlcFunction<ParseMediaAsync>();
-                _parseMediaWithOptionAsyncFunction = new LibVlcFunction<ParseMediaWithOptionAsync>();
-                _releaseMediaFunction = new LibVlcFunction<ReleaseMedia>();
-                _retainMediaFunction = new LibVlcFunction<RetainMedia>();
-                _saveMetaFunction = new LibVlcFunction<SaveMeta>();
-                _setMetaFunction = new LibVlcFunction<SetMeta>();
-                _setUserDataFunction = new LibVlcFunction<SetUserData>();
-                _getSubitemsFunction = new LibVlcFunction<GetSubitems>();
-                _getTracksFunction = new LibVlcFunction<GetTracks>();
-                IsLibLoaded = true;
-            }
+            ReleaseUnmanagedResources();
+            GC.SuppressFinalize(this);
         }
 
-        private void OnMetaChanged(ref LibVlcEventArgs arg, IntPtr userData)
+        private void OnVlcEventFired(object sender, VlcEventArgs e)
         {
-            if (MetaChanged != null)
+            switch (e.Type)
             {
-                MetaChanged(this, new ObjectEventArgs<MediaMetaChangedArgs>(arg.MediaMetaChanged));
+                case EventType.MediaMetaChanged:
+                    MetaChanged?.Invoke(this,
+                        new MediaMetaChangedEventArgs((MediaMetaType) e.EventArgs->media_meta_changed.meta_type));
+                    break;
+                case EventType.MediaSubItemAdded:
+                    SubItemAdded?.Invoke(this,
+                        new MediaSubItemAddedEventArgs(e.EventArgs->media_subitem_added.new_child));
+                    break;
+                case EventType.MediaDurationChanged:
+                    DurationChanged?.Invoke(this,
+                        new MediaDurationChangedEventArgs(e.EventArgs->media_duration_changed.new_duration));
+                    break;
+                case EventType.MediaParsedChanged:
+                    ParsedChanged?.Invoke(this,
+                        new MediaParsedStatusChangedEventArgs(
+                            (MediaParsedStatus) e.EventArgs->media_parsed_changed.new_status));
+                    break;
+                case EventType.MediaFreed:
+                    Freed?.Invoke(this, new MediaFreedEventArgs(e.EventArgs->media_freed.md));
+                    break;
+                case EventType.MediaStateChanged:
+                    StateChanged?.Invoke(this,
+                        new MediaStateChangedEventArgs((MediaState) e.EventArgs->media_state_changed.new_state));
+                    break;
+                case EventType.MediaSubItemTreeAdded:
+                    SubItemTreeAdded?.Invoke(this,
+                        new MediaSubItemAddedEventArgs(e.EventArgs->media_subitemtree_added.md));
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
             }
         }
 
-        public event EventHandler<ObjectEventArgs<MediaMetaChangedArgs>> MetaChanged;
+        public event EventHandler<MediaMetaChangedEventArgs> MetaChanged;
+        public event EventHandler<MediaSubItemAddedEventArgs> SubItemAdded;
+        public event EventHandler<MediaDurationChangedEventArgs> DurationChanged;
+        public event EventHandler<MediaParsedStatusChangedEventArgs> ParsedChanged;
+        public event EventHandler<MediaFreedEventArgs> Freed;
+        public event EventHandler<MediaStateChangedEventArgs> StateChanged;
+        public event EventHandler<MediaSubItemAddedEventArgs> SubItemTreeAdded;
 
-        private void OnSubItemAdded(ref LibVlcEventArgs arg, IntPtr userData)
+        /// <summary>
+        ///     Create a media as an empty node with a given name
+        /// </summary>
+        public static VlcMedia CreateAsNewNode(Vlc vlc, string name)
         {
-            if (SubItemAdded != null)
+            using (var handle = new StringHandle(name))
             {
-                SubItemAdded(this, new ObjectEventArgs<MediaSubitemAddedArgs>(arg.MediaSubitemAdded));
-            }
-        }
+                var pointer = LibVlcManager.GetFunctionDelegate<libvlc_media_new_as_node>()
+                    .Invoke(vlc.InstancePointer, handle.UnsafePointer);
 
-        public event EventHandler<ObjectEventArgs<MediaSubitemAddedArgs>> SubItemAdded;
+                if (pointer == null) throw new LibVlcException("Fail to create media.");
 
-        private void OnDurationChanged(ref LibVlcEventArgs arg, IntPtr userData)
-        {
-            if (DurationChanged != null)
-            {
-                DurationChanged(this, new ObjectEventArgs<MediaDurationChangedArgs>(arg.MediaDurationChanged));
+                return new VlcMedia(vlc, pointer);
             }
         }
 
-        public event EventHandler<ObjectEventArgs<MediaDurationChangedArgs>> DurationChanged;
-
-        private void OnParsedChanged(ref LibVlcEventArgs arg, IntPtr userData)
+        /// <summary>
+        ///     Create a media with a certain given media resource location,
+        ///     for instance a valid URL.
+        ///     <para />
+        ///     To refer to a local file with this function,
+        ///     the file://... URI syntax <b>must</b> be used (see IETF RFC3986).
+        ///     We recommend using <see cref="CreateFormPath" /> instead when dealing with local files.
+        /// </summary>
+        public static VlcMedia CreateFormLocation(Vlc vlc, string url)
         {
-            if (ParsedChanged != null)
+            using (var handle = new StringHandle(url))
             {
-                ParsedChanged(this, new ObjectEventArgs<MediaParsedChangedArgs>(arg.MediaParsedChanged));
-            }
-        }
+                var pointer = LibVlcManager.GetFunctionDelegate<libvlc_media_new_location>()
+                    .Invoke(vlc.InstancePointer, handle.UnsafePointer);
 
-        public event EventHandler<ObjectEventArgs<MediaParsedChangedArgs>> ParsedChanged;
+                if (pointer == null) throw new LibVlcException("Fail to create media.");
 
-        private void OnFreed(ref LibVlcEventArgs arg, IntPtr userData)
-        {
-            if (Freed != null)
-            {
-                Freed(this, new ObjectEventArgs<MediaFreedArgs>(arg.MediaFreed));
+                return new VlcMedia(vlc, pointer);
             }
         }
 
-        public event EventHandler<ObjectEventArgs<MediaFreedArgs>> Freed;
-
-        private void OnStateChanged(ref LibVlcEventArgs arg, IntPtr userData)
-        {
-            var actualState = State;
-            StateChanged?.Invoke(this, new ObjectEventArgs<MediaStateChangedArgs>(new MediaStateChangedArgs {NewState = actualState }));
-        }
-
-        public event EventHandler<ObjectEventArgs<MediaStateChangedArgs>> StateChanged;
-
         /// <summary>
-        ///     通过名称创建一个新的 VlcMedia
+        ///     Create a media for a certain file path.
         /// </summary>
-        /// <param name="vlc">Vlc 对象</param>
-        /// <param name="name">媒体名称</param>
-        public static VlcMedia CreateAsNewNode(Vlc vlc, String name)
+        public static VlcMedia CreateFormPath(Vlc vlc, string path)
         {
-            GCHandle handle = GCHandle.Alloc(Encoding.UTF8.GetBytes(name), GCHandleType.Pinned);
-            var madia = new VlcMedia(vlc,
-                _createMediaAsNewNodeFunction.Delegate(vlc.InstancePointer, handle.AddrOfPinnedObject()));
-            handle.Free();
-            return madia;
-        }
-
-        /// <summary>
-        ///     通过给定的文件描述符创建一个新的 VlcMedia
-        /// </summary>
-        /// <param name="vlc">Vlc 对象</param>
-        /// <param name="fileDescriptor">文件描述符</param>
-        public static VlcMedia CreateFormFileDescriptor(Vlc vlc, int fileDescriptor)
-        {
-            return new VlcMedia(vlc,
-                _createMediaFromFileDescriptorFunction.Delegate(vlc.InstancePointer, fileDescriptor));
-        }
+            using (var handle = new StringHandle(path))
+            {
+                var pointer = LibVlcManager.GetFunctionDelegate<libvlc_media_new_path>()
+                    .Invoke(vlc.InstancePointer, handle.UnsafePointer);
 
-        /// <summary>
-        ///     通过给定的文件 Url 创建一个新的 VlcMedia,该 Url 的格式必须以 "file://" 开头,参见 "RFC3986".
-        /// </summary>
-        /// <param name="vlc">Vlc 对象</param>
-        /// <param name="url">文件 Url</param>
-        public static VlcMedia CreateFormLocation(Vlc vlc, String url)
-        {
-            GCHandle handle = GCHandle.Alloc(Encoding.UTF8.GetBytes(url), GCHandleType.Pinned);
-            var media = new VlcMedia(vlc,
-                _createMediaFromLocationFunction.Delegate(vlc.InstancePointer, handle.AddrOfPinnedObject()));
-            handle.Free();
-            return media;
-        }
+                if (pointer == null) throw new LibVlcException("Fail to create media.");
 
-        /// <summary>
-        ///     通过给定的文件路径创建一个新的 VlcMedia
-        /// </summary>
-        /// <param name="vlc">Vlc 对象</param>
-        /// <param name="path">文件路径</param>
-        public static VlcMedia CreateFormPath(Vlc vlc, String path)
-        {
-            GCHandle handle = GCHandle.Alloc(Encoding.UTF8.GetBytes(path), GCHandleType.Pinned);
-            var media = new VlcMedia(vlc,
-                _createMediaFromPathFunction.Delegate(vlc.InstancePointer, handle.AddrOfPinnedObject()));
-            handle.Free();
-            return media;
+                return new VlcMedia(vlc, pointer);
+            }
         }
 
         /// <summary>
-        ///     向一个媒体添加选项,这个选项将会确定媒体播放器将如何读取介质,
+        ///     Add an option to the media.
+        ///     <para />
+        ///     This option will be used to determine how the <see cref="VlcMediaPlayer" /> will
+        ///     read the media. This allows to use VLC's advanced
+        ///     reading/streaming options on a per-media basis.
         /// </summary>
         /// <param name="options"></param>
-        public void AddOption(params String[] options)
+        public void AddOption(params string[] options)
         {
-            GCHandle handle = GCHandle.Alloc(Encoding.UTF8.GetBytes(String.Join(" ", options)), GCHandleType.Pinned);
-            _addOptionFunction.Delegate(InstancePointer, handle.AddrOfPinnedObject());
-            handle.Free();
+            foreach (var option in options)
+                using (var handle = new StringHandle(option))
+                {
+                    LibVlcManager.GetFunctionDelegate<libvlc_media_add_option>()
+                        .Invoke(InstancePointer, handle.UnsafePointer);
+                }
         }
 
         /// <summary>
-        ///     向一个媒体通过可配置的标志添加一个选项,这个选项将会确定媒体播放器将如何读取介质,
+        ///     Add an option to the media with configurable flags.
+        ///     <para />
+        ///     This option will be used to determine how the <see cref="VlcMediaPlayer" /> will
+        ///     read the media. This allows to use VLC's advanced
+        ///     reading/streaming options on a per-media basis.
+        ///     <para />
+        ///     The options are detailed in vlc --long-help, for instance
+        ///     "--sout-all". Note that all options are not usable on medias:
+        ///     specifically, due to architectural issues, video-related options
+        ///     such as text renderer options cannot be set on a single media. They
+        ///     must be set on the whole libvlc instance instead.
         /// </summary>
-        /// <param name="options"></param>
-        /// <param name="flag"></param>
-        public void AddOptionFlag(String options, MediaOption flag)
+        public void AddOption(string option, uint flag)
         {
-            GCHandle handle = GCHandle.Alloc(Encoding.UTF8.GetBytes(options), GCHandleType.Pinned);
-            _addOptionFlagFunction.Delegate(InstancePointer, handle.AddrOfPinnedObject(), flag);
-            handle.Free();
+            using (var handle = new StringHandle(option))
+            {
+                LibVlcManager.GetFunctionDelegate<libvlc_media_add_option_flag>()
+                    .Invoke(InstancePointer, handle.UnsafePointer, flag);
+            }
         }
 
         /// <summary>
-        ///     复制一个媒体对象
+        ///     Duplicate a media descriptor object.
         /// </summary>
-        /// <returns>复制的媒体对象</returns>
         public VlcMedia Duplicate()
         {
-            return new VlcMedia(this, _duplicateFunction.Delegate(InstancePointer));
+            return new VlcMedia(this,
+                LibVlcManager.GetFunctionDelegate<libvlc_media_duplicate>().Invoke(InstancePointer));
         }
 
         /// <summary>
-        ///     获取媒体的基本编码器的说明
+        ///     Get codec description from media elementary stream
         /// </summary>
-        /// <param name="type">由 <see cref="MediaTrack.Type" /> 得来</param>
-        /// <param name="codec">由 <see cref="MediaTrack.Codec" /> 得来</param>
-        /// <returns>返回媒体的基本编码器的说明</returns>
-        public static String GetCodecDescription(TrackType type, int codec)
+        /// <param name="type">
+        ///     <see cref="MediaTrack.Type" />
+        /// </param>
+        /// <param name="codec"><see cref="MediaTrack.OriginalFourcc" /> or <see cref="MediaTrack.Codec" /></param>
+        public static string GetCodecDescription(TrackType type, uint codec)
         {
-            return InteropHelper.PtrToString(_getCodecDescriptionFunction.Delegate(type, codec));
+            return InteropHelper.PtrToString(LibVlcManager.GetFunctionDelegate<libvlc_media_get_codec_description>()
+                .Invoke((libvlc_track_type_t) type, codec));
         }
 
         /// <summary>
-        ///     获取媒体的某个元属性,如果尚未解析元属性,将会返回 NULL.
-        ///     这个方法会自动调用 <see cref="ParseMediaAsync" /> 方法,所以你在之后应该会收到一个 MediaMetaChanged 事件.
-        ///     如果你喜欢同步版本,可以在 GetMeta 之前调用 <see cref="ParseMedia" /> 方法
+        ///     Read the meta of the media.
+        ///     <para />
+        ///     If the media has not yet been parsed this will return NULL.
         /// </summary>
-        /// <param name="type">元属性类型</param>
-        /// <returns>返回媒体的某个元属性</returns>
-        public String GetMeta(MetaDataType type)
+        public string GetMeta(MediaMetaType type)
         {
-            return InteropHelper.PtrToString(_getMetaFunction.Delegate(InstancePointer, type));
+            return InteropHelper.PtrToString(LibVlcManager.GetFunctionDelegate<libvlc_media_get_meta>()
+                .Invoke(InstancePointer, (libvlc_meta_t) type));
         }
 
         /// <summary>
-        ///     获取媒体的基本流的描述,注意,在调用该方法之前你需要首先调用 <see cref="ParseMedia" /> 方法,或者至少播放一次.
-        ///     否则,你将的得到一个空数组
+        ///     Get media descriptor's elementary streams description
+        ///     <para />
+        ///     Note, you need to call <see cref="ParseWithOptionAsync" /> or play the media at least once
+        ///     before calling this function.
+        ///     Not doing this will result in an empty list.
         /// </summary>
-        /// <returns>一个 <see cref="MediaTrackInfo" /> 数组</returns>
-        public MediaTrackInfo[] GetTrackInfo()
+        public List<MediaTrack> GetTrackInfo()
         {
-            IntPtr pointer;
-            var count = _getTracksInfoFunction.Delegate(InstancePointer, out pointer);
-            var result = new MediaTrackInfo[count];
-            var temp = pointer;
+            libvlc_media_track_t** pointer;
+            var count = LibVlcManager.GetFunctionDelegate<libvlc_media_tracks_get>().Invoke(InstancePointer, &pointer);
 
-            for (var i = 0; i < count; i++)
+            using (var list = new MediaTrackList((void**) pointer, count))
             {
-                result[i] = (MediaTrackInfo) Marshal.PtrToStructure(temp, typeof (MediaTrackInfo));
-                temp = (IntPtr) ((int) temp + Marshal.SizeOf(typeof (MediaTrackInfo)));
+                return new List<MediaTrack>(list);
             }
-
-            LibVlcManager.Free(pointer);
-            return result;
-        }
-
-        /// <summary>
-        ///     解析一个媒体,获取媒体的元数据和轨道信息
-        /// </summary>
-        public void Parse()
-        {
-            _parseMediaFunction.Delegate(InstancePointer);
-        }
-
-        /// <summary>
-        ///     异步解析一个媒体,获取媒体的元数据和轨道信息,这是 <see cref="VlcMedia.Parse" /> 的异步版本,
-        ///     解析完成会触发 <see cref="VlcMedia.ParsedChanged" /> 事件,您可以跟踪该事件
-        /// </summary>
-        public void ParseAsync()
-        {
-            _parseMediaAsyncFunction.Delegate(InstancePointer);
         }
 
         /// <summary>
-        ///     根据提供的标志异步解析一个媒体,获取媒体的元数据和轨道信息,这是 <see cref="VlcMedia.ParseAsync" /> 的高级版本,
-        ///     默认情况下解析一个本地文件,解析完成会触发 <see cref="VlcMedia.ParsedChanged" /> 事件,您可以跟踪该事件
+        ///     Parse the media asynchronously with options.
+        ///     <para />
+        ///     This fetches (local or network) art, meta data and/or tracks information.
+        ///     <para />
+        ///     To track when this is over you can listen to <see cref="ParsedChanged" />
+        ///     event. However if this functions returns an error, you will not receive any
+        ///     events.
+        ///     <para />
+        ///     It uses a flag to specify parse options (see <see cref="MediaParseOption" />). All
+        ///     these flags can be combined. By default, media is parsed if it's a local
+        ///     file.
         /// </summary>
-        public void ParseWithOptionAsync(MediaParseFlag option)
+        /// <param name="option">parse options</param>
+        /// <param name="timeout">
+        ///     maximum time allowed to preparse the media. If -1, the
+        ///     default "preparse-timeout" option will be used as a timeout. If 0, it will
+        ///     wait indefinitely. If > 0, the timeout will be used (in milliseconds).
+        /// </param>
+        /// <remarks>Parsing can be aborted with <see cref="StopParse" />.</remarks>
+        public void ParseWithOption(MediaParseOption option, int timeout = 0)
         {
-            _parseMediaWithOptionAsyncFunction.Delegate(InstancePointer, option);
+            if (LibVlcManager.GetFunctionDelegate<libvlc_media_parse_with_options>()
+                    .Invoke(InstancePointer, (libvlc_media_parse_flag_t) option, timeout) != 0)
+                throw new LibVlcException("Fail to parse media");
         }
 
         /// <summary>
-        ///     递增媒体对象的引用计数
+        ///     Stop the parsing of the media
+        ///     <para />
+        ///     When the media parsing is stopped, the <see cref="ParsedChanged" /> event will
+        ///     be sent with the <see cref="MediaParsedStatus.Timeout" /> status.
         /// </summary>
-        public void RetainMedia()
+        public void StopParse()
         {
-            _retainMediaFunction.Delegate(InstancePointer);
+            LibVlcManager.GetFunctionDelegate<libvlc_media_parse_stop>().Invoke(InstancePointer);
         }
 
         /// <summary>
-        ///     保存当前的元数据到媒体
+        ///     Save the meta previously set
         /// </summary>
-        /// <returns>如果操作成功将会返回 True</returns>
+        /// <returns>true if the write operation was successful</returns>
         public bool SaveMeta()
         {
-            return _saveMetaFunction.Delegate(InstancePointer);
+            return LibVlcManager.GetFunctionDelegate<libvlc_media_save_meta>().Invoke(InstancePointer);
         }
 
         /// <summary>
-        ///     设置媒体的元数据
+        ///     Set the meta of the media (this function will not save the meta, call
+        ///     <see cref="SaveMeta" /> in order to save the meta)
         /// </summary>
-        /// <param name="type">元数据类型</param>
-        /// <param name="data">元数据值</param>
-        public void SetMeta(MetaDataType type, String data)
-        {
-            GCHandle handle = GCHandle.Alloc(Encoding.UTF8.GetBytes(data), GCHandleType.Pinned);
-            _setMetaFunction.Delegate(InstancePointer, type, handle.AddrOfPinnedObject());
-            handle.Free();
-        }
-
-        /*
-        public void GetSubitems()
+        public void SetMeta(MediaMetaType type, string data)
         {
-            return GetSubitemsFunction.Delegate(InstancePointer);
-        }
-        */
-
-        /// <summary>
-        ///     获取媒体的基本流的描述,注意,在调用该方法之前你需要首先调用 <see cref="VlcMedia.Parse" /> 方法,或者至少播放一次.
-        ///     否则,你将的得到一个空数组
-        /// </summary>
-        public MediaTrackList GetTracks()
-        {
-            var pointer = IntPtr.Zero;
-            var count = _getTracksFunction.Delegate(InstancePointer, ref pointer);
-            return new MediaTrackList(pointer, count);
+            using (var handle = new StringHandle(data))
+            {
+                LibVlcManager.GetFunctionDelegate<libvlc_media_set_meta>()
+                    .Invoke(InstancePointer, (libvlc_meta_t) type, handle.UnsafePointer);
+            }
         }
 
         public VlcMediaPlayer CreateMediaPlayer()
@@ -503,47 +384,18 @@ public VlcMediaPlayer CreateMediaPlayer()
             return VlcMediaPlayer.CreateFormMedia(this);
         }
 
-        protected void Dispose(bool disposing)
+        private void ReleaseUnmanagedResources()
         {
-            if (_disposed)
-            {
-                return;
-            }
-
-            HandleManager.Remove(this);
-
-            EventManager.Detach(EventTypes.MediaMetaChanged, _onMetaChanged, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaSubItemAdded, _onSubItemAdded, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaDurationChanged, _onDurationChanged, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaParsedChanged, _onParsedChanged, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaFreed, _onFreed, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaStateChanged, _onStateChanged, IntPtr.Zero);
-
+            VlcObjectManager.Remove(this);
+            EventManager.VlcEventFired -= OnVlcEventFired;
             EventManager.Dispose();
-            _onMetaChangedHandle.Free();
-            _onSubItemAddedHandle.Free();
-            _onDurationChangedHandle.Free();
-            _onParsedChangedHandle.Free();
-            _onFreedHandle.Free();
-            _onStateChangedHandle.Free();
-            _releaseMediaFunction.Delegate(InstancePointer);
-            InstancePointer = IntPtr.Zero;
-
-            _disposed = true;
-        }
-    }
-
-    public class ObjectEventArgs<T> : EventArgs
-    {
-        public ObjectEventArgs()
-        {
+            LibVlcManager.GetFunctionDelegate<libvlc_media_release>().Invoke(InstancePointer);
+            InstancePointer = null;
         }
 
-        public ObjectEventArgs(T value)
+        ~VlcMedia()
         {
-            Value = value;
+            ReleaseUnmanagedResources();
         }
-
-        public T Value { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Meta.Vlc/VlcMediaPlayer.cs b/Meta.Vlc/VlcMediaPlayer.cs
index d46d82f..6763fba 100644
--- a/Meta.Vlc/VlcMediaPlayer.cs
+++ b/Meta.Vlc/VlcMediaPlayer.cs
@@ -1,1057 +1,689 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: VlcMediaPlayer.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
-using System.Runtime.InteropServices;
-using System.Text;
-using Meta.Vlc.Interop;
-using Meta.Vlc.Interop.Core.Events;
-using Meta.Vlc.Interop.Media;
+using System.Collections.Generic;
+using Meta.Vlc.Event;
 using Meta.Vlc.Interop.MediaPlayer;
-using GetEventManager = Meta.Vlc.Interop.MediaPlayer.GetEventManager;
-using GetState = Meta.Vlc.Interop.MediaPlayer.GetState;
+using Meta.Vlc.Interop.MediaPlayer.Audio;
+using Meta.Vlc.Interop.MediaPlayer.Video;
 
 namespace Meta.Vlc
 {
     /// <summary>
-    ///     The lowest layer API warpper of LibVlc media player.
+    ///     The lowest layer API wrapper of LibVlc media player.
     /// </summary>
-    public class VlcMediaPlayer : IVlcObjectWithEvent
+    public unsafe class VlcMediaPlayer : IVlcObjectWithEvent
     {
-        private static LibVlcFunction<CreateMediaPlayer> _createMediaPlayerFunction;
-        private static LibVlcFunction<CreateMediaPlayerFromMedia> _createMediaPlayerFromMediaFunction;
-        private static LibVlcFunction<ReleaseMediaPlayer> _releaseMediaPlayerFunction;
-        private static LibVlcFunction<RetainMediaPlayer> _retainMediaPlayerFunction;
-        private static LibVlcFunction<SetMedia> _setMediaFunction;
-        private static LibVlcFunction<GetMedia> _getMediaFunction;
-        private static LibVlcFunction<GetEventManager> _getEventManagerFunction;
-        private static LibVlcFunction<IsPlaying> _isPlayingFunction;
-        private static LibVlcFunction<Play> _playFunction;
-        private static LibVlcFunction<SetPause> _setPauseFunction;
-        private static LibVlcFunction<SetPosition> _setPositionFunction;
-        private static LibVlcFunction<Stop> _stopFunction;
-        private static LibVlcFunction<SetVideoCallback> _setVideoCallbackFunction;
-        private static LibVlcFunction<SetVideoFormat> _setVideoFormatFunction;
-        private static LibVlcFunction<SetVideoFormatCallback> _setVideoFormatCallbackFunction;
-        private static LibVlcFunction<SetHwnd> _setHwndFunction;
-        private static LibVlcFunction<GetHwnd> _getHwndFunction;
-        private static LibVlcFunction<SetAudioCallback> _setAudioCallbackFunction;
-        private static LibVlcFunction<SetAudioFormat> _setAudioFormatFunction;
-        private static LibVlcFunction<SetAudioFormatCallback> _setAudioFormatCallbackFunction;
-        private static LibVlcFunction<SetAudioVolumeCallback> _setAudioVolumeCallbackFunction;
-        private static LibVlcFunction<GetLength> _getLengthFunction;
-        private static LibVlcFunction<GetTime> _getTimeFunction;
-        private static LibVlcFunction<SetTime> _setTimeFunction;
-        private static LibVlcFunction<GetPosition> _getPositionFunction;
-        private static LibVlcFunction<SetChapter> _setChapterFunction;
-        private static LibVlcFunction<GetChapter> _getChapterFunction;
-        private static LibVlcFunction<GetChapterCount> _getChapterCountFunction;
-        private static LibVlcFunction<CanPlay> _canPlayFunction;
-        private static LibVlcFunction<GetTitleChapterCount> _getTitleChapterCountFunction;
-        private static LibVlcFunction<SetTitle> _setTitleFunction;
-        private static LibVlcFunction<GetTitle> _getTitleFunction;
-        private static LibVlcFunction<GetTitleCount> _getTitleCountFunction;
-        private static LibVlcFunction<PreviousChapter> _previousChapterFunction;
-        private static LibVlcFunction<NextChapter> _nextChapterFunction;
-        private static LibVlcFunction<GetRate> _getRateFunction;
-        private static LibVlcFunction<SetRate> _setRateFunction;
-        private static LibVlcFunction<GetState> _getStateFunction;
-        private static LibVlcFunction<GetFps> _getFpsFunction;
-        private static LibVlcFunction<HasVout> _hasVoutFunction;
-        private static LibVlcFunction<IsSeekable> _isSeekableFunction;
-        private static LibVlcFunction<CanPause> _canPauseFunction;
-        private static LibVlcFunction<NextFrame> _nextFrameFunction;
-        private static LibVlcFunction<Navigate> _navigateFunction;
-        private static LibVlcFunction<SetVideoTitleDisplay> _setVideoTitleDisplayFunction;
-        private static LibVlcFunction<ToggleMute> _toggleMuteFunction;
-        private static LibVlcFunction<GetMute> _getMuteFunction;
-        private static LibVlcFunction<SetMute> _setMuteFunction;
-        private static LibVlcFunction<GetVolume> _getVolumeFunction;
-        private static LibVlcFunction<SetVolume> _setVolumeFunction;
-        private static LibVlcFunction<GetCursor> _getCursorFunction;
-        private static LibVlcFunction<SetCursor> _setCursorFunction;
-        private static LibVlcFunction<SetMouseDown> _setMouseDownFunction;
-        private static LibVlcFunction<SetMouseUp> _setMouseUpFunction;
-        private static LibVlcFunction<GetOutputChannel> _getOutputChannelFunction;
-        private static LibVlcFunction<SetOutputChannel> _setOutputChannelFunction;
-        private static LibVlcFunction<GetAudioTrack> _getAudioTrackFunction;
-        private static LibVlcFunction<SetAudioTrack> _setAudioTrackFunction;
-        private static LibVlcFunction<GetAudioTrackCount> _getAudioTrackCountFunction;
-        private static LibVlcFunction<GetAudioTrackDescription> _getAudioTrackDescriptionFunction;
-        private static LibVlcFunction<GetSize> _getSizeFunction;
-        private static LibVlcFunction<GetScale> _getScaleFunction;
-        private static LibVlcFunction<SetScale> _setScaleFunction;
-        private static LibVlcFunction<GetAspectRatio> _getAspectRatioFunction;
-        private static LibVlcFunction<SetAspectRatio> _setAspectRatioFunction;
-
-        //private static LibVlcFunction<GetVideoWidth> _getVideoWidthFunction;
-        //private static LibVlcFunction<GetVideoHeight> _getVideoHeightFunction;
-        private static LibVlcFunction<GetVideoTrack> _getVideoTrackFunction;
-
-        private static LibVlcFunction<SetVideoTrack> _setVideoTrackFunction;
-        private static LibVlcFunction<GetVideoTrackCount> _getVideoTrackCountFunction;
-        private static LibVlcFunction<GetVideoTrackDescription> _getVideoTrackDescriptionFunction;
-        private static LibVlcFunction<SetEqualizer> _setEqualizerFunction;
-        private static LibVlcFunction<EnumAudioDeviceList> _enumAudioDeviceListFunction;
-        private static LibVlcFunction<GetAudioDeviceList> _getAudioDeviceListFunction;
-        private static LibVlcFunction<GetAudioOutputList> _getAudioOutputListFunction;
-        private static LibVlcFunction<SetAudioOutput> _setAudioOutputFunction;
-        private static LibVlcFunction<SetAudioDevice> _setAudioDeviceFunction;
-        private static LibVlcFunction<GetAudioDevice> _getAudioDeviceFunction;
-
-        private static LibVlcFunction<GetSubtitle> _getSubtitleFunction;
-        private static LibVlcFunction<GetSubtitleCount> _getSubtitleCountFunction;
-        private static LibVlcFunction<GetSubtitleDescription> _getSubtitleDescriptionFunction;
-        private static LibVlcFunction<SetSubtitle> _setSubtitleFunction;
-        private static LibVlcFunction<SetSubtitleFile> _setSubtitleFileFunction;
-        private static LibVlcFunction<GetSubtitleDelay> _getSubtitleDelayFunction;
-        private static LibVlcFunction<SetSubtitleDelay> _setSubtitleDelayFunction;
-
-        private static LibVlcFunction<GetVideoAdjustInt> _getVideoAdjustIntFunction;
-        private static LibVlcFunction<GetVideoAdjustFloat> _getVideoAdjustFloatFunction;
-        private static LibVlcFunction<SetVideoAdjustInt> _setVideoAdjustIntFunction;
-        private static LibVlcFunction<SetVideoAdjustFloat> _setVideoAdjustFloatFunction;
-
-        private readonly LibVlcEventCallBack _onBackward;
-        private readonly LibVlcEventCallBack _onBuffering;
-        private readonly LibVlcEventCallBack _onEncounteredError;
-        private readonly LibVlcEventCallBack _onEndReached;
-        private readonly LibVlcEventCallBack _onForward;
-        private readonly LibVlcEventCallBack _onLengthChanged;
-        private readonly LibVlcEventCallBack _onMediaChanged;
-        private readonly LibVlcEventCallBack _onNothingSpecial;
-        private readonly LibVlcEventCallBack _onOpening;
-        private readonly LibVlcEventCallBack _onPausableChanged;
-        private readonly LibVlcEventCallBack _onPaused;
-
-        private readonly LibVlcEventCallBack _onPlaying;
-        private readonly LibVlcEventCallBack _onPositionChanged;
-        private readonly LibVlcEventCallBack _onSeekableChanged;
-        private readonly LibVlcEventCallBack _onSnapshotTaken;
-        private readonly LibVlcEventCallBack _onStoped;
-        private readonly LibVlcEventCallBack _onTimeChanged;
-        private readonly LibVlcEventCallBack _onTitleChanged;
-        private readonly LibVlcEventCallBack _onVideoOutChanged;
-        private GCHandle _onBackwardHandle;
-        private GCHandle _onBufferingHandle;
-        private GCHandle _onEncounteredErrorHandle;
-        private GCHandle _onEndReachedHandle;
-        private GCHandle _onForwardHandle;
-        private GCHandle _onLengthChangedHandle;
-        private GCHandle _onMediaChangedHandle;
-        private GCHandle _onNothingSpecialHandle;
-        private GCHandle _onOpeningHandle;
-        private GCHandle _onPausableChangedHandle;
-        private GCHandle _onPausedHandle;
-
-        private GCHandle _onPlayingHandle;
-        private GCHandle _onPositionChangedHandle;
-        private GCHandle _onSeekableChangedHandle;
-        private GCHandle _onSnapshotTakenHandle;
-        private GCHandle _onStopedHandle;
-        private GCHandle _onTimeChangedHandle;
-        private GCHandle _onTitleChangedHandle;
-        private GCHandle _onVideoOutChangedHandle;
-
-        private VlcMediaPlayer(IVlcObject parentVlcObject, IntPtr pointer)
+        private bool _disposed;
+
+        private VlcMediaPlayer(IVlcObject parentVlcObject, void* pointer)
         {
             VlcInstance = parentVlcObject.VlcInstance;
             InstancePointer = pointer;
-            EventManager = new VlcEventManager(this, _getEventManagerFunction.Delegate(InstancePointer));
-
-            HandleManager.Add(this);
-
-            _onPlaying = OnPlaying;
-            _onPaused = OnPaused;
-            _onOpening = OnOpening;
-            _onBuffering = OnBuffering;
-            _onStoped = OnStoped;
-            _onForward = OnForward;
-            _onBackward = OnBackward;
-            _onEndReached = OnEndReached;
-            _onMediaChanged = OnMediaChanged;
-            _onNothingSpecial = OnNothingSpecial;
-            _onPausableChanged = OnPausableChanged;
-            _onPositionChanged = OnPositionChanged;
-            _onSeekableChanged = OnSeekableChanged;
-            _onSnapshotTaken = OnSnapshotTaken;
-            _onTimeChanged = OnTimeChanged;
-            _onTitleChanged = OnTitleChanged;
-            _onVideoOutChanged = OnVideoOutChanged;
-            _onLengthChanged = OnLengthChanged;
-            _onEncounteredError = OnEncounteredError;
-
-            _onPlayingHandle = GCHandle.Alloc(_onPlaying);
-            _onPausedHandle = GCHandle.Alloc(_onPaused);
-            _onOpeningHandle = GCHandle.Alloc(_onOpening);
-            _onBufferingHandle = GCHandle.Alloc(_onBuffering);
-            _onStopedHandle = GCHandle.Alloc(_onStoped);
-            _onForwardHandle = GCHandle.Alloc(_onForward);
-            _onBackwardHandle = GCHandle.Alloc(_onBackward);
-            _onEndReachedHandle = GCHandle.Alloc(_onEndReached);
-            _onMediaChangedHandle = GCHandle.Alloc(_onMediaChanged);
-            _onNothingSpecialHandle = GCHandle.Alloc(_onNothingSpecial);
-            _onPausableChangedHandle = GCHandle.Alloc(_onPausableChanged);
-            _onPositionChangedHandle = GCHandle.Alloc(_onPositionChanged);
-            _onSeekableChangedHandle = GCHandle.Alloc(_onSeekableChanged);
-            _onSnapshotTakenHandle = GCHandle.Alloc(_onSnapshotTaken);
-            _onTimeChangedHandle = GCHandle.Alloc(_onTimeChanged);
-            _onTitleChangedHandle = GCHandle.Alloc(_onTitleChanged);
-            _onVideoOutChangedHandle = GCHandle.Alloc(_onVideoOutChanged);
-            _onLengthChangedHandle = GCHandle.Alloc(_onLengthChanged);
-            _onEncounteredErrorHandle = GCHandle.Alloc(_onEncounteredError);
-
-            EventManager.Attach(EventTypes.MediaPlayerPlaying, _onPlaying, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerPaused, _onPaused, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerOpening, _onOpening, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerBuffering, _onBuffering, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerStopped, _onStoped, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerForward, _onForward, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerBackward, _onBackward, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerEndReached, _onEndReached, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerMediaChanged, _onMediaChanged, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerNothingSpecial, _onNothingSpecial, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerPausableChanged, _onPausableChanged, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerPositionChanged, _onPositionChanged, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerSeekableChanged, _onSeekableChanged, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerSnapshotTaken, _onSnapshotTaken, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerTimeChanged, _onTimeChanged, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerTitleChanged, _onTitleChanged, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerVideoOutChanged, _onVideoOutChanged, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerLengthChanged, _onLengthChanged, IntPtr.Zero);
-            EventManager.Attach(EventTypes.MediaPlayerEncounteredError, _onEncounteredError, IntPtr.Zero);
-        }
-
-        /// <summary>
-        ///     获取一个值,该值指示当前模块是否被载入
-        /// </summary>
-        public static bool IsLibLoaded { get; private set; }
-
-        public IntPtr InstancePointer { get; private set; }
-
-        public VlcEventManager EventManager { get; private set; }
-
-        public Vlc VlcInstance { get; private set; }
-
-        public static VlcMediaPlayer Create(Vlc vlc)
-        {
-            return new VlcMediaPlayer(vlc, _createMediaPlayerFunction.Delegate(vlc.InstancePointer));
-        }
-
-        public static VlcMediaPlayer CreateFormMedia(VlcMedia media)
-        {
-            return new VlcMediaPlayer(media, _createMediaPlayerFromMediaFunction.Delegate(media.InstancePointer));
-        }
-
-        /// <summary>
-        ///     载入 LibVlc 的 MediaPlayer 模块,该方法会在 <see cref="Vlc.LoadLibVlc()" /> 中自动被调用
+            VlcObjectManager.Add(this);
+
+            EventManager = new VlcEventManager(this,
+                LibVlcManager.GetFunctionDelegate<libvlc_media_player_event_manager>().Invoke(InstancePointer));
+
+            EventManager.Attach(EventType.MediaPlayerPlaying);
+            EventManager.Attach(EventType.MediaPlayerPaused);
+            EventManager.Attach(EventType.MediaPlayerOpening);
+            EventManager.Attach(EventType.MediaPlayerBuffering);
+            EventManager.Attach(EventType.MediaPlayerStopped);
+            EventManager.Attach(EventType.MediaPlayerForward);
+            EventManager.Attach(EventType.MediaPlayerBackward);
+            EventManager.Attach(EventType.MediaPlayerEndReached);
+            EventManager.Attach(EventType.MediaPlayerMediaChanged);
+            EventManager.Attach(EventType.MediaPlayerNothingSpecial);
+            EventManager.Attach(EventType.MediaPlayerPausableChanged);
+            EventManager.Attach(EventType.MediaPlayerPositionChanged);
+            EventManager.Attach(EventType.MediaPlayerSeekableChanged);
+            EventManager.Attach(EventType.MediaPlayerSnapshotTaken);
+            EventManager.Attach(EventType.MediaPlayerTimeChanged);
+            EventManager.Attach(EventType.MediaPlayerTitleChanged);
+            EventManager.Attach(EventType.MediaPlayerLengthChanged);
+            EventManager.Attach(EventType.MediaPlayerEncounteredError);
+            EventManager.Attach(EventType.MediaPlayerVout);
+            EventManager.Attach(EventType.MediaPlayerScrambledChanged);
+            EventManager.Attach(EventType.MediaPlayerESAdded);
+            EventManager.Attach(EventType.MediaPlayerESDeleted);
+            EventManager.Attach(EventType.MediaPlayerESSelected);
+            EventManager.Attach(EventType.MediaPlayerCorked);
+            EventManager.Attach(EventType.MediaPlayerUncorked);
+            EventManager.Attach(EventType.MediaPlayerMuted);
+            EventManager.Attach(EventType.MediaPlayerUnmuted);
+            EventManager.Attach(EventType.MediaPlayerAudioVolume);
+            EventManager.Attach(EventType.MediaPlayerAudioDevice);
+            EventManager.Attach(EventType.MediaPlayerChapterChanged);
+
+            EventManager.VlcEventFired += OnVlcEventFired;
+        }
+
+        /// <summary>
+        ///     Get the media used by the media_player.
         /// </summary>
-        /// <param name="libHandle"></param>
-        /// <param name="libVersion"></param>
-        /// <param name="devString"></param>
-        internal static void LoadLibVlc()
-        {
-            if (!IsLibLoaded)
-            {
-                _createMediaPlayerFunction = new LibVlcFunction<CreateMediaPlayer>();
-                _createMediaPlayerFromMediaFunction = new LibVlcFunction<CreateMediaPlayerFromMedia>();
-                _releaseMediaPlayerFunction = new LibVlcFunction<ReleaseMediaPlayer>();
-                _retainMediaPlayerFunction = new LibVlcFunction<RetainMediaPlayer>();
-                _setMediaFunction = new LibVlcFunction<SetMedia>();
-                _getMediaFunction = new LibVlcFunction<GetMedia>();
-                _getEventManagerFunction = new LibVlcFunction<GetEventManager>();
-                _isPlayingFunction = new LibVlcFunction<IsPlaying>();
-                _playFunction = new LibVlcFunction<Play>();
-                _setPauseFunction = new LibVlcFunction<SetPause>();
-                _setPositionFunction = new LibVlcFunction<SetPosition>();
-                _stopFunction = new LibVlcFunction<Stop>();
-                _setVideoCallbackFunction = new LibVlcFunction<SetVideoCallback>();
-                _setVideoFormatFunction = new LibVlcFunction<SetVideoFormat>();
-                _setVideoFormatCallbackFunction = new LibVlcFunction<SetVideoFormatCallback>();
-                _setHwndFunction = new LibVlcFunction<SetHwnd>();
-                _getHwndFunction = new LibVlcFunction<GetHwnd>();
-                _setAudioCallbackFunction = new LibVlcFunction<SetAudioCallback>();
-                _setAudioFormatFunction = new LibVlcFunction<SetAudioFormat>();
-                _setAudioFormatCallbackFunction = new LibVlcFunction<SetAudioFormatCallback>();
-                _setAudioVolumeCallbackFunction = new LibVlcFunction<SetAudioVolumeCallback>();
-                _getLengthFunction = new LibVlcFunction<GetLength>();
-                _getTimeFunction = new LibVlcFunction<GetTime>();
-                _setTimeFunction = new LibVlcFunction<SetTime>();
-                _getPositionFunction = new LibVlcFunction<GetPosition>();
-                _setChapterFunction = new LibVlcFunction<SetChapter>();
-                _getChapterFunction = new LibVlcFunction<GetChapter>();
-                _getChapterCountFunction = new LibVlcFunction<GetChapterCount>();
-                _canPlayFunction = new LibVlcFunction<CanPlay>();
-                _getTitleChapterCountFunction = new LibVlcFunction<GetTitleChapterCount>();
-                _setTitleFunction = new LibVlcFunction<SetTitle>();
-                _getTitleFunction = new LibVlcFunction<GetTitle>();
-                _getTitleCountFunction = new LibVlcFunction<GetTitleCount>();
-                _previousChapterFunction = new LibVlcFunction<PreviousChapter>();
-                _nextChapterFunction = new LibVlcFunction<NextChapter>();
-                _getRateFunction = new LibVlcFunction<GetRate>();
-                _setRateFunction = new LibVlcFunction<SetRate>();
-                _getStateFunction = new LibVlcFunction<GetState>();
-                _getFpsFunction = new LibVlcFunction<GetFps>();
-                _hasVoutFunction = new LibVlcFunction<HasVout>();
-                _isSeekableFunction = new LibVlcFunction<IsSeekable>();
-                _canPauseFunction = new LibVlcFunction<CanPause>();
-                _nextFrameFunction = new LibVlcFunction<NextFrame>();
-                _navigateFunction = new LibVlcFunction<Navigate>();
-                _setVideoTitleDisplayFunction = new LibVlcFunction<SetVideoTitleDisplay>();
-                _toggleMuteFunction = new LibVlcFunction<ToggleMute>();
-                _getMuteFunction = new LibVlcFunction<GetMute>();
-                _setMuteFunction = new LibVlcFunction<SetMute>();
-                _getVolumeFunction = new LibVlcFunction<GetVolume>();
-                _setVolumeFunction = new LibVlcFunction<SetVolume>();
-                _getCursorFunction = new LibVlcFunction<GetCursor>();
-                _setCursorFunction = new LibVlcFunction<SetCursor>();
-                _setMouseDownFunction = new LibVlcFunction<SetMouseDown>();
-                _setMouseUpFunction = new LibVlcFunction<SetMouseUp>();
-                _getOutputChannelFunction = new LibVlcFunction<GetOutputChannel>();
-                _setOutputChannelFunction = new LibVlcFunction<SetOutputChannel>();
-                _getAudioTrackFunction = new LibVlcFunction<GetAudioTrack>();
-                _setAudioTrackFunction = new LibVlcFunction<SetAudioTrack>();
-                _getAudioTrackCountFunction = new LibVlcFunction<GetAudioTrackCount>();
-                _getAudioTrackDescriptionFunction = new LibVlcFunction<GetAudioTrackDescription>();
-                _getSizeFunction = new LibVlcFunction<GetSize>();
-                _setScaleFunction = new LibVlcFunction<SetScale>();
-                _getScaleFunction = new LibVlcFunction<GetScale>();
-                _setAspectRatioFunction = new LibVlcFunction<SetAspectRatio>();
-                _getAspectRatioFunction = new LibVlcFunction<GetAspectRatio>();
-                //_getVideoWidthFunction = new LibVlcFunction<GetVideoWidth>();
-                //_getVideoHeightFunction = new LibVlcFunction<GetVideoHeight>();
-                _getVideoTrackFunction = new LibVlcFunction<GetVideoTrack>();
-                _setVideoTrackFunction = new LibVlcFunction<SetVideoTrack>();
-                _getVideoTrackCountFunction = new LibVlcFunction<GetVideoTrackCount>();
-                _getVideoTrackDescriptionFunction = new LibVlcFunction<GetVideoTrackDescription>();
-                _setEqualizerFunction = new LibVlcFunction<SetEqualizer>();
-                _enumAudioDeviceListFunction = new LibVlcFunction<EnumAudioDeviceList>();
-                _getAudioDeviceListFunction = new LibVlcFunction<GetAudioDeviceList>();
-                _getAudioOutputListFunction = new LibVlcFunction<GetAudioOutputList>();
-                _setAudioOutputFunction = new LibVlcFunction<SetAudioOutput>();
-                _setAudioDeviceFunction = new LibVlcFunction<SetAudioDevice>();
-                _getAudioDeviceFunction = new LibVlcFunction<GetAudioDevice>();
-                _getSubtitleFunction = new LibVlcFunction<GetSubtitle>();
-                _getSubtitleCountFunction = new LibVlcFunction<GetSubtitleCount>();
-                _getSubtitleDescriptionFunction = new LibVlcFunction<GetSubtitleDescription>();
-                _setSubtitleFunction = new LibVlcFunction<SetSubtitle>();
-                _setSubtitleFileFunction = new LibVlcFunction<SetSubtitleFile>();
-                _getSubtitleDelayFunction = new LibVlcFunction<GetSubtitleDelay>();
-                _setSubtitleDelayFunction = new LibVlcFunction<SetSubtitleDelay>();
-                _getVideoAdjustIntFunction = new LibVlcFunction<GetVideoAdjustInt>();
-                _setVideoAdjustIntFunction = new LibVlcFunction<SetVideoAdjustInt>();
-                _getVideoAdjustFloatFunction = new LibVlcFunction<GetVideoAdjustFloat>();
-                _setVideoAdjustFloatFunction = new LibVlcFunction<SetVideoAdjustFloat>();
-
-                IsLibLoaded = true;
-            }
-        }
-
-        #region 一般事件
-
-        private void OnPlaying(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (Playing != null)
-            {
-                Playing(this, new ObjectEventArgs<MediaState>(MediaState.Playing));
-            }
-        }
-
-        public event EventHandler<ObjectEventArgs<MediaState>> Playing;
-
-        private void OnPaused(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (Paused != null)
-            {
-                Paused(this, new ObjectEventArgs<MediaState>(MediaState.Paused));
-            }
-        }
-
-        public event EventHandler<ObjectEventArgs<MediaState>> Paused;
-
-        private void OnOpening(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (Opening != null)
-            {
-                Opening(this, new ObjectEventArgs<MediaState>(MediaState.Opening));
-            }
-        }
-
-        public event EventHandler<ObjectEventArgs<MediaState>> Opening;
-
-        private void OnBuffering(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (Buffering != null)
-            {
-                Buffering(this, new MediaPlayerBufferingEventArgs(eventArgs.MediaPlayerBuffering.NewCache));
-            }
-        }
-
-        public event EventHandler<MediaPlayerBufferingEventArgs> Buffering;
-
-        private void OnStoped(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (Stoped != null)
-            {
-                Stoped(this, new ObjectEventArgs<MediaState>(MediaState.Stopped));
-            }
-        }
-
-        public event EventHandler<ObjectEventArgs<MediaState>> Stoped;
-
-        private void OnForward(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (Forward != null)
-            {
-                Forward(this, new EventArgs());
-            }
-        }
-
-        public event EventHandler Forward;
-
-        private void OnBackward(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (Backward != null)
-            {
-                Backward(this, new EventArgs());
-            }
-        }
-
-        public event EventHandler Backward;
-
-        private void OnEndReached(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (EndReached != null)
-            {
-                EndReached(this, new ObjectEventArgs<MediaState>(MediaState.Ended));
-            }
-        }
-
-        public event EventHandler<ObjectEventArgs<MediaState>> EndReached;
-
-        private void OnMediaChanged(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (MediaChanged != null)
-            {
-                MediaChanged(this,
-                    new MediaPlayerMediaChangedEventArgs(Media));
-            }
-        }
-
-        public event EventHandler<MediaPlayerMediaChangedEventArgs> MediaChanged;
-
-        private void OnNothingSpecial(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (NothingSpecial != null)
-            {
-                NothingSpecial(this, new EventArgs());
-            }
-        }
-
-        public event EventHandler NothingSpecial;
-
-        private void OnPausableChanged(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (PausableChanged != null)
-            {
-                PausableChanged(this, new EventArgs());
-            }
-        }
-
-        public event EventHandler PausableChanged;
-
-        private void OnPositionChanged(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (PositionChanged != null)
-            {
-                PositionChanged(this, new EventArgs());
-            }
-        }
-
-        public event EventHandler PositionChanged;
-
-        private void OnSeekableChanged(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (SeekableChanged != null)
-            {
-                SeekableChanged(this, new EventArgs());
-            }
-        }
-
-        public event EventHandler SeekableChanged;
-
-        private void OnSnapshotTaken(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (SnapshotTaken != null)
-            {
-                SnapshotTaken(this, new EventArgs());
-            }
-        }
-
-        public event EventHandler SnapshotTaken;
-
-        private void OnTimeChanged(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (TimeChanged != null)
-            {
-                TimeChanged(this, new EventArgs());
-            }
-        }
-
-        public event EventHandler TimeChanged;
-
-        private void OnTitleChanged(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (TitleChanged != null)
-            {
-                TitleChanged(this, new EventArgs());
-            }
-        }
-
-        public event EventHandler TitleChanged;
-
-        private void OnVideoOutChanged(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (VideoOutChanged != null)
-            {
-                VideoOutChanged(this, new EventArgs());
-            }
-        }
-
-        public event EventHandler VideoOutChanged;
-
-        private void OnLengthChanged(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (LengthChanged != null)
-            {
-                LengthChanged(this, new EventArgs());
-            }
-        }
-
-        public event EventHandler LengthChanged;
-
-        private void OnEncounteredError(ref LibVlcEventArgs eventArgs, IntPtr userData)
-        {
-            if (EncounteredError != null)
-            {
-                EncounteredError(this, new EventArgs());
-            }
-        }
-
-        public event EventHandler EncounteredError;
-
-        #endregion 一般事件
-
-        #region 属性 Media
-
         public VlcMedia Media
         {
-            get
-            {
-                return InstancePointer == IntPtr.Zero
-                    ? null
-                    : HandleManager.GetVlcObject(_getMediaFunction.Delegate(InstancePointer)) as VlcMedia;
-            }
-            set
-            {
-                _setMediaFunction.Delegate(InstancePointer, IntPtr.Zero);
-                if (value != null)
-                {
-                    _setMediaFunction.Delegate(InstancePointer, value.InstancePointer);
-                }
-            }
+            get => InstancePointer == null
+                ? null
+                : VlcObjectManager.GetVlcObject(LibVlcManager.GetFunctionDelegate<libvlc_media_player_get_media>()
+                    .Invoke(InstancePointer)) as VlcMedia;
+            set => LibVlcManager.GetFunctionDelegate<libvlc_media_player_set_media>()
+                .Invoke(InstancePointer, value != null ? value.InstancePointer : null);
         }
 
         /// <summary>
-        ///     获取一个值,该值表示 <see cref="VlcMediaPlayer" /> 是否正在播放
+        ///     is playing
         /// </summary>
-        public bool IsPlaying
-        {
-            get { return _isPlayingFunction.Delegate(InstancePointer); }
-        }
+        public bool IsPlaying =>
+            LibVlcManager.GetFunctionDelegate<libvlc_media_player_is_playing>().Invoke(InstancePointer);
 
         /// <summary>
-        ///     获取或设置一个值,该值表示 <see cref="VlcMediaPlayer" /> 的播放进度,范围为0.0~1.0
+        ///     Get or set movie position as percentage between 0.0 and 1.0.
         /// </summary>
         public float Position
         {
-            get { return _getPositionFunction.Delegate(InstancePointer); }
-
-            set { _setPositionFunction.Delegate(InstancePointer, value); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_media_player_get_position>().Invoke(InstancePointer);
+            set => LibVlcManager.GetFunctionDelegate<libvlc_media_player_set_position>().Invoke(InstancePointer, value);
         }
 
         /// <summary>
-        ///     获取或设置一个值,该值表示 <see cref="VlcMediaPlayer" /> 通过GDI的方式,将视频渲染到指定的窗口句柄
+        ///     Get or set the Windows API window handle (HWND). The handle will be returned even if LibVLC
+        ///     is not currently outputting any video to it.
         /// </summary>
         public IntPtr Hwnd
         {
-            get { return _getHwndFunction.Delegate(InstancePointer); }
-            set { _setHwndFunction.Delegate(InstancePointer, value); }
+            get => new IntPtr(LibVlcManager.GetFunctionDelegate<libvlc_media_player_get_hwnd>()
+                .Invoke(InstancePointer));
+            set => LibVlcManager.GetFunctionDelegate<libvlc_media_player_set_hwnd>()
+                .Invoke(InstancePointer, value.ToPointer());
         }
 
         /// <summary>
-        ///     获取一个值,该值表示 <see cref="VlcMediaPlayer" /> 目前媒体的长度
+        ///     Get the current movie length.
         /// </summary>
         public TimeSpan Length
         {
             get
             {
-                var ms = _getLengthFunction.Delegate(InstancePointer);
+                var ms = LibVlcManager.GetFunctionDelegate<libvlc_media_player_get_length>().Invoke(InstancePointer);
                 return ms != -1 ? new TimeSpan(ms * 10000) : TimeSpan.Zero;
             }
         }
 
         /// <summary>
-        ///     获取或设置一个值,该值表示当前媒体播放进度
+        ///     Get or set the current movie time.
         /// </summary>
         public TimeSpan Time
         {
             get
             {
-                var ms = _getTimeFunction.Delegate(InstancePointer);
+                var ms = LibVlcManager.GetFunctionDelegate<libvlc_media_player_get_time>().Invoke(InstancePointer);
                 return ms != -1 ? new TimeSpan(ms * 10000) : TimeSpan.Zero;
             }
-            set { _setTimeFunction.Delegate(InstancePointer, (Int64)value.TotalMilliseconds); }
+            set => LibVlcManager.GetFunctionDelegate<libvlc_media_player_set_time>()
+                .Invoke(InstancePointer, value.Milliseconds);
         }
 
         /// <summary>
-        ///     获取或设置一个值,该值表示当前 <see cref="VlcMediaPlayer" /> 播放的章节
+        ///     Get or set movie chapter.
         /// </summary>
         public int Chapter
         {
-            get { return _getChapterFunction.Delegate(InstancePointer); }
-            set { _setChapterFunction.Delegate(InstancePointer, value); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_media_player_get_chapter>().Invoke(InstancePointer);
+            set => LibVlcManager.GetFunctionDelegate<libvlc_media_player_set_chapter>().Invoke(InstancePointer, value);
         }
 
         /// <summary>
-        ///     获取一个值,该值表示媒体共有多少个章节
+        ///     Get movie chapter count
         /// </summary>
-        public int ChapterCount
-        {
-            get { return _getChapterCountFunction.Delegate(InstancePointer); }
-        }
+        public int ChapterCount => LibVlcManager.GetFunctionDelegate<libvlc_media_player_get_chapter_count>()
+            .Invoke(InstancePointer);
 
         /// <summary>
-        ///     获取一个值,该值表示现在媒体是否可以进行播放
+        ///     Is the player able to play
         /// </summary>
-        public bool CanPlay
-        {
-            get { return _canPlayFunction.Delegate(InstancePointer); }
-        }
+        public bool CanPlay =>
+            LibVlcManager.GetFunctionDelegate<libvlc_media_player_will_play>().Invoke(InstancePointer);
 
         /// <summary>
-        ///     获取或设置一个值,该值表示 <see cref="VlcMediaPlayer" /> 当前播放的标题
+        ///     Get or set movie title
         /// </summary>
         public int Title
         {
-            get { return _getTitleFunction.Delegate(InstancePointer); }
-
-            set { _setTitleFunction.Delegate(InstancePointer, value); }
-        }
-
-        public int TitleCount
-        {
-            get { return _getTitleCountFunction.Delegate(InstancePointer); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_media_player_get_title>().Invoke(InstancePointer);
+            set => LibVlcManager.GetFunctionDelegate<libvlc_media_player_set_title>().Invoke(InstancePointer, value);
         }
 
         /// <summary>
-        ///     获取或设置一个值,该值表示当前媒体的播放速率
+        ///     Get movie title count
         /// </summary>
-        public float Rate
-        {
-            get { return _getRateFunction.Delegate(InstancePointer); }
-            set { _setRateFunction.Delegate(InstancePointer, value); }
-        }
+        public int TitleCount => LibVlcManager.GetFunctionDelegate<libvlc_media_player_get_title_count>()
+            .Invoke(InstancePointer);
 
         /// <summary>
-        ///     获取一个值,该值示当前媒体状态
+        ///     Get or set the requested movie play rate.
+        ///     <para />
+        ///     Depending on the underlying media, the requested rate may be
+        ///     different from the real playback rate.
         /// </summary>
-        public Interop.Media.MediaState State
+        public float Rate
         {
-            get { return _getStateFunction.Delegate(InstancePointer); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_media_player_get_rate>().Invoke(InstancePointer);
+            set => LibVlcManager.GetFunctionDelegate<libvlc_media_player_set_rate>().Invoke(InstancePointer, value);
         }
 
         /// <summary>
-        ///     获取一个值,该值表示当前媒体的FPS
+        ///     Get current movie state
         /// </summary>
-        public float Fps
-        {
-            get { return _getFpsFunction.Delegate(InstancePointer); }
-        }
+        public MediaState State => (MediaState) LibVlcManager.GetFunctionDelegate<libvlc_media_player_get_state>()
+            .Invoke(InstancePointer);
 
         /// <summary>
-        ///     获取一个值,该值表示当前拥有的视频输出数量
+        ///     How many video outputs does this media player have?
         /// </summary>
-        public uint HasVideoOutCount
-        {
-            get { return _hasVoutFunction.Delegate(InstancePointer); }
-        }
+        public uint VideoOutCount =>
+            LibVlcManager.GetFunctionDelegate<libvlc_media_player_has_vout>().Invoke(InstancePointer);
 
         /// <summary>
-        ///     获取一个值,该值表示当前媒体是否允许跳进度
+        ///     Is this media player seekable?
         /// </summary>
-        public bool IsSeekable
-        {
-            get { return _isSeekableFunction.Delegate(InstancePointer); }
-        }
+        public bool IsSeekable =>
+            LibVlcManager.GetFunctionDelegate<libvlc_media_player_is_seekable>().Invoke(InstancePointer);
 
         /// <summary>
-        ///     获取一个值,该值表示当前媒体是否允许暂停
+        ///     Can this media player be paused?
         /// </summary>
-        public bool CanPause
-        {
-            get { return _canPauseFunction.Delegate(InstancePointer); }
-        }
+        public bool CanPause =>
+            LibVlcManager.GetFunctionDelegate<libvlc_media_player_can_pause>().Invoke(InstancePointer);
 
         /// <summary>
-        ///     获取或设置一个值,该值表示当前媒体音频的音量
+        ///     Get or set current software audio volume.
         /// </summary>
         public int Volume
         {
-            get { return _getVolumeFunction.Delegate(InstancePointer); }
-
-            set { _setVolumeFunction.Delegate(InstancePointer, value); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_audio_get_volume>().Invoke(InstancePointer);
+            set => LibVlcManager.GetFunctionDelegate<libvlc_audio_set_volume>().Invoke(InstancePointer, value);
         }
 
         /// <summary>
-        ///     获取或设置一个值,该值表示当前媒体是否静音
+        ///     Get or set current mute status.
+        ///     <para />
+        ///     warning: This function does not always work. If there are no active audio
+        ///     playback stream, the mute status might not be available. If digital
+        ///     pass-through (S/PDIF, HDMI...) is in use, muting may be unapplicable. Also
+        ///     some audio output plugins do not support muting at all.
+        ///     note: To force silent playback, disable all audio tracks. This is more
+        ///     efficient and reliable than mute.
         /// </summary>
         public bool IsMute
         {
-            get { return _getMuteFunction.Delegate(InstancePointer) == 1; }
-
-            set { _setMuteFunction.Delegate(InstancePointer, value ? 1 : 0); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_audio_get_mute>().Invoke(InstancePointer) > 0;
+            set => LibVlcManager.GetFunctionDelegate<libvlc_audio_set_volume>().Invoke(InstancePointer, value ? 1 : 0);
         }
 
         /// <summary>
-        ///     获取或设置一个值，该值表示音频输出通道
+        ///     Get or set current audio channel.
         /// </summary>
         public AudioOutputChannel AudioOutputChannel
         {
-            get { return _getOutputChannelFunction.Delegate(InstancePointer); }
-
-            set { _setOutputChannelFunction.Delegate(InstancePointer, value); }
+            get => (AudioOutputChannel) LibVlcManager.GetFunctionDelegate<libvlc_audio_get_channel>()
+                .Invoke(InstancePointer);
+            set => LibVlcManager.GetFunctionDelegate<libvlc_audio_set_channel>()
+                .Invoke(InstancePointer, (libvlc_audio_output_channel_t) value);
         }
 
-        public int AudioTrackCount
-        {
-            get { return _getAudioTrackCountFunction.Delegate(InstancePointer); }
-        }
+        /// <summary>
+        ///     Get number of available audio tracks.
+        /// </summary>
+        public int AudioTrackCount =>
+            LibVlcManager.GetFunctionDelegate<libvlc_audio_get_track_count>().Invoke(InstancePointer);
 
+        /// <summary>
+        ///     Get or set current audio track.
+        /// </summary>
         public int AudioTrack
         {
-            get { return _getAudioTrackFunction.Delegate(InstancePointer); }
-            set { _setAudioTrackFunction.Delegate(InstancePointer, value); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_audio_get_track>().Invoke(InstancePointer);
+            set => LibVlcManager.GetFunctionDelegate<libvlc_audio_set_track>().Invoke(InstancePointer, value);
         }
 
-        public TrackDescriptionList AudioTrackDescription
+        /// <summary>
+        ///     Get the description of available audio tracks.
+        /// </summary>
+        public List<TrackDescription> AudioTrackDescription
         {
-            get { return new TrackDescriptionList(_getAudioTrackDescriptionFunction.Delegate(InstancePointer)); }
+            get
+            {
+                using (var list = new TrackDescriptionList(LibVlcManager
+                    .GetFunctionDelegate<libvlc_audio_get_track_description>().Invoke(InstancePointer)))
+                {
+                    return new List<TrackDescription>(list);
+                }
+            }
         }
 
-        public int VideoTrackCount
-        {
-            get { return _getVideoTrackCountFunction.Delegate(InstancePointer); }
-        }
+        public int VideoTrackCount =>
+            LibVlcManager.GetFunctionDelegate<libvlc_video_get_track_count>().Invoke(InstancePointer);
 
         public int VideoTrack
         {
-            get { return _getVideoTrackFunction.Delegate(InstancePointer); }
-            set { _setVideoTrackFunction.Delegate(InstancePointer, value); }
-        }
-
-        public TrackDescriptionList VideoTrackDescription
-        {
-            get { return new TrackDescriptionList(_getVideoTrackDescriptionFunction.Delegate(InstancePointer)); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_video_get_track>().Invoke(InstancePointer);
+            set => LibVlcManager.GetFunctionDelegate<libvlc_video_set_track>().Invoke(InstancePointer, value);
         }
 
-        public Size VideoSize
+        public List<TrackDescription> VideoTrackDescription
         {
             get
             {
-                uint x = 0, y = 0;
-                var result = _getSizeFunction.Delegate.Invoke(InstancePointer, 0, ref x, ref y);
-                return new Size(x, y);
+                using (var list = new TrackDescriptionList(LibVlcManager
+                    .GetFunctionDelegate<libvlc_video_get_track_description>().Invoke(InstancePointer)))
+                {
+                    return new List<TrackDescription>(list);
+                }
             }
         }
 
-        public Double PixelHeight
+        public Size VideoSize
         {
             get
             {
                 uint x = 0, y = 0;
-                var result = _getSizeFunction.Delegate.Invoke(InstancePointer, 0, ref x, ref y);
-                return y;
+                LibVlcManager.GetFunctionDelegate<libvlc_video_get_size>().Invoke(InstancePointer, 0, &x, &y);
+                return new Size(x, y);
             }
         }
 
-        public Double PixelWidth
-        {
-            get
-            {
-                uint x = 0, y = 0;
-                var result = _getSizeFunction.Delegate.Invoke(InstancePointer, 0, ref x, ref y);
-                return x;
-            }
-        }
+        public double PixelHeight => VideoSize.Height;
+
+        public double PixelWidth => VideoSize.Width;
 
         public float Scale
         {
-            get { return _getScaleFunction.Delegate.Invoke(InstancePointer); }
-            set { _setScaleFunction.Delegate.Invoke(InstancePointer, value); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_video_get_scale>().Invoke(InstancePointer);
+            set => LibVlcManager.GetFunctionDelegate<libvlc_video_set_scale>().Invoke(InstancePointer, value);
         }
 
-        public String AspectRatio
+        public string AspectRatio
         {
-            get
-            {
-                return InteropHelper.PtrToString(_getAspectRatioFunction.Delegate.Invoke(InstancePointer), -1, true);
-            }
+            get => InteropHelper.PtrToString(LibVlcManager.GetFunctionDelegate<libvlc_video_get_aspect_ratio>()
+                .Invoke(InstancePointer));
             set
             {
-                var handle = InteropHelper.StringToPtr(value);
-                _setAspectRatioFunction.Delegate.Invoke(InstancePointer, handle.AddrOfPinnedObject());
-                handle.Free();
+                using (var handle = new StringHandle(value))
+                {
+                    LibVlcManager.GetFunctionDelegate<libvlc_video_set_aspect_ratio>()
+                        .Invoke(InstancePointer, handle.UnsafePointer);
+                }
             }
         }
 
         public int Subtitle
         {
-            get { return _getSubtitleFunction.Delegate.Invoke(InstancePointer); }
-            set { _setSubtitleFunction.Delegate.Invoke(InstancePointer, value); }
-        }
-        public int SubtitleCount
-        {
-            get { return _getSubtitleCountFunction.Delegate.Invoke(InstancePointer); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_video_get_spu>().Invoke(InstancePointer);
+            set => LibVlcManager.GetFunctionDelegate<libvlc_video_set_spu>().Invoke(InstancePointer, value);
         }
 
+        public int SubtitleCount =>
+            LibVlcManager.GetFunctionDelegate<libvlc_video_get_spu_count>().Invoke(InstancePointer);
+
         public long SubtitleDelay
         {
-            get { return _getSubtitleDelayFunction.Delegate.Invoke(InstancePointer); }
-            set { _setSubtitleDelayFunction.Delegate.Invoke(InstancePointer, value); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_video_get_spu_delay>().Invoke(InstancePointer);
+            set => LibVlcManager.GetFunctionDelegate<libvlc_video_set_spu_delay>().Invoke(InstancePointer, value);
         }
 
-        public TrackDescriptionList SubtitleDescription
+        public List<TrackDescription> SubtitleDescription
         {
-            get { return new TrackDescriptionList(_getSubtitleDescriptionFunction.Delegate(InstancePointer)); }
+            get
+            {
+                using (var list = new TrackDescriptionList(LibVlcManager
+                    .GetFunctionDelegate<libvlc_video_get_spu_description>().Invoke(InstancePointer)))
+                {
+                    return new List<TrackDescription>(list);
+                }
+            }
         }
 
         public bool IsAdjustEnable
         {
-            get { return _getVideoAdjustIntFunction.Delegate(InstancePointer, VideoAdjust.Enable) != 0; }
-            set { _setVideoAdjustIntFunction.Delegate(InstancePointer, VideoAdjust.Enable, value ? 1 : 0); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_video_get_adjust_int>()
+                       .Invoke(InstancePointer, libvlc_video_adjust_option_t.libvlc_adjust_Enable) > 0;
+            set => LibVlcManager.GetFunctionDelegate<libvlc_video_set_adjust_int>().Invoke(InstancePointer,
+                libvlc_video_adjust_option_t.libvlc_adjust_Enable, value ? 1 : 0);
         }
 
         public float Contrast
         {
-            get { return _getVideoAdjustFloatFunction.Delegate(InstancePointer, VideoAdjust.Contrast); }
-            set { _setVideoAdjustFloatFunction.Delegate(InstancePointer, VideoAdjust.Contrast, value); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_video_get_adjust_float>().Invoke(InstancePointer,
+                libvlc_video_adjust_option_t.libvlc_adjust_Contrast);
+            set => LibVlcManager.GetFunctionDelegate<libvlc_video_set_adjust_float>().Invoke(InstancePointer,
+                libvlc_video_adjust_option_t.libvlc_adjust_Contrast, value);
         }
+
         public float Brightness
         {
-            get { return _getVideoAdjustFloatFunction.Delegate(InstancePointer, VideoAdjust.Brightness); }
-            set { _setVideoAdjustFloatFunction.Delegate(InstancePointer, VideoAdjust.Brightness, value); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_video_get_adjust_float>().Invoke(InstancePointer,
+                libvlc_video_adjust_option_t.libvlc_adjust_Brightness);
+            set => LibVlcManager.GetFunctionDelegate<libvlc_video_set_adjust_float>().Invoke(InstancePointer,
+                libvlc_video_adjust_option_t.libvlc_adjust_Brightness, value);
         }
+
         public float Hue
         {
-            get { return _getVideoAdjustFloatFunction.Delegate(InstancePointer, VideoAdjust.Hue); }
-            set { _setVideoAdjustFloatFunction.Delegate(InstancePointer, VideoAdjust.Hue, value); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_video_get_adjust_float>()
+                .Invoke(InstancePointer, libvlc_video_adjust_option_t.libvlc_adjust_Hue);
+            set => LibVlcManager.GetFunctionDelegate<libvlc_video_set_adjust_float>().Invoke(InstancePointer,
+                libvlc_video_adjust_option_t.libvlc_adjust_Hue, value);
         }
+
         public float Saturation
         {
-            get { return _getVideoAdjustFloatFunction.Delegate(InstancePointer, VideoAdjust.Saturation); }
-            set { _setVideoAdjustFloatFunction.Delegate(InstancePointer, VideoAdjust.Saturation, value); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_video_get_adjust_float>().Invoke(InstancePointer,
+                libvlc_video_adjust_option_t.libvlc_adjust_Saturation);
+            set => LibVlcManager.GetFunctionDelegate<libvlc_video_set_adjust_float>().Invoke(InstancePointer,
+                libvlc_video_adjust_option_t.libvlc_adjust_Saturation, value);
         }
+
         public float Gamma
         {
-            get { return _getVideoAdjustFloatFunction.Delegate(InstancePointer, VideoAdjust.Gamma); }
-            set { _setVideoAdjustFloatFunction.Delegate(InstancePointer, VideoAdjust.Gamma, value); }
+            get => LibVlcManager.GetFunctionDelegate<libvlc_video_get_adjust_float>()
+                .Invoke(InstancePointer, libvlc_video_adjust_option_t.libvlc_adjust_Gamma);
+            set => LibVlcManager.GetFunctionDelegate<libvlc_video_set_adjust_float>().Invoke(InstancePointer,
+                libvlc_video_adjust_option_t.libvlc_adjust_Gamma, value);
         }
 
-        #endregion 属性 Media
+        public void* InstancePointer { get; private set; }
 
-        #region 方法
+        public VlcEventManager EventManager { get; }
 
-        /// <summary>
-        ///     使 <see cref="VlcMediaPlayer" /> 开始播放
-        /// </summary>
-        public void Play()
+        public Vlc VlcInstance { get; }
+
+        public void Dispose()
         {
-            _playFunction.Delegate(InstancePointer);
+            Dispose(true);
         }
 
-        public void SetVideoDecodeCallback(VideoLockCallback lockCallback, VideoUnlockCallback unlockCallback,
-            VideoDisplayCallback displayCallback, IntPtr userData)
+        public static VlcMediaPlayer Create(Vlc vlc)
         {
-            _setVideoCallbackFunction.Delegate(InstancePointer, lockCallback, unlockCallback, displayCallback, userData);
+            return new VlcMediaPlayer(vlc,
+                LibVlcManager.GetFunctionDelegate<libvlc_media_player_new>().Invoke(vlc.InstancePointer));
         }
 
-        public void SetVideoFormatCallback(VideoFormatCallback formatCallback, VideoCleanupCallback cleanupCallback)
+        public static VlcMediaPlayer CreateFormMedia(VlcMedia media)
         {
-            _setVideoFormatCallbackFunction.Delegate(InstancePointer, formatCallback, cleanupCallback);
+            return new VlcMediaPlayer(media,
+                LibVlcManager.GetFunctionDelegate<libvlc_media_player_new_from_media>().Invoke(media.InstancePointer));
         }
 
-        public void SetAudioCallback(AudioPlayCallback playCallback, AudioPauseCallback pauseCallback,
-            AudioResumeCallback resumeCallback, AudioFlushCallback flushCallback, AudioDrainCallback drainCallback)
+        private void OnVlcEventFired(object sender, VlcEventArgs e)
         {
-            _setAudioCallbackFunction.Delegate(InstancePointer, playCallback, pauseCallback, resumeCallback,
-                flushCallback, drainCallback);
+            switch (e.Type)
+            {
+                case EventType.MediaPlayerMediaChanged:
+                    MediaChanged?.Invoke(this,
+                        new MediaPlayerValueChangedEventArgs<IntPtr>(e.EventArgs->media_player_media_changed
+                            .new_media));
+                    break;
+                case EventType.MediaPlayerNothingSpecial:
+                    MediaStateChanged?.Invoke(this, new MediaStateChangedEventArgs(MediaState.NothingSpecial));
+                    break;
+                case EventType.MediaPlayerOpening:
+                    MediaStateChanged?.Invoke(this, new MediaStateChangedEventArgs(MediaState.Opening));
+                    break;
+                case EventType.MediaPlayerBuffering:
+                    MediaStateChanged?.Invoke(this, new MediaStateChangedEventArgs(MediaState.Buffering));
+                    MediaPlayerBuffing?.Invoke(this,
+                        new MediaPlayerBufferingEventArgs(e.EventArgs->media_player_buffering.new_cache));
+                    break;
+                case EventType.MediaPlayerPlaying:
+                    MediaStateChanged?.Invoke(this, new MediaStateChangedEventArgs(MediaState.Playing));
+                    break;
+                case EventType.MediaPlayerPaused:
+                    MediaStateChanged?.Invoke(this, new MediaStateChangedEventArgs(MediaState.Paused));
+                    break;
+                case EventType.MediaPlayerStopped:
+                    MediaStateChanged?.Invoke(this, new MediaStateChangedEventArgs(MediaState.Stopped));
+                    break;
+                case EventType.MediaPlayerForward:
+                    Forward?.Invoke(this, null);
+                    break;
+                case EventType.MediaPlayerBackward:
+                    Backward?.Invoke(this, null);
+                    break;
+                case EventType.MediaPlayerEndReached:
+                    MediaStateChanged?.Invoke(this, new MediaStateChangedEventArgs(MediaState.Ended));
+                    break;
+                case EventType.MediaPlayerEncounteredError:
+                    MediaStateChanged?.Invoke(this, new MediaStateChangedEventArgs(MediaState.Error));
+                    break;
+                case EventType.MediaPlayerTimeChanged:
+                    TimeChanged?.Invoke(this,
+                        new MediaPlayerValueChangedEventArgs<long>(e.EventArgs->media_player_time_changed.new_time));
+                    break;
+                case EventType.MediaPlayerPositionChanged:
+                    PositionChanged?.Invoke(this,
+                        new MediaPlayerValueChangedEventArgs<float>(e.EventArgs->media_player_position_changed
+                            .new_position));
+                    break;
+                case EventType.MediaPlayerSeekableChanged:
+                    SeekableChanged?.Invoke(this,
+                        new MediaPlayerValueChangedEventArgs<bool>(
+                            e.EventArgs->media_player_seekable_changed.new_seekable > 0));
+                    break;
+                case EventType.MediaPlayerPausableChanged:
+                    PausableChanged?.Invoke(this,
+                        new MediaPlayerValueChangedEventArgs<bool>(
+                            e.EventArgs->media_player_pausable_changed.new_pausable > 0));
+                    break;
+                case EventType.MediaPlayerTitleChanged:
+                    TitleChanged?.Invoke(this,
+                        new MediaPlayerValueChangedEventArgs<int>(e.EventArgs->media_player_title_changed.new_title));
+                    break;
+                case EventType.MediaPlayerSnapshotTaken:
+                    SnapshotTaken?.Invoke(this,
+                        new ObjectEventArgs<string>(
+                            InteropHelper.PtrToString(e.EventArgs->media_player_snapshot_taken.psz_filename)));
+                    break;
+                case EventType.MediaPlayerLengthChanged:
+                    LengthChanged?.Invoke(this,
+                        new MediaPlayerValueChangedEventArgs<long>(e.EventArgs->media_player_length_changed
+                            .new_length));
+                    break;
+                case EventType.MediaPlayerVout:
+                    VideoOutChanged?.Invoke(this,
+                        new MediaPlayerValueChangedEventArgs<int>(e.EventArgs->media_player_vout.new_count));
+                    break;
+                case EventType.MediaPlayerScrambledChanged:
+                    ScrambledChanged?.Invoke(this,
+                        new MediaPlayerValueChangedEventArgs<bool>(
+                            e.EventArgs->media_player_scrambled_changed.new_scrambled > 0));
+                    break;
+                case EventType.MediaPlayerESAdded:
+                    break;
+                case EventType.MediaPlayerESDeleted:
+                    break;
+                case EventType.MediaPlayerESSelected:
+                    break;
+                case EventType.MediaPlayerCorked:
+                    Corked?.Invoke(this, null);
+                    break;
+                case EventType.MediaPlayerUncorked:
+                    Uncorked?.Invoke(this, null);
+                    break;
+                case EventType.MediaPlayerMuted:
+                    Muted?.Invoke(this, null);
+                    break;
+                case EventType.MediaPlayerUnmuted:
+                    Unmuted?.Invoke(this, null);
+                    break;
+                case EventType.MediaPlayerAudioVolume:
+                    AudioVolumeChanged?.Invoke(this,
+                        new MediaPlayerValueChangedEventArgs<float>(e.EventArgs->media_player_audio_volume.volume));
+                    break;
+                case EventType.MediaPlayerAudioDevice:
+                    AudioDeviceChanged?.Invoke(this,
+                        new MediaPlayerValueChangedEventArgs<string>(
+                            InteropHelper.PtrToString(e.EventArgs->media_player_audio_device.device)));
+                    break;
+                case EventType.MediaPlayerChapterChanged:
+                    ChapterChanged?.Invoke(this,
+                        new MediaPlayerValueChangedEventArgs<int>(e.EventArgs->media_player_chapter_changed
+                            .new_chapter));
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
         }
 
-        public void SetAudioFormatCallback(AudioSetupCallback setupCallback, AudioCleanupCallback cleanupCallback)
+        public event EventHandler Forward;
+        public event EventHandler Backward;
+        public event EventHandler<MediaStateChangedEventArgs> MediaStateChanged;
+        public event EventHandler<MediaPlayerValueChangedEventArgs<IntPtr>> MediaChanged;
+        public event EventHandler<MediaPlayerBufferingEventArgs> MediaPlayerBuffing;
+        public event EventHandler<MediaPlayerValueChangedEventArgs<long>> TimeChanged;
+        public event EventHandler<MediaPlayerValueChangedEventArgs<float>> PositionChanged;
+        public event EventHandler<MediaPlayerValueChangedEventArgs<bool>> SeekableChanged;
+        public event EventHandler<MediaPlayerValueChangedEventArgs<bool>> PausableChanged;
+        public event EventHandler<MediaPlayerValueChangedEventArgs<int>> TitleChanged;
+        public event EventHandler<ObjectEventArgs<string>> SnapshotTaken;
+        public event EventHandler<MediaPlayerValueChangedEventArgs<int>> VideoOutChanged;
+        public event EventHandler<MediaPlayerValueChangedEventArgs<long>> LengthChanged;
+        public event EventHandler<MediaPlayerValueChangedEventArgs<bool>> ScrambledChanged;
+        public event EventHandler<MediaPlayerValueChangedEventArgs<float>> AudioVolumeChanged;
+        public event EventHandler<MediaPlayerValueChangedEventArgs<string>> AudioDeviceChanged;
+        public event EventHandler<MediaPlayerValueChangedEventArgs<int>> ChapterChanged;
+        public event EventHandler Corked;
+        public event EventHandler Uncorked;
+        public event EventHandler Muted;
+        public event EventHandler Unmuted;
+
+        public void Play()
         {
-            _setAudioFormatCallbackFunction.Delegate(InstancePointer, setupCallback, cleanupCallback);
+            LibVlcManager.GetFunctionDelegate<libvlc_media_player_play>().Invoke(InstancePointer);
         }
 
-        public void SetAudioVolumeCallback(AudioSetVolumeCallback volumeCallback)
+        public void SetVideoDecodeCallback(libvlc_video_lock_cb lockCallback, libvlc_video_unlock_cb unlockCallback,
+            libvlc_video_display_cb displayCallback, IntPtr userData)
         {
-            _setAudioVolumeCallbackFunction.Delegate(InstancePointer, volumeCallback);
+            LibVlcManager.GetFunctionDelegate<libvlc_video_set_callbacks>().Invoke(InstancePointer, lockCallback,
+                unlockCallback, displayCallback, userData.ToPointer());
         }
 
-        public bool SetSubtitleFile(String path)
+        public void SetVideoFormatCallback(libvlc_video_format_cb formatCallback,
+            libvlc_video_cleanup_cb cleanupCallback)
         {
-            var pathHandle = InteropHelper.StringToPtr(path);
-            var result = _setSubtitleFileFunction.Delegate(InstancePointer, pathHandle.AddrOfPinnedObject());
-            pathHandle.Free();
-            return result != 0;
+            LibVlcManager.GetFunctionDelegate<libvlc_video_set_format_callbacks>()
+                .Invoke(InstancePointer, formatCallback, cleanupCallback);
         }
 
-        /// <summary>
-        ///     设置 <see cref="VlcMediaPlayer" /> 播放或者暂停
-        /// </summary>
-        /// <param name="pause">true 代表暂停,false 代表播放或继续</param>
         public void SetPause(bool pause)
         {
-            _setPauseFunction.Delegate(InstancePointer, pause);
+            LibVlcManager.GetFunctionDelegate<libvlc_media_player_set_pause>().Invoke(InstancePointer, pause ? 1 : 0);
         }
 
-        /// <summary>
-        ///     设置 <see cref="VlcMediaPlayer" /> 为暂停
-        /// </summary>
         public void Pause()
         {
-            _setPauseFunction.Delegate(InstancePointer, true);
+            SetPause(true);
         }
 
-        /// <summary>
-        ///     设置 <see cref="VlcMediaPlayer" /> 为播放
-        /// </summary>
         public void Resume()
         {
-            _setPauseFunction.Delegate(InstancePointer, false);
+            SetPause(false);
         }
 
-        /// <summary>
-        ///     当播放时设置 <see cref="VlcMediaPlayer" /> 为暂停,反之为播放
-        /// </summary>
         public void PauseOrResume()
         {
-            _setPauseFunction.Delegate(InstancePointer, IsPlaying);
+            SetPause(IsPlaying);
         }
 
-        /// <summary>
-        ///     设置 <see cref="VlcMediaPlayer" /> 为停止
-        /// </summary>
         public void Stop()
         {
-            _stopFunction.Delegate(InstancePointer);
+            LibVlcManager.GetFunctionDelegate<libvlc_media_player_stop>().Invoke(InstancePointer);
         }
 
-        /// <summary>
-        ///     设置 Audio 的格式
-        /// </summary>
-        /// <param name="format">格式字符串,一个四字符的字符串</param>
-        /// <param name="rate">采样率</param>
-        /// <param name="channels">通道数</param>
-        public void SetAudioFormat(String format, uint rate, uint channels)
+        public void SetAudioFormat(string format, uint rate, uint channels)
         {
-            _setAudioFormatFunction.Delegate(InstancePointer, Encoding.UTF8.GetBytes(format), rate, channels);
+            using (var handle = new StringHandle(format))
+            {
+                LibVlcManager.GetFunctionDelegate<libvlc_audio_set_format>()
+                    .Invoke(InstancePointer, handle.UnsafePointer, rate, channels);
+            }
         }
 
         public int GetTitleChapterCount(int title)
         {
-            return _getTitleChapterCountFunction.Delegate(InstancePointer, title);
+            return LibVlcManager.GetFunctionDelegate<libvlc_media_player_get_chapter_count_for_title>()
+                .Invoke(InstancePointer, title);
         }
 
-        /// <summary>
-        ///     播放上一个章节
-        /// </summary>
         public void PreviousChapter()
         {
-            _previousChapterFunction.Delegate(InstancePointer);
+            LibVlcManager.GetFunctionDelegate<libvlc_media_player_previous_chapter>().Invoke(InstancePointer);
         }
 
-        /// <summary>
-        ///     播放下一个章节
-        /// </summary>
         public void NextChapter()
         {
-            _nextChapterFunction.Delegate(InstancePointer);
+            LibVlcManager.GetFunctionDelegate<libvlc_media_player_next_chapter>().Invoke(InstancePointer);
         }
 
-        /// <summary>
-        ///     播放下一帧
-        /// </summary>
         public void NextFrame()
         {
-            _nextFrameFunction.Delegate(InstancePointer);
+            LibVlcManager.GetFunctionDelegate<libvlc_media_player_next_frame>().Invoke(InstancePointer);
         }
 
-        /// <summary>
-        ///     设置标题显示位置
-        /// </summary>
-        /// <param name="pos">位置</param>
-        /// <param name="timeout">显示时间</param>
         public void SetVideoTitleDisplay(Position pos, uint timeout)
         {
-            _setVideoTitleDisplayFunction.Delegate(InstancePointer, pos, timeout);
+            LibVlcManager.GetFunctionDelegate<libvlc_media_player_set_video_title_display>()
+                .Invoke(InstancePointer, (libvlc_position_t) pos, timeout);
         }
 
-        /// <summary>
-        ///     切换静音状态
-        /// </summary>
         public void ToggleMute()
         {
-            _toggleMuteFunction.Delegate(InstancePointer);
+            LibVlcManager.GetFunctionDelegate<libvlc_audio_toggle_mute>().Invoke(InstancePointer);
         }
 
-        public void SetVideoFormat(String chroma, uint width, uint height, uint pitch)
+        public void SetVideoFormat(string chroma, uint width, uint height, uint pitch)
         {
-            var handle = InteropHelper.StringToPtr(chroma);
-            _setVideoFormatFunction.Delegate(InstancePointer, handle.AddrOfPinnedObject(), width, height, pitch);
-            handle.Free();
+            using (var handle = new StringHandle(chroma))
+            {
+                LibVlcManager.GetFunctionDelegate<libvlc_video_set_format>()
+                    .Invoke(InstancePointer, handle.UnsafePointer, width, height, pitch);
+            }
         }
 
-        /// <summary>
-        ///     获取鼠标坐标
-        /// </summary>
-        /// <param name="num">视频输出号</param>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
         public void GetMouseCursor(uint num, ref int x, ref int y)
         {
-            _getCursorFunction.Delegate(InstancePointer, num, ref x, ref y);
+            int posX, posY;
+            LibVlcManager.GetFunctionDelegate<libvlc_video_get_cursor>().Invoke(InstancePointer, num, &posX, &posY);
+            x = posX;
+            y = posY;
         }
 
+        [Obsolete("Get some error for compiling VLC 3.x, some extension function disabled.")]
         public bool SetMouseCursor(uint num, int x, int y)
         {
-            return _setCursorFunction.Delegate(InstancePointer, num, x, y) == 0;
+            return false;
         }
 
+        [Obsolete("Get some error for compiling VLC 3.x, some extension function disabled.")]
         public bool SetMouseDown(uint num, MouseButton button)
         {
-            return _setMouseDownFunction.Delegate(InstancePointer, num, button) == 0;
+            return false;
         }
 
+        [Obsolete("Get some error for compiling VLC 3.x, some extension function disabled.")]
         public bool SetMouseUp(uint num, MouseButton button)
         {
-            return _setMouseUpFunction.Delegate(InstancePointer, num, button) == 0;
+            return false;
         }
 
         public void Navigate(NavigateMode mode)
         {
-            _navigateFunction.Delegate(InstancePointer, mode);
+            LibVlcManager.GetFunctionDelegate<libvlc_media_player_navigate>()
+                .Invoke(InstancePointer, (libvlc_navigate_mode_t) mode);
         }
 
         /// <summary>
@@ -1065,18 +697,21 @@ public void Navigate(NavigateMode mode)
         /// <param name="equalizer"></param>
         public bool SetEqualizer(AudioEqualizer equalizer)
         {
-            return
-                _setEqualizerFunction.Delegate(InstancePointer,
-                    equalizer == null ? IntPtr.Zero : equalizer.InstancePointer) == 0;
+            return LibVlcManager.GetFunctionDelegate<libvlc_media_player_set_equalizer>()
+                       .Invoke(InstancePointer, equalizer != null ? equalizer.InstancePointer : null) == 0;
         }
 
         /// <summary>
         ///     Gets a list of potential audio output devices.
         /// </summary>
         /// <returns></returns>
-        public AudioDeviceList EnumAudioDeviceList()
+        public List<AudioDevice> EnumAudioDeviceList()
         {
-            return new AudioDeviceList(_enumAudioDeviceListFunction.Delegate(InstancePointer));
+            using (var list = new AudioDeviceList(LibVlcManager.GetFunctionDelegate<libvlc_audio_output_device_enum>()
+                .Invoke(InstancePointer)))
+            {
+                return new List<AudioDevice>(list);
+            }
         }
 
         /// <summary>
@@ -1084,23 +719,30 @@ public AudioDeviceList EnumAudioDeviceList()
         /// </summary>
         /// <param name="audioOutput"></param>
         /// <returns></returns>
-        public AudioDeviceList GetAudioDeviceList(AudioOutput audioOutput)
+        public List<AudioDevice> GetAudioDeviceList(AudioOutput audioOutput)
         {
-            var handle = InteropHelper.StringToPtr(audioOutput.Name);
-            var result =
-                new AudioDeviceList(_getAudioDeviceListFunction.Delegate(VlcInstance.InstancePointer,
-                    handle.AddrOfPinnedObject()));
-            handle.Free();
-            return result;
+            using (var handle = new StringHandle(audioOutput.Name))
+            {
+                using (var list = new AudioDeviceList(LibVlcManager
+                    .GetFunctionDelegate<libvlc_audio_output_device_list_get>()
+                    .Invoke(VlcInstance.InstancePointer, handle.UnsafePointer)))
+                {
+                    return new List<AudioDevice>(list);
+                }
+            }
         }
 
         /// <summary>
         ///     Gets the list of available audio output modules.
         /// </summary>
         /// <returns></returns>
-        public AudioOutputList GetAudioOutputList()
+        public List<AudioOutput> GetAudioOutputList()
         {
-            return new AudioOutputList(_getAudioOutputListFunction.Delegate(VlcInstance.InstancePointer));
+            using (var list = new AudioOutputList(LibVlcManager.GetFunctionDelegate<libvlc_audio_output_list_get>()
+                .Invoke(InstancePointer)))
+            {
+                return new List<AudioOutput>(list);
+            }
         }
 
         /// <summary>
@@ -1112,18 +754,20 @@ public AudioOutputList GetAudioOutputList()
         /// <returns></returns>
         public bool SetAudioOutput(AudioOutput audioOutput)
         {
-            var handle = InteropHelper.StringToPtr(audioOutput.Name);
-            var result = _setAudioOutputFunction.Delegate(InstancePointer, handle.AddrOfPinnedObject());
-            handle.Free();
-            return result == 0;
+            using (var handle = new StringHandle(audioOutput.Name))
+            {
+                return LibVlcManager.GetFunctionDelegate<libvlc_audio_output_set>()
+                           .Invoke(InstancePointer, handle.UnsafePointer) == 0;
+            }
         }
 
         /// <summary>
         ///     Get the current audio output device identifier.
         /// </summary>
-        public String GetAudioDevice()
+        public string GetAudioDevice()
         {
-            return InteropHelper.PtrToString(_getAudioDeviceFunction.Delegate(InstancePointer));
+            return InteropHelper.PtrToString(LibVlcManager.GetFunctionDelegate<libvlc_audio_output_device_get>()
+                .Invoke(InstancePointer));
         }
 
         /// <summary>
@@ -1140,103 +784,27 @@ public String GetAudioDevice()
         /// </summary>
         public void SetAudioDevice(AudioOutput audioOutput, AudioDevice audioDevice)
         {
-            var outputHandle = audioOutput == null ? null : new GCHandle?(InteropHelper.StringToPtr(audioOutput.Name));
-            var deviceHandle = InteropHelper.StringToPtr(audioDevice.Device);
-            _setAudioDeviceFunction.Delegate(InstancePointer,
-                outputHandle == null ? IntPtr.Zero : outputHandle.Value.AddrOfPinnedObject(),
-                deviceHandle.AddrOfPinnedObject());
-            if (outputHandle.HasValue)
+            using (var outputHandle = new StringHandle(audioOutput.Name))
             {
-                outputHandle.Value.Free();
+                using (var deviceHandle = new StringHandle(audioDevice.Device))
+                {
+                    LibVlcManager.GetFunctionDelegate<libvlc_audio_output_device_set>()
+                        .Invoke(InstancePointer, outputHandle.UnsafePointer, deviceHandle.UnsafePointer);
+                }
             }
-            deviceHandle.Free();
         }
 
-        private bool _disposed;
-
         protected void Dispose(bool disposing)
         {
-            if (_disposed)
-            {
-                return;
-            }
+            if (_disposed) return;
 
-            //EventManager.Dispose();
-            HandleManager.Remove(this);
-
-            EventManager.Detach(EventTypes.MediaPlayerPlaying, _onPlaying, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerPaused, _onPaused, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerOpening, _onOpening, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerBuffering, _onBuffering, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerStopped, _onStoped, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerForward, _onForward, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerBackward, _onBackward, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerEndReached, _onEndReached, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerMediaChanged, _onMediaChanged, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerNothingSpecial, _onNothingSpecial, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerPausableChanged, _onPausableChanged, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerPositionChanged, _onPositionChanged, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerSeekableChanged, _onSeekableChanged, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerSnapshotTaken, _onSnapshotTaken, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerTimeChanged, _onTimeChanged, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerTitleChanged, _onTitleChanged, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerVideoOutChanged, _onVideoOutChanged, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerLengthChanged, _onLengthChanged, IntPtr.Zero);
-            EventManager.Detach(EventTypes.MediaPlayerEncounteredError, _onEncounteredError, IntPtr.Zero);
-
-            _onPlayingHandle.Free();
-            _onPausedHandle.Free();
-            _onOpeningHandle.Free();
-            _onBufferingHandle.Free();
-            _onStopedHandle.Free();
-            _onForwardHandle.Free();
-            _onBackwardHandle.Free();
-            _onEndReachedHandle.Free();
-            _onMediaChangedHandle.Free();
-            _onNothingSpecialHandle.Free();
-            _onPausableChangedHandle.Free();
-            _onPositionChangedHandle.Free();
-            _onSeekableChangedHandle.Free();
-            _onSnapshotTakenHandle.Free();
-            _onTimeChangedHandle.Free();
-            _onTitleChangedHandle.Free();
-            _onVideoOutChangedHandle.Free();
-            _onLengthChangedHandle.Free();
-            _onEncounteredErrorHandle.Free();
-            _releaseMediaPlayerFunction.Delegate(InstancePointer);
-            InstancePointer = IntPtr.Zero;
+            VlcObjectManager.Remove(this);
+            EventManager.VlcEventFired -= OnVlcEventFired;
+            EventManager.Dispose();
+            LibVlcManager.GetFunctionDelegate<libvlc_media_player_release>().Invoke(InstancePointer);
+            InstancePointer = null;
 
             _disposed = true;
         }
-
-        /// <summary>
-        ///     释放 VlcMedia 资源
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-
-        #endregion 方法
-    }
-
-    public class MediaPlayerBufferingEventArgs : EventArgs
-    {
-        public MediaPlayerBufferingEventArgs(float newCache)
-        {
-            NewCache = newCache;
-        }
-
-        public float NewCache { get; private set; }
-    }
-
-    public class MediaPlayerMediaChangedEventArgs : EventArgs
-    {
-        public MediaPlayerMediaChangedEventArgs(VlcMedia newMedia)
-        {
-            NewMedia = newMedia;
-        }
-
-        public VlcMedia NewMedia { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Meta.Vlc/VlcObjectManager.cs b/Meta.Vlc/VlcObjectManager.cs
new file mode 100644
index 0000000..9fd1c78
--- /dev/null
+++ b/Meta.Vlc/VlcObjectManager.cs
@@ -0,0 +1,36 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: VlcObjectManager.cs
+// Version: 20181231
+
+using System;
+using System.Collections.Generic;
+
+namespace Meta.Vlc
+{
+    internal static unsafe class VlcObjectManager
+    {
+        private static readonly Dictionary<IntPtr, IVlcObject> HandleDic = new Dictionary<IntPtr, IVlcObject>();
+
+        public static IVlcObject GetVlcObject(IntPtr pointer)
+        {
+            return HandleDic.ContainsKey(pointer) ? HandleDic[pointer] : null;
+        }
+
+        public static IVlcObject GetVlcObject(void* pointer)
+        {
+            return GetVlcObject(new IntPtr(pointer));
+        }
+
+        public static void Add(IVlcObject vlcObject)
+        {
+            var pointer = new IntPtr(vlcObject.InstancePointer);
+            if (!HandleDic.ContainsKey(pointer)) HandleDic.Add(pointer, vlcObject);
+        }
+
+        public static void Remove(IVlcObject vlcObject)
+        {
+            var pointer = new IntPtr(vlcObject.InstancePointer);
+            if (HandleDic.ContainsKey(pointer)) HandleDic.Remove(pointer);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/VlcSettingsAttribute.cs b/Meta.Vlc/VlcSettingsAttribute.cs
index b23772e..0732b33 100644
--- a/Meta.Vlc/VlcSettingsAttribute.cs
+++ b/Meta.Vlc/VlcSettingsAttribute.cs
@@ -1,6 +1,6 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: VlcSettingsAttribute.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
 
@@ -8,18 +8,18 @@ namespace Meta.Vlc
 {
     public class VlcSettingsAttribute : Attribute
     {
-        public VlcSettingsAttribute(String vlcPath) : this(vlcPath, null)
+        public VlcSettingsAttribute(string vlcPath) : this(vlcPath, null)
         {
         }
 
-        public VlcSettingsAttribute(String vlcPath, params String[] option)
+        public VlcSettingsAttribute(string vlcPath, params string[] option)
         {
             LibVlcPath = vlcPath;
             VlcOption = option;
         }
 
-        public String LibVlcPath { get; set; }
+        public string LibVlcPath { get; set; }
 
-        public String[] VlcOption { get; set; }
+        public string[] VlcOption { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Meta.Vlc/VlcUnmanagedLinkedList.cs b/Meta.Vlc/VlcUnmanagedLinkedList.cs
new file mode 100644
index 0000000..511f36a
--- /dev/null
+++ b/Meta.Vlc/VlcUnmanagedLinkedList.cs
@@ -0,0 +1,79 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: VlcUnmanagedLinkedList.cs
+// Version: 20181231
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Meta.Vlc
+{
+    public abstract unsafe class VlcUnmanagedLinkedList<TItem> : IUnmanagedObject, IEnumerable<TItem>
+    {
+        private readonly List<TItem> _list = new List<TItem>();
+
+        private bool _disposedValue;
+
+        public VlcUnmanagedLinkedList(void* pointer)
+        {
+            InstancePointer = pointer;
+
+            while (pointer != null)
+            {
+                _list.Add(CreateItem(pointer));
+                pointer = NextItem(pointer);
+            }
+        }
+
+        public int Count => _list.Count;
+
+        public TItem this[int index] => _list[index];
+
+        public void* InstancePointer { get; private set; }
+
+        public IEnumerator<TItem> GetEnumerator()
+        {
+            return _list.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        void* IUnmanagedObject.InstancePointer => throw new NotImplementedException();
+
+        void IDisposable.Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected abstract TItem CreateItem(void* data);
+
+        protected abstract void* NextItem(void* data);
+
+        protected abstract void Release(void* data);
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposedValue)
+            {
+                if (disposing) _list.Clear();
+
+                if (InstancePointer != null)
+                {
+                    Release(InstancePointer);
+                    InstancePointer = null;
+                }
+
+                _disposedValue = true;
+            }
+        }
+
+        ~VlcUnmanagedLinkedList()
+        {
+            Dispose(false);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/VlcUnmanagedList.cs b/Meta.Vlc/VlcUnmanagedList.cs
new file mode 100644
index 0000000..bc66a28
--- /dev/null
+++ b/Meta.Vlc/VlcUnmanagedList.cs
@@ -0,0 +1,74 @@
+// Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
+// Filename: VlcUnmanagedList.cs
+// Version: 20181231
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Meta.Vlc
+{
+    public abstract unsafe class VlcUnmanagedList<TItem> : IUnmanagedObject, IEnumerable<TItem>
+    {
+        private readonly List<TItem> _list = new List<TItem>();
+
+        private bool _disposedValue;
+
+        public VlcUnmanagedList(void** pointer, uint count)
+        {
+            if (pointer == null) return;
+
+            InstancePointer = pointer;
+            for (var i = 0; i < count; i++) _list.Add(CreateItem(pointer[i]));
+        }
+
+        public int Count => _list.Count;
+
+        public TItem this[int index] => _list[index];
+
+        public void* InstancePointer { get; private set; }
+
+        public IEnumerator<TItem> GetEnumerator()
+        {
+            return _list.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        void* IUnmanagedObject.InstancePointer => throw new NotImplementedException();
+
+        void IDisposable.Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected abstract TItem CreateItem(void* data);
+
+        protected abstract void Release(void** data);
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposedValue)
+            {
+                if (disposing) _list.Clear();
+
+                if (InstancePointer != null)
+                {
+                    Release((void**) InstancePointer);
+                    InstancePointer = null;
+                }
+
+                _disposedValue = true;
+            }
+        }
+
+        ~VlcUnmanagedList()
+        {
+            Dispose(false);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Meta.Vlc/Win32Api.cs b/Meta.Vlc/Win32Api.cs
index f071929..7143e40 100644
--- a/Meta.Vlc/Win32Api.cs
+++ b/Meta.Vlc/Win32Api.cs
@@ -1,9 +1,10 @@
 // Project: Meta.Vlc (https://github.com/higankanshi/Meta.Vlc)
 // Filename: Win32Api.cs
-// Version: 20160214
+// Version: 20181231
 
 using System;
 using System.ComponentModel;
+using System.IO;
 using System.Runtime.InteropServices;
 
 namespace Meta.Vlc
@@ -26,17 +27,11 @@ public static class Win32Api
         /// <returns>返回 DLL 模块句柄,如果出错将抛出异常</returns>
         public static IntPtr LoadLibrary(string lpFileName)
         {
-            if (!System.IO.File.Exists(lpFileName))
-            {
-                throw new Exception(String.Format("模块文件不存在:{0}", lpFileName));
-            }
+            if (!File.Exists(lpFileName)) throw new Exception(string.Format("模块文件不存在:{0}", lpFileName));
             var result = LoadLibraryStatic(lpFileName);
             if (result != IntPtr.Zero) return result;
             var error = GetLastError();
-            if (error == 0)
-            {
-                throw new Win32Exception("无法载入指定的模块,未知错误.");
-            }
+            if (error == 0) throw new Win32Exception("无法载入指定的模块,未知错误.");
             throw new Win32Exception(error, "无法载入指定的模块.");
         }
 
@@ -52,16 +47,14 @@ public static IntPtr LoadLibrary(string lpFileName)
         /// <returns>返回函数地址</returns>
         public static IntPtr GetProcAddress(IntPtr hModule, string lpProcName)
         {
-            IntPtr result = GetProcAddressStatic(hModule, lpProcName);
+            var result = GetProcAddressStatic(hModule, lpProcName);
             if (result == IntPtr.Zero)
             {
-                int error = GetLastError();
-                if (error == 0)
-                {
-                    throw new Win32Exception("无法获取函数地址,未知错误.");
-                }
+                var error = GetLastError();
+                if (error == 0) throw new Win32Exception("无法获取函数地址,未知错误.");
                 throw new Win32Exception(error, "无法获取函数地址.");
             }
+
             return result;
         }