mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-07-04 10:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

capsa: fix capsaGetAlbumEntryFromApplicationAlbumEntry*

Browse Source
This commit is contained in:
HookedBehemoth 2020-01-26 20:08:02 +01:00
parent c09396fdba
commit aef568b206
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nx/include/switch/services/capsa.h
View File

@ -117,12 +117,13 @@ Result capsaLoadAlbumScreenShotImage(u64 *width, u64 *height, const CapsAlbumFil
Result capsaLoadAlbumScreenShotThumbnailImage(u64 *width, u64 *height, const CapsAlbumFileId *file_id, void* image, u64 image_size, void* workbuf, u64 workbuf_size); Result capsaLoadAlbumScreenShotThumbnailImage(u64 *width, u64 *height, const CapsAlbumFileId *file_id, void* image, u64 image_size, void* workbuf, u64 workbuf_size);
/** /**
* @brief Load an \ref CapsAlbumEntry from a \ref CapsApplicationAlbumEntry * @brief Load an \ref CapsAlbumEntry from a \ref CapsApplicationAlbumEntry and an Application Id.
* @note Only available on [2.0.0+]. * @note Only available on [2.0.0+].
* @param[out] entry \ref CapsAlbumEntry * @param[out] entry \ref CapsAlbumEntry
* @param[in] application_entry \ref CapsApplicationAlbumEntry * @param[in] application_entry \ref CapsApplicationAlbumEntry
* @param[in] application_id Application Id
*/ */
Result capsaGetAlbumEntryFromApplicationAlbumEntry(CapsAlbumEntry *entry, const CapsApplicationAlbumEntry *application_entry); Result capsaGetAlbumEntryFromApplicationAlbumEntry(CapsAlbumEntry *entry, const CapsApplicationAlbumEntry *application_entry, u64 application_id);
/** /**
* @brief Load the ScreenShotImage for the specified AlbumFile. * @brief Load the ScreenShotImage for the specified AlbumFile.
@ -329,13 +330,13 @@ Result capsaGetAlbumCache(CapsAlbumStorage storage, CapsAlbumCache *cache);
Result capsaGetAlbumCacheEx(CapsAlbumStorage storage, CapsAlbumFileContents contents, CapsAlbumCache *cache); Result capsaGetAlbumCacheEx(CapsAlbumStorage storage, CapsAlbumFileContents contents, CapsAlbumCache *cache);
/** /**
* @brief Load an \ref CapsAlbumEntry from a \ref CapsApplicationAlbumEntry * @brief Load an \ref CapsAlbumEntry from a \ref CapsApplicationAlbumEntry and an Applet Resource User Id.
* @note Only available on [2.0.0+]. * @note Only available on [2.0.0+].
* @note despite this having aruid in the name \ref capsaGetAlbumEntryFromApplicationAlbumEntry also sends it.
* @param[out] entry \ref CapsAlbumEntry * @param[out] entry \ref CapsAlbumEntry
* @param[in] application_entry \ref CapsApplicationAlbumEntry * @param[in] application_entry \ref CapsApplicationAlbumEntry
* @param[in] appletResourceUserId Application Resouce User Id
*/ */
Result capsaGetAlbumEntryFromApplicationAlbumEntryAruid(CapsAlbumEntry *entry, const CapsApplicationAlbumEntry *application_entry); Result capsaGetAlbumEntryFromApplicationAlbumEntryAruid(CapsAlbumEntry *entry, const CapsApplicationAlbumEntry *application_entry, u64 appletResourceUserId);
/** /**
* @brief Opens an AlbumMovieStream. * @brief Opens an AlbumMovieStream.

10
nx/source/services/capsa.c
View File

@ -112,13 +112,13 @@ Result capsaLoadAlbumScreenShotThumbnailImage(u64 *width, u64 *height, const Cap
return _capsaLoadAlbumScreenshot(width, height, file_id, image, image_size, workbuf, workbuf_size, 10); return _capsaLoadAlbumScreenshot(width, height, file_id, image, image_size, workbuf, workbuf_size, 10);
} }
Result capsaGetAlbumEntryFromApplicationAlbumEntry(CapsAlbumEntry *entry, const CapsApplicationAlbumEntry *application_entry) { Result capsaGetAlbumEntryFromApplicationAlbumEntry(CapsAlbumEntry *entry, const CapsApplicationAlbumEntry *application_entry, u64 application_id) {
if (hosversionBefore(2,0,0)) if (hosversionBefore(2,0,0))
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
const struct { const struct {
CapsApplicationAlbumEntry application_entry; CapsApplicationAlbumEntry application_entry;
u64 aruid; u64 application_id;
} in = { *application_entry, appletGetAppletResourceUserId() }; } in = { *application_entry, application_id };
return serviceDispatchInOut(&g_capsaSrv, 11, in, *entry); return serviceDispatchInOut(&g_capsaSrv, 11, in, *entry);
} }
@ -332,13 +332,13 @@ Result capsaGetAlbumCacheEx(CapsAlbumStorage storage, CapsAlbumFileContents cont
return serviceDispatchInOut(&g_capsaSrv, 8013, in, *cache); return serviceDispatchInOut(&g_capsaSrv, 8013, in, *cache);
} }
Result capsaGetAlbumEntryFromApplicationAlbumEntryAruid(CapsAlbumEntry *entry, const CapsApplicationAlbumEntry *application_entry) { Result capsaGetAlbumEntryFromApplicationAlbumEntryAruid(CapsAlbumEntry *entry, const CapsApplicationAlbumEntry *application_entry, u64 appletResourceUserId) {
if (hosversionBefore(2,0,0)) if (hosversionBefore(2,0,0))
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
const struct { const struct {
CapsApplicationAlbumEntry application_entry; CapsApplicationAlbumEntry application_entry;
u64 aruid; u64 aruid;
} in = { *application_entry, appletGetAppletResourceUserId() }; } in = { *application_entry, appletResourceUserId };
return serviceDispatchInOut(&g_capsaSrv, 8021, in, *entry, .in_send_pid = true); return serviceDispatchInOut(&g_capsaSrv, 8021, in, *entry, .in_send_pid = true);
} }