Handle destruction in MediaInfo Finalizer

zhulik · Dec 13, 2015 · a08be32 · a08be32
1 parent dd7189f
commit a08be32
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/go_mediainfo.h b/go_mediainfo.h
@@ -22,7 +22,6 @@ const char *toChar(const wchar_t *c)
 }
 
 void *GoMediaInfo_New() {
-    setlocale(LC_CTYPE, "");
     return MediaInfo_New();
 }
 

diff --git a/mediainfo.go b/mediainfo.go
@@ -6,25 +6,31 @@ package mediainfo
 import "C"
 
 import (
-	"unsafe"
 	"errors"
 	"fmt"
+	"runtime"
+	"unsafe"
 )
 
 type MediaInfo struct {
 	handle unsafe.Pointer
 }
 
 func init() {
+	C.setlocale(C.LC_CTYPE, C.CString(""))
 	C.MediaInfoDLL_Load()
 
 	if C.MediaInfoDLL_IsLoaded() == 0 {
 		panic("Cannot load mediainfo")
 	}
 }
 
-func NewMediaInfo() (*MediaInfo) {
-	return &MediaInfo{handle: C.GoMediaInfo_New()}
+func NewMediaInfo() *MediaInfo {
+	result := &MediaInfo{handle: C.GoMediaInfo_New()}
+	runtime.SetFinalizer(result, func(f *MediaInfo) {
+		C.GoMediaInfo_Delete(f.handle)
+	})
+	return result
 }
 
 func (mi *MediaInfo) Open(path string) error {
@@ -41,4 +47,4 @@ func (mi *MediaInfo) Close() {
 
 func (mi *MediaInfo) Get(param string) string {
 	return C.GoString(C.GoMediaInfoGet(mi.handle, C.CString(param)))
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,6 @@ const char *toChar(const wchar_t *c) @@
     }
     void *GoMediaInfo_New() {
-        setlocale(LC_CTYPE, "");
         return MediaInfo_New();
     }
@@ Expand Down @@