summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinje Ahn <minje.ahn@samsung.com>2017-01-06 16:22:41 +0900
committerMinje Ahn <minje.ahn@samsung.com>2017-01-06 16:22:41 +0900
commit222b91552a1c7b60dc06fbfb37fe0c3ee8c8deea (patch)
tree40c013b67b47ab6eea77243d129d6ee414e4ddb8
parentd1ca68cc0db32436f6aa753141e8140593d7ba42 (diff)
downloadmedia-content-222b91552a1c7b60dc06fbfb37fe0c3ee8c8deea.tar.gz
media-content-222b91552a1c7b60dc06fbfb37fe0c3ee8c8deea.tar.bz2
media-content-222b91552a1c7b60dc06fbfb37fe0c3ee8c8deea.zip
Update description and API namesubmit/tizen/20170108.235207
Modify "BookMark" to "Bookmark" Change-Id: I700fdd686802427fb26d404b4f8ae342aa7b35b1 Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
-rwxr-xr-xTizen.Content.MediaContent/Interop/Interop.MediaInformation.cs4
-rwxr-xr-xTizen.Content.MediaContent/Tizen.Content.MediaContent/AudioInformation.cs18
-rwxr-xr-xTizen.Content.MediaContent/Tizen.Content.MediaContent/VideoInformation.cs8
-rwxr-xr-xpackaging/csapi-media-content.spec4
4 files changed, 17 insertions, 17 deletions
diff --git a/Tizen.Content.MediaContent/Interop/Interop.MediaInformation.cs b/Tizen.Content.MediaContent/Interop/Interop.MediaInformation.cs
index b2c4758..bc615be 100755
--- a/Tizen.Content.MediaContent/Interop/Interop.MediaInformation.cs
+++ b/Tizen.Content.MediaContent/Interop/Interop.MediaInformation.cs
@@ -22,7 +22,7 @@ internal static partial class Interop
internal delegate bool MediaTagCallback(IntPtr tagHandle, IntPtr UserData);
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
- internal delegate bool MediaBookMarkCallback(IntPtr bookmarkHandle, IntPtr UserData);
+ internal delegate bool MediaBookmarkCallback(IntPtr bookmarkHandle, IntPtr UserData);
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
internal delegate bool MediaFaceCallback(IntPtr bookmarkHandle, IntPtr UserData);
@@ -73,7 +73,7 @@ internal static partial class Interop
internal static extern int GetBookmarkCount(string mediaId, IntPtr filter, out int bookmarkCount);
[DllImport(Libraries.MediaContent, EntryPoint = "media_info_foreach_bookmark_from_db", CallingConvention = CallingConvention.Cdecl)]
- internal static extern int GetAllBookmarks(string mediaId, IntPtr filter, MediaBookMarkCallback callback, IntPtr userData);
+ internal static extern int GetAllBookmarks(string mediaId, IntPtr filter, MediaBookmarkCallback callback, IntPtr userData);
[DllImport(Libraries.MediaContent, EntryPoint = "media_info_get_face_count_from_db", CallingConvention = CallingConvention.Cdecl)]
internal static extern int GetFaceCount(string mediaId, IntPtr filter, out int bookmarkCount);
diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/AudioInformation.cs b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/AudioInformation.cs
index 5fa256b..4436431 100755
--- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/AudioInformation.cs
+++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/AudioInformation.cs
@@ -346,13 +346,13 @@ namespace Tizen.Content.MediaContent
}
/// <summary>
- /// Gets the number of MediaBookMark for the passed filter in the given media ID from the media database.
+ /// Gets the number of MediaBookmark for the passed filter in the given media ID from the media database.
/// If NULL is passed to the filter, no filtering is applied.
/// </summary>
/// <returns>
/// int count</returns>
- /// <param name="filter">The Filter for matching BookMarks</param>
- public int GetMediaBookMarkCount(ContentFilter filter)
+ /// <param name="filter">The Filter for matching Bookmarks</param>
+ public int GetMediaBookmarkCount(ContentFilter filter)
{
int count = 0;
IntPtr handle = (filter != null) ? filter.Handle : IntPtr.Zero;
@@ -369,7 +369,7 @@ namespace Tizen.Content.MediaContent
/// If NULL is passed to the filter, no filtering is applied.
/// </summary>
/// <returns>
- /// Task to get all the BookMarks
+ /// Task to get all the Bookmarks
/// </returns>
/// <param name="filter"> filter for the Tags</param>
public Task<IEnumerable<MediaBookmark>> GetMediaBookmarksAsync(ContentFilter filter)
@@ -378,7 +378,7 @@ namespace Tizen.Content.MediaContent
MediaContentError result;
Collection<MediaBookmark> coll = new Collection<MediaBookmark>();
IntPtr filterHandle = (filter != null) ? filter.Handle : IntPtr.Zero;
- Interop.MediaInformation.MediaBookMarkCallback bookmarksCallback = (IntPtr handle, IntPtr userData) =>
+ Interop.MediaInformation.MediaBookmarkCallback bookmarksCallback = (IntPtr handle, IntPtr userData) =>
{
IntPtr newHandle;
result = (MediaContentError)Interop.MediaBookmark.Clone(out newHandle, handle);
@@ -400,11 +400,11 @@ namespace Tizen.Content.MediaContent
}
/// <summary>
- /// Adds a MediaBookMark to the audio
+ /// Adds a MediaBookmark to the audio
/// </summary>
/// <param name="offset">Offset of the audio in seconds</param>
/// <returns>
- /// Task with newly added MediaBookMark instance.
+ /// Task with newly added MediaBookmark instance.
/// </returns>
public async Task<MediaBookmark> AddBookmark(uint offset)
{
@@ -427,9 +427,9 @@ namespace Tizen.Content.MediaContent
}
/// <summary>
- /// Deletes a MediaBookMark item from the media database.
+ /// Deletes a MediaBookmark item from the media database.
/// </summary>
- /// <param name="bookmark">The MediaBookMark instance to be deleted</param>
+ /// <param name="bookmark">The MediaBookmark instance to be deleted</param>
public void DeleteBookmark(MediaBookmark bookmark)
{
ContentManager.Database.Delete(bookmark);
diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/VideoInformation.cs b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/VideoInformation.cs
index 1e78a2c..1c7872c 100755
--- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/VideoInformation.cs
+++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/VideoInformation.cs
@@ -321,8 +321,8 @@ namespace Tizen.Content.MediaContent
/// </summary>
/// <returns>
/// int count</returns>
- /// <param name="filter">The Filter for matching BookMarks</param>
- public int GetMediaBookMarkCount(ContentFilter filter)
+ /// <param name="filter">The Filter for matching Bookmarks</param>
+ public int GetMediaBookmarkCount(ContentFilter filter)
{
int count = 0;
IntPtr handle = (filter != null) ? filter.Handle : IntPtr.Zero;
@@ -338,7 +338,7 @@ namespace Tizen.Content.MediaContent
/// Iterates through the media bookmark in the given media info from the media database.
/// </summary>
/// <returns>
- /// Task to get all the BookMarks </returns>
+ /// Task to get all the Bookmarks </returns>
/// <param name="filter"> filter for the Tags</param>
public Task<IEnumerable<MediaBookmark>> GetMediaBookmarksAsync(ContentFilter filter)
{
@@ -346,7 +346,7 @@ namespace Tizen.Content.MediaContent
MediaContentError result;
Collection<MediaBookmark> coll = new Collection<MediaBookmark>();
IntPtr filterHandle = (filter != null) ? filter.Handle : IntPtr.Zero;
- Interop.MediaInformation.MediaBookMarkCallback bookmarksCallback = (IntPtr handle, IntPtr userData) =>
+ Interop.MediaInformation.MediaBookmarkCallback bookmarksCallback = (IntPtr handle, IntPtr userData) =>
{
IntPtr newHandle;
result = (MediaContentError)Interop.MediaBookmark.Clone(out newHandle, handle);
diff --git a/packaging/csapi-media-content.spec b/packaging/csapi-media-content.spec
index 64562de..d85101f 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.5
+Version: 1.0.6
Release: 1
Group: Development/Libraries
License: Apache-2.0
@@ -41,4 +41,4 @@ done
%files
%manifest %{name}.manifest
%license LICENSE
-%attr(644,root,root) %{dotnet_assembly_files} \ No newline at end of file
+%attr(644,root,root) %{dotnet_assembly_files}