mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 20:42:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed AlbumFileEntry and reverted grcMovieMakerFinish back to using CapsApplicationAlbumEntry, since AlbumFileEntry is a duplicate of multiple other structs.

Browse Source
This commit is contained in:
yellows8 2019-08-30 12:55:50 -04:00
parent 7515bb4466
commit 5dc2fc0b7e
No known key found for this signature in database
GPG Key ID: 0AF90DA3F1E60E43
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nx/include/switch/services/caps.h
View File

@ -39,11 +39,6 @@ typedef struct {
CapsAlbumEntryId id; CapsAlbumEntryId id;
} CapsAlbumEntry; } CapsAlbumEntry;
/// AlbumFileEntry
typedef struct {
u8 unk_x0[0x20];
} AlbumFileEntry;
/// ApplicationAlbumEntry /// ApplicationAlbumEntry
typedef struct { typedef struct {
u8 data[0x20]; u8 data[0x20];

4
nx/include/switch/services/grc.h
View File

@ -144,9 +144,9 @@ Result grcMovieMakerAbort(GrcMovieMaker *m);
* @param[in] appdata_size Size of the UserData input buffer. Optional, can be 0. Must be <=0x400. * @param[in] appdata_size Size of the UserData input buffer. Optional, can be 0. Must be <=0x400.
* @param[in] thumbnail RGBA8 image buffer containing the thumbnail. Optional, can be NULL. * @param[in] thumbnail RGBA8 image buffer containing the thumbnail. Optional, can be NULL.
* @param[in] thumbnail_size Size of the thumbnail buffer. Optional, can be 0. * @param[in] thumbnail_size Size of the thumbnail buffer. Optional, can be 0.
* @param[out] entry Output \ref AlbumFileEntry for the recorded video. Optional, can be NULL. Only available on [7.0.0+], if this is not NULL on pre-7.0.0 an error is thrown. * @param[out] entry Output \ref CapsApplicationAlbumEntry for the recorded video. Optional, can be NULL. Only available on [7.0.0+], if this is not NULL on pre-7.0.0 an error is thrown.
*/ */
Result grcMovieMakerFinish(GrcMovieMaker *m, s32 width, s32 height, const void* appdata, size_t appdata_size, const void* thumbnail, size_t thumbnail_size, AlbumFileEntry *entry); Result grcMovieMakerFinish(GrcMovieMaker *m, s32 width, s32 height, const void* appdata, size_t appdata_size, const void* thumbnail, size_t thumbnail_size, CapsApplicationAlbumEntry *entry);
/** /**
* @brief Gets the recording error with the specified MovieMaker. * @brief Gets the recording error with the specified MovieMaker.

4
nx/source/services/grc.c
View File

@ -666,7 +666,7 @@ static Result _grcMovieMakerCompleteOffscreenRecordingFinishEx1(GrcMovieMaker *m
return rc; return rc;
} }
Result grcMovieMakerFinish(GrcMovieMaker *m, s32 width, s32 height, const void* buffer0, size_t size0, const void* buffer1, size_t size1, AlbumFileEntry *entry) { Result grcMovieMakerFinish(GrcMovieMaker *m, s32 width, s32 height, const void* buffer0, size_t size0, const void* buffer1, size_t size1, CapsApplicationAlbumEntry *entry) {
Result rc=0; Result rc=0;
if (!serviceIsActive(&m->s)) if (!serviceIsActive(&m->s))
@ -679,7 +679,7 @@ Result grcMovieMakerFinish(GrcMovieMaker *m, s32 width, s32 height, const void*
if (R_SUCCEEDED(rc)) rc = eventWait(&m->recording_event, U64_MAX); if (R_SUCCEEDED(rc)) rc = eventWait(&m->recording_event, U64_MAX);
if (hosversionAtLeast(7,0,0)) if (hosversionAtLeast(7,0,0))
rc = _grcMovieMakerCompleteOffscreenRecordingFinishEx1(m, width, height, buffer0, size0, buffer1, size1, (CapsApplicationAlbumEntry*)entry); rc = _grcMovieMakerCompleteOffscreenRecordingFinishEx1(m, width, height, buffer0, size0, buffer1, size1, entry);
else else
rc = _grcMovieMakerCompleteOffscreenRecordingFinishEx0(m, width, height, buffer0, size0, buffer1, size1); rc = _grcMovieMakerCompleteOffscreenRecordingFinishEx0(m, width, height, buffer0, size0, buffer1, size1);