Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

clipboard: add CLIPBOARD_UNAVAILABLE error code

Browse Source 
This makes it possible to distinguish between unavailable
or unsupported, and error.
This commit is contained in:
nanahi
2024-12-06 11:57:46 -05:00
committed by Kacper Michajłow
parent 7bae5b8d37
commit e62503cb39
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
player/clipboard/clipboard-vo.c
View File

@@ -43,7 +43,9 @@ static int get_data(struct clipboard_ctx *cl, struct clipboard_access_params *pa
.talloc_ctx = talloc_ctx,
};
if (vo && vo_control(vo, VOCTRL_GET_CLIPBOARD, &vc) == VO_TRUE) {
if (!vo)
return CLIPBOARD_UNAVAILABLE;
if (vo_control(vo, VOCTRL_GET_CLIPBOARD, &vc) == VO_TRUE) {
*out = vc.data;
return CLIPBOARD_SUCCESS;
} else {
@@ -62,7 +64,9 @@ static int set_data(struct clipboard_ctx *cl, struct clipboard_access_params *pa
.params = *params,
};
if (vo && vo_control(vo, VOCTRL_SET_CLIPBOARD, &vc) == VO_TRUE) {
if (!vo)
return CLIPBOARD_UNAVAILABLE;
if (vo_control(vo, VOCTRL_SET_CLIPBOARD, &vc) == VO_TRUE) {
return CLIPBOARD_SUCCESS;
} else {
MP_WARN(cl, "VO is not initialized, or it does not support setting clipboard.\n");

4
player/clipboard/clipboard.c
View File

@@ -96,7 +96,7 @@ int mp_clipboard_get_data(struct clipboard_ctx *cl, struct clipboard_access_para
{
if (cl && cl->backend->get_data)
return cl->backend->get_data(cl, params, out, talloc_ctx);
return CLIPBOARD_FAILED;
return CLIPBOARD_UNAVAILABLE;
}
int mp_clipboard_set_data(struct clipboard_ctx *cl, struct clipboard_access_params *params,
@@ -104,7 +104,7 @@ int mp_clipboard_set_data(struct clipboard_ctx *cl, struct clipboard_access_para
{
if (cl && cl->backend->set_data)
return cl->backend->set_data(cl, params, data);
return CLIPBOARD_FAILED;
return CLIPBOARD_UNAVAILABLE;
}
void reinit_clipboard(struct MPContext *mpctx)

1
player/clipboard/clipboard.h
View File

@@ -39,6 +39,7 @@ enum clipboard_target {
enum clipboard_result {
CLIPBOARD_SUCCESS = 0,
CLIPBOARD_FAILED = -1,
CLIPBOARD_UNAVAILABLE = -2,
};
struct clipboard_data {