diff options
| author | Kevin Mitchell <kevmitch@gmail.com> | 2015-08-29 00:42:04 -0700 |
|---|---|---|
| committer | Kevin Mitchell <kevmitch@gmail.com> | 2015-08-30 05:28:24 -0700 |
| commit | c80b7eed53dfd9f6a0aadc9c11981cba2a59655d (patch) | |
| tree | 44972f05104d989af223ff5d782b0d32faf865ee /video/out | |
| parent | f14f6fdb314ce42537d0948d8a24fbe77c06d17c (diff) | |
| download | mpv-c80b7eed53dfd9f6a0aadc9c11981cba2a59655d.tar.bz2 mpv-c80b7eed53dfd9f6a0aadc9c11981cba2a59655d.tar.xz | |
input: add append argument to file drop event
This puts in place the machinery to merely append dropped file to the playlist
instead of replacing the existing playlist. In this commit, all front-ends
set this to false preserving the existing behaviour.
Diffstat (limited to 'video/out')
| -rw-r--r-- | video/out/w32_common.c | 5 | ||||
| -rw-r--r-- | video/out/wayland_common.c | 2 | ||||
| -rw-r--r-- | video/out/x11_common.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/video/out/w32_common.c b/video/out/w32_common.c index 5197ad054c..6074c4cbeb 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -253,7 +253,8 @@ static HRESULT STDMETHODCALLTYPE DropTarget_Drop(IDropTarget* This, } GlobalUnlock(medium.hGlobal); - mp_event_drop_files(t->w32->input_ctx, nrecvd_files, files); + mp_event_drop_files(t->w32->input_ctx, nrecvd_files, files, + DND_REPLACE); talloc_free(files); } @@ -265,7 +266,7 @@ static HRESULT STDMETHODCALLTYPE DropTarget_Drop(IDropTarget* This, char* url = (char*)GlobalLock(medium.hGlobal); if (url != NULL) { if (mp_event_drop_mime_data(t->w32->input_ctx, "text/uri-list", - bstr0(url)) > 0) { + bstr0(url), DND_REPLACE) > 0) { MP_VERBOSE(t->w32, "received dropped URL: %s\n", url); } else { MP_ERR(t->w32, "error getting dropped URL\n"); diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c index 198b167d79..289ed0442e 100644 --- a/video/out/wayland_common.c +++ b/video/out/wayland_common.c @@ -1176,7 +1176,7 @@ static int vo_wayland_check_events (struct vo *vo) buffer[str_len] = 0; struct bstr file_list = bstr0(buffer); mp_event_drop_mime_data(vo->input_ctx, "text/uri-list", - file_list); + file_list, DND_REPLACE); break; } } diff --git a/video/out/x11_common.c b/video/out/x11_common.c index 9ed57bdc4f..a5c9dd84f5 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -838,7 +838,7 @@ static void vo_x11_dnd_handle_selection(struct vo *vo, XSelectionEvent *se) if (prop) { // No idea if this is guaranteed to be \0-padded, so use bstr. success = mp_event_drop_mime_data(vo->input_ctx, "text/uri-list", - (bstr){prop, nitems}) > 0; + (bstr){prop, nitems}, DND_REPLACE) > 0; XFree(prop); } } |