From cbd29092afc4e0e83ae8705bc972c439a4ab9321 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Tue, 21 Mar 2017 14:35:17 +0900 Subject: [PATCH] Media content code refactoring Remove unused code Add disposed object checker Fix media bookmark crash issue Change-Id: I4fd33418889ffbacae4139c99a750bb63d635c64 Signed-off-by: Minje Ahn --- packaging/csapi-media-content.spec | 2 +- .../Tizen.Content.MediaContent/Album.cs | 26 +++++++-- .../Tizen.Content.MediaContent/ContentDatabase.cs | 40 +++++++------- .../Tizen.Content.MediaContent/MediaBookmark.cs | 64 ++++++++++------------ .../Tizen.Content.MediaContent/MediaFace.cs | 28 +++++----- .../Tizen.Content.MediaContent/MediaFolder.cs | 34 ++++++------ .../Tizen.Content.MediaContent/PlayList.cs | 23 +++++--- .../Tizen.Content.MediaContent/Storage.cs | 19 ++++--- .../Tizen.Content.MediaContent/Tag.cs | 16 ++++-- 9 files changed, 139 insertions(+), 113 deletions(-) diff --git a/packaging/csapi-media-content.spec b/packaging/csapi-media-content.spec index 3c958ca..85cda39 100755 --- a/packaging/csapi-media-content.spec +++ b/packaging/csapi-media-content.spec @@ -1,6 +1,6 @@ Name: csapi-media-content Summary: Tizen Media Content API for C# -Version: 1.0.11 +Version: 1.0.12 Release: 1 Group: Development/Libraries License: Apache-2.0 diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Album.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Album.cs index c48fead..08ce8f8 100755 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Album.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Album.cs @@ -29,7 +29,21 @@ namespace Tizen.Content.MediaContent /// public class Album : ContentCollection { - internal IntPtr _albumHandle = IntPtr.Zero; + private IntPtr _albumHandle = IntPtr.Zero; + + private IntPtr Handle + { + get + { + if (_albumHandle == IntPtr.Zero) + { + throw new ObjectDisposedException(nameof(Album)); + } + + return _albumHandle; + } + } + /// /// The media album ID /// @@ -39,7 +53,7 @@ namespace Tizen.Content.MediaContent { int id = 0; MediaContentValidator.ThrowIfError( - Interop.Group.MediaAlbumGetAlbumId(_albumHandle, out id), "Failed to get value"); + Interop.Group.MediaAlbumGetAlbumId(Handle, out id), "Failed to get value"); return id; } @@ -57,7 +71,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Group.MediaAlbumGetArtist(_albumHandle, out val), "Failed to get value"); + Interop.Group.MediaAlbumGetArtist(Handle, out val), "Failed to get value"); return Marshal.PtrToStringAnsi(val); } @@ -79,7 +93,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Group.MediaAlbumGetAlbumArt(_albumHandle, out val), "Failed to get value"); + Interop.Group.MediaAlbumGetAlbumArt(Handle, out val), "Failed to get value"); return Marshal.PtrToStringAnsi(val); } @@ -102,7 +116,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Group.MediaAlbumGetName(_albumHandle, out val), "Failed to get value"); + Interop.Group.MediaAlbumGetName(Handle, out val), "Failed to get value"); return Marshal.PtrToStringAnsi(val); } @@ -115,7 +129,7 @@ namespace Tizen.Content.MediaContent internal Album(IntPtr handle) { - this._albumHandle = handle; + _albumHandle = handle; } /// diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs index dcf341e..11f38d8 100755 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs @@ -210,10 +210,10 @@ namespace Tizen.Content.MediaContent MediaContentValidator.ThrowIfError( Interop.Folder.GetFolderFromDb(id, out handle), "Failed to get information"); - if (handle != IntPtr.Zero) - { - result = new MediaFolder(handle); - return (T)result; + if (handle != IntPtr.Zero) + { + result = new MediaFolder(handle); + return (T)result; } } @@ -222,10 +222,10 @@ namespace Tizen.Content.MediaContent MediaContentValidator.ThrowIfError( Interop.Storage.GetStorageInfoFromDb(id, out handle), "Failed to get information"); - if (handle != IntPtr.Zero) - { - result = new Storage(handle); - return (T)result; + if (handle != IntPtr.Zero) + { + result = new Storage(handle); + return (T)result; } } @@ -250,10 +250,10 @@ namespace Tizen.Content.MediaContent MediaContentValidator.ThrowIfError( Interop.Playlist.GetPlaylistFromDb(id, out handle), "Failed to get information"); - if (handle != IntPtr.Zero) - { - result = new PlayList(handle); - return (T)result; + if (handle != IntPtr.Zero) + { + result = new PlayList(handle); + return (T)result; } } else if (typeof(T) == typeof(Album)) @@ -261,10 +261,10 @@ namespace Tizen.Content.MediaContent MediaContentValidator.ThrowIfError( Interop.Group.MediaAlbumGetAlbumFromDb(id, out handle), "Failed to get information"); - if (handle != IntPtr.Zero) - { - result = new Album(handle); - return (T)result; + if (handle != IntPtr.Zero) + { + result = new Album(handle); + return (T)result; } } else if (typeof(T) == typeof(Tag)) @@ -272,10 +272,10 @@ namespace Tizen.Content.MediaContent MediaContentValidator.ThrowIfError( Interop.Tag.GetTagFromDb(id, out handle), "Failed to get information"); - if (handle != IntPtr.Zero) - { - result = new Tag(handle); - return (T)result; + if (handle != IntPtr.Zero) + { + result = new Tag(handle); + return (T)result; } } diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaBookmark.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaBookmark.cs index 6b4d5d6..2c101d8 100755 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaBookmark.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaBookmark.cs @@ -29,27 +29,23 @@ namespace Tizen.Content.MediaContent { private IntPtr _bookmarkHandle = IntPtr.Zero; private bool _disposedValue = false; - internal readonly uint _offset; - internal readonly String _thumbnailPath; - internal MediaBookmark(IntPtr handle) - { - _bookmarkHandle = handle; - IntPtr val = IntPtr.Zero; - MediaContentValidator.ThrowIfError( - Interop.MediaBookmark.GetMarkedTime(_bookmarkHandle, out _offset), "Failed to Get Offset"); - try + private IntPtr Handle + { + get { - MediaContentValidator.ThrowIfError( - Interop.MediaBookmark.GetThumbnailPath(_bookmarkHandle, out val), "Failed to Get Thumbnail Path"); + if (_bookmarkHandle == IntPtr.Zero) + { + throw new ObjectDisposedException(nameof(MediaBookmark)); + } - _thumbnailPath = Marshal.PtrToStringAnsi(val); - } - finally - { - Interop.Libc.Free(val); + return _bookmarkHandle; } } + internal MediaBookmark(IntPtr handle) + { + _bookmarkHandle = handle; + } ~MediaBookmark() { @@ -64,7 +60,7 @@ namespace Tizen.Content.MediaContent { int id; MediaContentValidator.ThrowIfError( - Interop.MediaBookmark.GetBookmarkId(_bookmarkHandle, out id), "Failed to get bookmark id"); + Interop.MediaBookmark.GetBookmarkId(Handle, out id), "Failed to get bookmark id"); return id; } @@ -77,7 +73,18 @@ namespace Tizen.Content.MediaContent { get { - return _thumbnailPath; + IntPtr val = IntPtr.Zero; + try + { + MediaContentValidator.ThrowIfError( + Interop.MediaBookmark.GetThumbnailPath(Handle, out val), "Failed to get bookmark thumbnail"); + + return Marshal.PtrToStringAnsi(val); + } + finally + { + Interop.Libc.Free(val); + } } } @@ -88,22 +95,11 @@ namespace Tizen.Content.MediaContent { get { - return _offset; - } - } + uint offset; + MediaContentValidator.ThrowIfError( + Interop.MediaBookmark.GetMarkedTime(Handle, out offset), "Failed to get bookmarked time"); - /// - /// Inserts a new bookmark in media on the specified time offset to the media database. - /// - /// Media in which the bookmark is to be inserted - /// The bookmark time offset (in seconds) - /// The thumbnail path of video bookmark. If the media type is audio, then thumbnail is null. - internal MediaBookmark(MediaInformation content, uint offset, string thumbnailPath) - { - _offset = offset; - if (thumbnailPath != null) - { - _thumbnailPath = thumbnailPath; + return offset; } } @@ -119,7 +115,7 @@ namespace Tizen.Content.MediaContent { if (_bookmarkHandle != IntPtr.Zero) { - Interop.Face.Destroy(_bookmarkHandle); + Interop.MediaBookmark.Destroy(_bookmarkHandle); _bookmarkHandle = IntPtr.Zero; } diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaFace.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaFace.cs index 522376a..8f80ec9 100755 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaFace.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaFace.cs @@ -32,12 +32,12 @@ namespace Tizen.Content.MediaContent { get { - return _faceHandle; - } + if (_faceHandle == IntPtr.Zero) + { + throw new ObjectDisposedException(nameof(MediaFace)); + } - set - { - _faceHandle = value; + return _faceHandle; } } @@ -62,7 +62,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Face.SetFaceRect(_faceHandle, rect.X, rect.Y, rect.Width, rect.Height), "Failed to set Rect to MediaFace"); + Interop.Face.SetFaceRect(Handle, rect.X, rect.Y, rect.Width, rect.Height), "Failed to set Rect to MediaFace"); } catch (Exception) { @@ -88,7 +88,7 @@ namespace Tizen.Content.MediaContent int width; int height; MediaContentValidator.ThrowIfError( - Interop.Face.GetFaceRect(_faceHandle, out x, out y, out width, out height), "Failed to get Rect for the Face"); + Interop.Face.GetFaceRect(Handle, out x, out y, out width, out height), "Failed to get Rect for the Face"); return new FaceRect(x, y, width, height); } @@ -97,7 +97,7 @@ namespace Tizen.Content.MediaContent { FaceRect rect = (FaceRect)value; MediaContentValidator.ThrowIfError( - Interop.Face.SetFaceRect(_faceHandle, rect.X, rect.Y, rect.Width, rect.Height), "Failed to set Rect for the Face"); + Interop.Face.SetFaceRect(Handle, rect.X, rect.Y, rect.Width, rect.Height), "Failed to set Rect for the Face"); } } @@ -112,7 +112,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Face.GetFaceId(_faceHandle, out val), "Failed to get value"); + Interop.Face.GetFaceId(Handle, out val), "Failed to get value"); return Marshal.PtrToStringAnsi(val); } @@ -134,7 +134,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Face.GetMediaId(_faceHandle, out val), "Failed to get value"); + Interop.Face.GetMediaId(Handle, out val), "Failed to get value"); return Marshal.PtrToStringAnsi(val); } @@ -155,7 +155,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Face.GetTag(_faceHandle, out val), "Failed to get value"); + Interop.Face.GetTag(Handle, out val), "Failed to get value"); return Marshal.PtrToStringAnsi(val); } @@ -168,7 +168,7 @@ namespace Tizen.Content.MediaContent set { MediaContentValidator.ThrowIfError( - Interop.Face.SetTag(_faceHandle, value), "Failed to set value"); + Interop.Face.SetTag(Handle, value), "Failed to set value"); } } @@ -181,7 +181,7 @@ namespace Tizen.Content.MediaContent { int orientation; MediaContentValidator.ThrowIfError( - Interop.Face.GetOrientation(_faceHandle, out orientation), "Failed to value"); + Interop.Face.GetOrientation(Handle, out orientation), "Failed to value"); return (MediaContentOrientation)orientation; } @@ -189,7 +189,7 @@ namespace Tizen.Content.MediaContent set { MediaContentValidator.ThrowIfError( - Interop.Face.SetOrientation(_faceHandle, (int)value), "Failed to set value"); + Interop.Face.SetOrientation(Handle, (int)value), "Failed to set value"); } } diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaFolder.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaFolder.cs index 6f425ae..cacd6ac 100755 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaFolder.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaFolder.cs @@ -36,12 +36,12 @@ namespace Tizen.Content.MediaContent { get { - return _folderHandle; - } + if (_folderHandle == IntPtr.Zero) + { + throw new ObjectDisposedException(nameof(MediaFolder)); + } - set - { - _folderHandle = value; + return _folderHandle; } } /// @@ -55,7 +55,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Folder.GetFolderId(_folderHandle, out val), "Failed to get value"); + Interop.Folder.GetFolderId(Handle, out val), "Failed to get value"); return Marshal.PtrToStringAnsi(val); } @@ -77,7 +77,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Folder.GetParentFolderId(_folderHandle, out val), "Failed to get value"); + Interop.Folder.GetParentFolderId(Handle, out val), "Failed to get value"); return Marshal.PtrToStringAnsi(val); } @@ -99,7 +99,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Folder.GetPath(_folderHandle, out val), "Failed to get value"); + Interop.Folder.GetPath(Handle, out val), "Failed to get value"); return Marshal.PtrToStringAnsi(val); } @@ -121,7 +121,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Folder.GetName(_folderHandle, out val), "Failed to get value"); + Interop.Folder.GetName(Handle, out val), "Failed to get value"); return Marshal.PtrToStringAnsi(val); } @@ -134,7 +134,7 @@ namespace Tizen.Content.MediaContent set { MediaContentValidator.ThrowIfError( - Interop.Folder.SetName(_folderHandle, value), "Failed to set value"); + Interop.Folder.SetName(Handle, value), "Failed to set value"); } } @@ -148,7 +148,7 @@ namespace Tizen.Content.MediaContent { ContentStorageType type; MediaContentValidator.ThrowIfError( - Interop.Folder.GetStorageType(_folderHandle, out type), "Failed to get value"); + Interop.Folder.GetStorageType(Handle, out type), "Failed to get value"); return type; } @@ -165,7 +165,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Folder.GetStorageId(_folderHandle, out val), "Failed to get value"); + Interop.Folder.GetStorageId(Handle, out val), "Failed to get value"); return Marshal.PtrToStringAnsi(val); } @@ -185,7 +185,7 @@ namespace Tizen.Content.MediaContent { DateTime date; MediaContentValidator.ThrowIfError( - Interop.Folder.GetModifiedTime(_folderHandle, out date), "Failed to get value"); + Interop.Folder.GetModifiedTime(Handle, out date), "Failed to get value"); return date; } @@ -202,7 +202,7 @@ namespace Tizen.Content.MediaContent { int order; MediaContentValidator.ThrowIfError( - Interop.Folder.GetOrder(_folderHandle, out order), "Failed to get value"); + Interop.Folder.GetOrder(Handle, out order), "Failed to get value"); return order; } @@ -210,13 +210,13 @@ namespace Tizen.Content.MediaContent set { MediaContentValidator.ThrowIfError( - Interop.Folder.SetOrder(_folderHandle, value), "Failed to set value"); + Interop.Folder.SetOrder(Handle, value), "Failed to set value"); } } - internal MediaFolder(IntPtr _folderHandle) + internal MediaFolder(IntPtr handle) { - this.Handle = _folderHandle; + _folderHandle = handle; } /// diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/PlayList.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/PlayList.cs index 88b1620..5c12d86 100755 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/PlayList.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/PlayList.cs @@ -37,6 +37,11 @@ namespace Tizen.Content.MediaContent { get { + if (_playlistHandle == IntPtr.Zero) + { + throw new ObjectDisposedException(nameof(PlayList)); + } + return _playlistHandle; } @@ -80,7 +85,7 @@ namespace Tizen.Content.MediaContent { int id; MediaContentValidator.ThrowIfError( - Interop.Playlist.GetPlaylistId(_playlistHandle, out id), "Failed to get value"); + Interop.Playlist.GetPlaylistId(Handle, out id), "Failed to get value"); return id; } @@ -100,7 +105,7 @@ namespace Tizen.Content.MediaContent set { MediaContentValidator.ThrowIfError( - Interop.Playlist.SetName(_playlistHandle, value), "Failed to set value"); + Interop.Playlist.SetName(Handle, value), "Failed to set value"); _playListName = value; } } @@ -115,7 +120,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Playlist.GetThumbnailPath(_playlistHandle, out val), "Failed to get value"); + Interop.Playlist.GetThumbnailPath(Handle, out val), "Failed to get value"); return Marshal.PtrToStringAnsi(val); } finally @@ -127,7 +132,7 @@ namespace Tizen.Content.MediaContent set { MediaContentValidator.ThrowIfError( - Interop.Playlist.SetThumbnailPath(_playlistHandle, value), "Failed to set value"); + Interop.Playlist.SetThumbnailPath(Handle, value), "Failed to set value"); } } @@ -163,7 +168,7 @@ namespace Tizen.Content.MediaContent public void AddItem(MediaInformation mediaContent) { MediaContentValidator.ThrowIfError( - Interop.Playlist.AddMedia(_playlistHandle, mediaContent.MediaId), "Failed to add item"); + Interop.Playlist.AddMedia(Handle, mediaContent.MediaId), "Failed to add item"); } /// @@ -176,7 +181,7 @@ namespace Tizen.Content.MediaContent RefreshPlaylistDictionary(); _dictionary.TryGetValue(media.MediaId, out memberId); MediaContentValidator.ThrowIfError( - Interop.Playlist.RemoveMedia(_playlistHandle, memberId), "Failed to remove item"); + Interop.Playlist.RemoveMedia(Handle, memberId), "Failed to remove item"); } /// @@ -190,7 +195,7 @@ namespace Tizen.Content.MediaContent RefreshPlaylistDictionary(); _dictionary.TryGetValue(media.MediaId, out memberId); MediaContentValidator.ThrowIfError( - Interop.Playlist.SetPlayOrder(_playlistHandle, memberId, playOrder), "Failed to set play order"); + Interop.Playlist.SetPlayOrder(Handle, memberId, playOrder), "Failed to set play order"); } /// @@ -205,7 +210,7 @@ namespace Tizen.Content.MediaContent RefreshPlaylistDictionary(); _dictionary.TryGetValue(media.MediaId, out memberId); MediaContentValidator.ThrowIfError( - Interop.Playlist.GetPlayOrder(_playlistHandle, memberId, out playOrder), "Failed to get play order"); + Interop.Playlist.GetPlayOrder(Handle, memberId, out playOrder), "Failed to get play order"); return playOrder; } @@ -225,7 +230,7 @@ namespace Tizen.Content.MediaContent Interop.Playlist.ImportFromFile(name, filePath, out playlistHandle), "Failed to import"); playList = new PlayList(name); - playList._playlistHandle = playlistHandle; + playList.Handle = playlistHandle; return playList; } diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Storage.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Storage.cs index 039d85b..401c1ab 100755 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Storage.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Storage.cs @@ -31,10 +31,15 @@ namespace Tizen.Content.MediaContent public class Storage : ContentCollection { private IntPtr _storageHandle = IntPtr.Zero; - internal IntPtr Handle + private IntPtr Handle { get { + if (_storageHandle == IntPtr.Zero) + { + throw new ObjectDisposedException(nameof(Storage)); + } + return _storageHandle; } } @@ -49,7 +54,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Storage.GetId(_storageHandle, out val), "Failed to get value"); + Interop.Storage.GetId(Handle, out val), "Failed to get value"); return Marshal.PtrToStringAnsi(val); } @@ -71,7 +76,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Storage.GetPath(_storageHandle, out val), "Failed to get value"); + Interop.Storage.GetPath(Handle, out val), "Failed to get value"); return Marshal.PtrToStringAnsi(val); } @@ -93,7 +98,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Storage.GetName(_storageHandle, out val), "Failed to get value"); + Interop.Storage.GetName(Handle, out val), "Failed to get value"); return Marshal.PtrToStringAnsi(val); } @@ -113,15 +118,15 @@ namespace Tizen.Content.MediaContent { ContentStorageType storageType; MediaContentValidator.ThrowIfError( - Interop.Storage.GetType(_storageHandle, out storageType), "Failed to get value"); + Interop.Storage.GetType(Handle, out storageType), "Failed to get value"); return storageType; } } - internal Storage(IntPtr _storageHandle) + internal Storage(IntPtr handle) { - this._storageHandle = _storageHandle; + _storageHandle = handle; } /// diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Tag.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Tag.cs index 6766005..5797558 100755 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Tag.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Tag.cs @@ -30,10 +30,16 @@ namespace Tizen.Content.MediaContent { private IntPtr _tagHandle = IntPtr.Zero; private string _tagName = ""; + internal IntPtr Handle { get { + if (_tagHandle == IntPtr.Zero) + { + throw new ObjectDisposedException(nameof(Tag)); + } + return _tagHandle; } @@ -51,7 +57,7 @@ namespace Tizen.Content.MediaContent { int id; MediaContentValidator.ThrowIfError( - Interop.Tag.GetTagId(_tagHandle, out id), "Failed to get value"); + Interop.Tag.GetTagId(Handle, out id), "Failed to get value"); return id; } } @@ -69,7 +75,7 @@ namespace Tizen.Content.MediaContent set { MediaContentValidator.ThrowIfError( - Interop.Tag.SetName(_tagHandle, value), "Failed to set value"); + Interop.Tag.SetName(Handle, value), "Failed to set value"); _tagName = value; } } @@ -81,7 +87,7 @@ namespace Tizen.Content.MediaContent try { MediaContentValidator.ThrowIfError( - Interop.Tag.GetName(_tagHandle, out val), "Failed to get value"); + Interop.Tag.GetName(Handle, out val), "Failed to get value"); _tagName = Marshal.PtrToStringAnsi(val); } finally @@ -106,7 +112,7 @@ namespace Tizen.Content.MediaContent public void AddItem(MediaInformation mediaContent) { MediaContentValidator.ThrowIfError( - Interop.Tag.AddMedia(_tagHandle, mediaContent.MediaId), "Failed to add item"); + Interop.Tag.AddMedia(Handle, mediaContent.MediaId), "Failed to add item"); } /// @@ -116,7 +122,7 @@ namespace Tizen.Content.MediaContent public void RemoveItem(MediaInformation mediaContent) { MediaContentValidator.ThrowIfError( - Interop.Tag.RemoveMedia(_tagHandle, mediaContent.MediaId), "Failed to remove item"); + Interop.Tag.RemoveMedia(Handle, mediaContent.MediaId), "Failed to remove item"); } /// -- 2.7.4